From 4490364cda5770a3c3fbf0ae82ed6cb3d13de050 Mon Sep 17 00:00:00 2001 From: Mahdi Hosseini Date: Thu, 25 Jul 2019 15:00:28 +0430 Subject: [PATCH 1/2] support blur window in core3 --- .../HandyControl_Core_30/HandyControl_Core_30.csproj | 3 +++ src/Shared/HandyControlDemo_Shared/App.xaml.cs | 3 +-- .../HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 0bd1c286..092ee74b 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -45,6 +45,9 @@ + + + Resources\dropper.cur diff --git a/src/Shared/HandyControlDemo_Shared/App.xaml.cs b/src/Shared/HandyControlDemo_Shared/App.xaml.cs index 08ba9c5b..6a5d08ab 100644 --- a/src/Shared/HandyControlDemo_Shared/App.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/App.xaml.cs @@ -26,9 +26,8 @@ namespace HandyControlDemo UpdateSkin(GlobalData.Config.Skin); } -#if !Core ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo()); -#endif + ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00; } diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs index 2743f1fc..a9daea11 100644 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs +++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs @@ -1,5 +1,4 @@ -#if !Core -using System.Linq; +using System.Linq; using System.Management; using HandyControl.Data; @@ -23,5 +22,4 @@ namespace HandyControlDemo.Tools return default(SystemVersionInfo); } } -} -#endif \ No newline at end of file +} \ No newline at end of file From 536305a083da00355ea4c2440b0eb7b43ecc4e46 Mon Sep 17 00:00:00 2001 From: NaBian <836904362@qq.com> Date: Thu, 25 Jul 2019 23:17:41 +0800 Subject: [PATCH 2/2] merged pr --- .../HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj | 1 + src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj | 3 --- .../HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj | 2 +- .../HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj | 2 +- .../HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj index 036f5423..760f6243 100644 --- a/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj +++ b/src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj @@ -23,6 +23,7 @@ + diff --git a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj index 092ee74b..0bd1c286 100644 --- a/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj +++ b/src/Core_30/HandyControl_Core_30/HandyControl_Core_30.csproj @@ -45,9 +45,6 @@ - - - Resources\dropper.cur diff --git a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj index 6f92bb4a..46d7b027 100644 --- a/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj +++ b/src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj @@ -57,7 +57,7 @@ - 5.4.1 + 5.4.1.1 11.0.2 diff --git a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj index 414a0da9..00990efe 100644 --- a/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj +++ b/src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj @@ -127,7 +127,7 @@ - 5.4.1 + 5.4.1.1 11.0.2 diff --git a/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs b/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs index a9daea11..75ef4e9c 100644 --- a/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs +++ b/src/Shared/HandyControlDemo_Shared/Tools/Helper/CommonHelper.cs @@ -19,7 +19,7 @@ namespace HandyControlDemo.Tools return info; } } - return default(SystemVersionInfo); + return default; } } } \ No newline at end of file