Skip to content
This repository has been archived by the owner on Mar 20, 2023. It is now read-only.

Commit

Permalink
Merge pull request #6 from mgomar/master
Browse files Browse the repository at this point in the history 
Update nugets, and migrate to PackageReference
  • Loading branch information
David Sanchez (MSFT) committed Feb 7, 2019
2 parents 2452732 + 95c16e3 commit e827567
Show file tree
Hide file tree
Showing 13 changed files with 55 additions and 72 deletions.
48 changes: 20 additions & 28 deletions Source/CouponReader.Common/CouponReader.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net47\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Toolkit.Wpf.UI.Controls, Version=5.1.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Toolkit.Wpf.UI.Controls.5.1.0-build.14.g97c3f5c88d\lib\net462\Microsoft.Toolkit.Wpf.UI.Controls.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Toolkit.Wpf.UI.XamlHost, Version=5.1.0.0, Culture=neutral, PublicKeyToken=4aff67a105548ee2, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Toolkit.Wpf.UI.XamlHost.5.1.0-build.14.g97c3f5c88d\lib\net462\Microsoft.Toolkit.Wpf.UI.XamlHost.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Prism, Version=7.2.0.660, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Core.7.2.0.660-ci\lib\net45\Prism.dll</HintPath>
</Reference>
<Reference Include="Prism.Wpf, Version=7.2.0.660, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Wpf.7.2.0.660-ci\lib\net45\Prism.Wpf.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Net" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Wpf.7.2.0.660-ci\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -95,16 +77,26 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls">
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost">
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Prism.Core">
<Version>7.2.0.904-ci</Version>
</PackageReference>
<PackageReference Include="Prism.Wpf">
<Version>7.2.0.904-ci</Version>
</PackageReference>
<PackageReference Include="System.Runtime.WindowsRuntime">
<Version>4.6.0-preview.19073.11</Version>
</PackageReference>
<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml">
<Version>4.6.0-preview.19073.11</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\System.Runtime.WindowsRuntime.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.targets'))" />
<Error Condition="!Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets'))" />
</Target>
<Import Project="..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets" Condition="Exists('..\packages\System.Runtime.WindowsRuntime.UI.Xaml.4.6.0-dev.18570.1\build\net461\System.Runtime.WindowsRuntime.UI.Xaml.targets')" />
</Project>
12 changes: 1 addition & 11 deletions Source/CouponReader.Common/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Prism" publicKeyToken="40ee6c3a2184dc59" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.2.0.679" newVersion="7.2.0.679" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Toolkit.Wpf.UI.XamlHost" publicKeyToken="4aff67a105548ee2" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.0.0" newVersion="5.1.0.0" />
</dependentAssembly>
</assemblyBinding>
<runtime>
</runtime>
</configuration>
2 changes: 1 addition & 1 deletion Source/CouponReader.Core.Common/CouponReader.Core.Common.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Source/CouponReader.Core.Wpf/CouponReader.Core.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Core" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.DryIoc" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.Core" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.DryIoc" Version="7.2.0.904-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
</ItemGroup>

<ItemGroup>
Expand Down
9 changes: 5 additions & 4 deletions Source/CouponReader.Forms/CouponReader.WindowsForms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@
<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Prism, Version=7.2.0.679, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Core.7.2.0.679-ci\lib\net45\Prism.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xaml" />
Expand Down Expand Up @@ -80,7 +77,6 @@
<DependentUpon>Resources.resx</DependentUpon>
<DesignTime>True</DesignTime>
</Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand All @@ -103,5 +99,10 @@
<Name>CouponReader.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Prism.Core">
<Version>7.2.0.904-ci</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
18 changes: 9 additions & 9 deletions Source/CouponReader.Tests/CouponReader.Tests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" />
<Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
Expand Down Expand Up @@ -40,10 +40,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\MSTest.TestFramework.1.3.2\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
<HintPath>..\packages\MSTest.TestFramework.1.4.0\lib\net45\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -52,23 +52,23 @@
<Compile Include="CouponsServiceTests.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CouponReader.Common\CouponReader.Common.csproj">
<Project>{612c0cbe-0baa-4662-859c-dd6cc9a59498}</Project>
<Name>CouponReader.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets'))" />
</Target>
<Import Project="..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.3.2\build\net45\MSTest.TestAdapter.targets')" />
<Import Project="..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\packages\MSTest.TestAdapter.1.4.0\build\net45\MSTest.TestAdapter.targets')" />
</Project>
4 changes: 2 additions & 2 deletions Source/CouponReader.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MSTest.TestAdapter" version="1.3.2" targetFramework="net472" />
<package id="MSTest.TestFramework" version="1.3.2" targetFramework="net472" />
<package id="MSTest.TestAdapter" version="1.4.0" targetFramework="net472" />
<package id="MSTest.TestFramework" version="1.4.0" targetFramework="net472" />
</packages>
6 changes: 3 additions & 3 deletions Source/CouponReader.UnitTests/CouponReader.UnitTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.0-preview-20190203-03" />
<PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
<PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions Source/CouponReader.Wpf.Core.Module/CouponReader.Wpf.Core.Module.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@

<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls" Version="5.1.0-build.14.g97c3f5c88d" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-dev.18570.1" />
<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml" Version="4.6.0-dev.18570.1" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview.19073.11" />
<PackageReference Include="System.Runtime.WindowsRuntime.UI.Xaml" Version="4.6.0-preview.19073.11" />
<Reference Include="Windows">
<HintPath>$(MSBuildProgramFiles32)\Windows Kits\10\UnionMetadata\10.0.17763.0\Windows.winmd</HintPath>
<IsWinMDFile>true</IsWinMDFile>
Expand Down
6 changes: 3 additions & 3 deletions Source/CouponReader.Wpf.Module/CouponReader.Wpf.Module.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls">
<Version>5.0.0</Version>
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Wpf.UI.XamlHost">
<Version>5.0.0</Version>
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Prism.Wpf" Version="7.2.0.660-ci" />
<PackageReference Include="Prism.Wpf" Version="7.2.0.904-ci" />
</ItemGroup>
<ItemGroup>
<Page Include="Views\LoginView.xaml">
Expand Down
6 changes: 3 additions & 3 deletions Source/CouponReader.Wpf/CouponReader.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Prism.Core">
<Version>7.2.0.679-ci</Version>
<Version>7.2.0.904-ci</Version>
</PackageReference>
<PackageReference Include="Prism.DryIoc">
<Version>7.2.0.660-ci</Version>
<Version>7.2.0.904-ci</Version>
</PackageReference>
<PackageReference Include="Prism.Wpf">
<Version>7.2.0.660-ci</Version>
<Version>7.2.0.904-ci</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>7.1</LangVersion>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/WPFNetFX/WPFNetFX.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<Version>5.1.0-build.14.g97c3f5c88d</Version>
</PackageReference>
<PackageReference Include="Prism.Wpf">
<Version>7.2.0.660-ci</Version>
<Version>7.2.0.904-ci</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit e827567

Please sign in to comment.