merged pr
This commit is contained in:
1 parent
4490364cda
commit
536305a083
5 files changed
+4
-6
No files matched your search
@@ -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">
|
||||
|
||||
@@ -45,9 +45,6 @@
|
||||
<ItemGroup>
|
||||
<None Remove="Themes\Styles\Base\TreeViewBaseStyle.xaml" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="System.Management" Version="4.6.0-preview7.19362.9" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Resource Include="..\..\Shared\HandyControl_Shared\Resources\dropper.cur">
|
||||
<Link>Resources\dropper.cur</Link>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -19,7 +19,7 @@ namespace HandyControlDemo.Tools
|
||||
return info;
|
||||
}
|
||||
}
|
||||
return default(SystemVersionInfo);
|
||||
return default;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user