Merge pull request #139 from HandyOrg/pr/137

Pr/137

src/Core_30/HandyControlDemo_Core_30/HandyControlDemo_Core30.csproj

@@ -23,6 +23,7 @@
     <PackageReference Include="CommonServiceLocator" Version="2.0.2" />
     <PackageReference Include="MvvmLightLibs" Version="5.4.1.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\Shared\HandyControlDemo_Shared\Data\MessageToken.cs">

src/Net_40/HandyControlDemo_Net_40/HandyControlDemo_Net_40.csproj

@@ -57,7 +57,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MvvmLightLibs">
-      <Version>5.4.1</Version>
+      <Version>5.4.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>

src/Net_GE45/HandyControlDemo_Net_GE45/HandyControlDemo_Net_GE45.csproj

@@ -127,7 +127,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MvvmLightLibs">
-      <Version>5.4.1</Version>
+      <Version>5.4.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>11.0.2</Version>

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;
         }
 

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;
 
@@ -20,8 +19,7 @@ namespace HandyControlDemo.Tools
                     return info;
                 }
             }
-            return default(SystemVersionInfo);
+            return default;
         }
     }
-}
-#endif
+}