Skip to content

Commit 286f49c

Browse files
Migrate wpf app to packagereference
1 parent a3d7515 commit 286f49c

File tree

3 files changed

+18
-35
lines changed

3 files changed

+18
-35
lines changed

Samples/WpfSample/App.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
55
</startup>
66
<runtime>
77
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
88
<dependentAssembly>
9-
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral"/>
10-
<bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0"/>
9+
<assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-2.0.6.0" newVersion="2.0.6.0" />
1111
</dependentAssembly>
1212
</assemblyBinding>
1313
</runtime>

Samples/WpfSample/WpfSample.csproj

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,8 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="CommonServiceLocator, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\CommonServiceLocator.2.0.6\lib\net47\CommonServiceLocator.dll</HintPath>
41-
</Reference>
42-
<Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
44-
</Reference>
45-
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
47-
</Reference>
48-
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
53-
</Reference>
5439
<Reference Include="System" />
5540
<Reference Include="System.Data" />
56-
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
58-
</Reference>
5941
<Reference Include="System.Xml" />
6042
<Reference Include="Microsoft.CSharp" />
6143
<Reference Include="System.Core" />
@@ -65,9 +47,6 @@
6547
<Reference Include="System.Xaml">
6648
<RequiredTargetFramework>4.0</RequiredTargetFramework>
6749
</Reference>
68-
<Reference Include="Tracing, Version=2.2.19302.1, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\Tracing.2.2.19302.1\lib\net45\Tracing.dll</HintPath>
70-
</Reference>
7150
<Reference Include="WindowsBase" />
7251
<Reference Include="PresentationCore" />
7352
<Reference Include="PresentationFramework" />
@@ -124,7 +103,6 @@
124103
<Generator>ResXFileCodeGenerator</Generator>
125104
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
126105
</EmbeddedResource>
127-
<None Include="packages.config" />
128106
<None Include="Properties\Settings.settings">
129107
<Generator>SettingsSingleFileGenerator</Generator>
130108
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -139,6 +117,19 @@
139117
<Name>HttpClient.Caching</Name>
140118
</ProjectReference>
141119
</ItemGroup>
142-
<ItemGroup />
120+
<ItemGroup>
121+
<PackageReference Include="CommonServiceLocator">
122+
<Version>2.0.6</Version>
123+
</PackageReference>
124+
<PackageReference Include="MvvmLight">
125+
<Version>5.4.1.1</Version>
126+
</PackageReference>
127+
<PackageReference Include="Newtonsoft.Json">
128+
<Version>13.0.1</Version>
129+
</PackageReference>
130+
<PackageReference Include="Tracing">
131+
<Version>2.4.5</Version>
132+
</PackageReference>
133+
</ItemGroup>
143134
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
144135
</Project>

Samples/WpfSample/packages.config

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)