Merge pull request #139 from HandyOrg/pr/137

Pr/137
This commit is contained in:
NaBian authored and GitHub committed 2019-07-25 23:18:11 +08:00
commit b6963d2770
5 files changed
+7 -9

No files matched your search

@@ -23,6 +23,7 @@
<PackageReference Include="CommonServiceLocator" Version="2.0.2" /> <PackageReference Include="CommonServiceLocator" Version="2.0.2" />
<PackageReference Include="MvvmLightLibs" Version="5.4.1.1" /> <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs"> <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">
@@ -57,7 +57,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MvvmLightLibs"> <PackageReference Include="MvvmLightLibs">
<Version>5.4.1</Version> <Version>5.4.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
@@ -127,7 +127,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="MvvmLightLibs"> <PackageReference Include="MvvmLightLibs">
<Version>5.4.1</Version> <Version>5.4.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Newtonsoft.Json"> <PackageReference Include="Newtonsoft.Json">
<Version>11.0.2</Version> <Version>11.0.2</Version>
@@ -26,9 +26,8 @@ namespace HandyControlDemo
UpdateSkin(GlobalData.Config.Skin); UpdateSkin(GlobalData.Config.Skin);
} }
#if !Core
ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo()); ConfigHelper.Instance.SetSystemVersionInfo(CommonHelper.GetSystemVersionInfo());
#endif
ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00; ServicePointManager.SecurityProtocol = (SecurityProtocolType)(SslProtocols)0x00000C00;
} }
@@ -1,5 +1,4 @@
#if !Core using System.Linq;
using System.Linq;
using System.Management; using System.Management;
using HandyControl.Data; using HandyControl.Data;
@@ -20,8 +19,7 @@ namespace HandyControlDemo.Tools
return info; return info;
} }
} }
return default(SystemVersionInfo); return default;
} }
} }
} }
#endif