Skip to content

Commit 83478af

Browse files
davidbritchdavidbritch
committed
Package consolidation.
1 parent 796dd00 commit 83478af

8 files changed

Lines changed: 45 additions & 25 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/eShopOnContainers.Droid.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,9 @@
415415
</PropertyGroup>
416416
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Exif.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Exif.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets'))" />
417417
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets'))" />
418+
<Error Condition="!Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
418419
</Target>
419420
<Import Project="..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Android.Support.Exif.25.1.0\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets')" />
420421
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" />
422+
<Import Project="..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
421423
</Project>

‎src/Mobile/eShopOnContainers/eShopOnContainers.Droid/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="monoandroid80" />
1212
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid80" />
1313
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid80" />
14-
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid80" />
14+
<package id="NETStandard.Library" version="2.0.0" targetFramework="monoandroid80" />
1515
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
1616
<package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid80" />
1717
<package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid80" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@
5252
<ItemGroup>
5353
<Reference Include="Mono.Android" />
5454
<Reference Include="mscorlib" />
55+
<Reference Include="Plugin.Permissions, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
57+
</Reference>
58+
<Reference Include="Plugin.Permissions.Abstractions, Version=2.2.1.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\..\..\..\packages\Plugin.Permissions.2.2.1\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
60+
</Reference>
5561
<Reference Include="System" />
5662
<Reference Include="System.Core" />
5763
<Reference Include="System.Xml.Linq" />
@@ -158,12 +164,6 @@
158164
<Reference Include="Plugin.CurrentActivity">
159165
<HintPath>..\..\..\..\packages\Plugin.CurrentActivity.1.0.1\lib\MonoAndroid10\Plugin.CurrentActivity.dll</HintPath>
160166
</Reference>
161-
<Reference Include="Plugin.Permissions.Abstractions">
162-
<HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.Abstractions.dll</HintPath>
163-
</Reference>
164-
<Reference Include="Plugin.Permissions">
165-
<HintPath>..\..\..\..\packages\Plugin.Permissions.1.1.7\lib\MonoAndroid10\Plugin.Permissions.dll</HintPath>
166-
</Reference>
167167
<Reference Include="Plugin.Geolocator.Abstractions">
168168
<HintPath>..\..\..\..\packages\Xam.Plugin.Geolocator.3.0.4\lib\MonoAndroid10\Plugin.Geolocator.Abstractions.dll</HintPath>
169169
</Reference>
@@ -289,6 +289,8 @@
289289
<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>
290290
</PropertyGroup>
291291
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Android.Support.Exif.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Android.Support.Exif.25.4.0.2\build\MonoAndroid70\Xamarin.Android.Support.Exif.targets'))" />
292+
<Error Condition="!Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
292293
</Target>
293294
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" />
295+
<Import Project="..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
294296
</Project>

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="monoandroid80" />
99
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="monoandroid80" />
1010
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="monoandroid80" />
11-
<package id="NETStandard.Library" version="1.6.1" targetFramework="monoandroid80" />
11+
<package id="NETStandard.Library" version="2.0.0" targetFramework="monoandroid80" />
1212
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="monoandroid80" />
1313
<package id="PCLCrypto" version="2.0.147" targetFramework="monoandroid80" />
1414
<package id="PInvoke.BCrypt" version="0.3.2" targetFramework="monoandroid80" />
1515
<package id="PInvoke.Kernel32" version="0.3.2" targetFramework="monoandroid80" />
1616
<package id="PInvoke.NCrypt" version="0.3.2" targetFramework="monoandroid80" />
1717
<package id="PInvoke.Windows.Core" version="0.3.2" targetFramework="monoandroid80" />
1818
<package id="Plugin.CurrentActivity" version="1.0.1" targetFramework="monoandroid80" />
19-
<package id="Plugin.Permissions" version="1.1.7" targetFramework="monoandroid80" />
19+
<package id="Plugin.Permissions" version="2.2.1" targetFramework="monoandroid80" />
2020
<package id="SlideOverKit" version="2.1.5" targetFramework="monoandroid80" />
2121
<package id="Splat" version="2.0.0" targetFramework="monoandroid80" />
2222
<package id="System.AppContext" version="4.3.0" targetFramework="monoandroid80" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/eShopOnContainers.TestRunner.iOS.csproj‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.props')" />
34
<Import Project="..\..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
4-
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\build\netstandard1.0\Xamarin.Forms.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -111,21 +111,21 @@
111111
<Reference Include="System" />
112112
<Reference Include="System.Xml" />
113113
<Reference Include="System.Core" />
114-
<Reference Include="Xamarin.iOS" />
115-
<Reference Include="System.IO.Compression" />
116-
<Reference Include="System.Net.Http" />
117-
<Reference Include="Xamarin.Forms.Core">
118-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
114+
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
115+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
119116
</Reference>
120-
<Reference Include="Xamarin.Forms.Platform">
121-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
117+
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
118+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
122119
</Reference>
123-
<Reference Include="Xamarin.Forms.Platform.iOS">
124-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
120+
<Reference Include="Xamarin.Forms.Platform.iOS, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
121+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
125122
</Reference>
126-
<Reference Include="Xamarin.Forms.Xaml">
127-
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
123+
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
124+
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
128125
</Reference>
126+
<Reference Include="Xamarin.iOS" />
127+
<Reference Include="System.IO.Compression" />
128+
<Reference Include="System.Net.Http" />
129129
<Reference Include="xunit.runner.devices">
130130
<HintPath>..\..\..\..\packages\xunit.runner.devices.2.3.3\lib\xamarinios10\xunit.runner.devices.dll</HintPath>
131131
</Reference>
@@ -168,7 +168,16 @@
168168
</ProjectReference>
169169
</ItemGroup>
170170
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
171-
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.121934\build\netstandard1.0\Xamarin.Forms.targets')" />
172171
<Import Project="..\..\..\..\packages\xunit.runner.devices.2.3.3\build\xamarinios10\xunit.runner.devices.targets" Condition="Exists('..\..\..\..\packages\xunit.runner.devices.2.3.3\build\xamarinios10\xunit.runner.devices.targets')" />
173172
<Import Project="..\..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
173+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
174+
<PropertyGroup>
175+
<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>
176+
</PropertyGroup>
177+
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.props'))" />
178+
<Error Condition="!Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets'))" />
179+
<Error Condition="!Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
180+
</Target>
181+
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" />
182+
<Import Project="..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
174183
</Project>

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.iOS/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
55
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
66
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
7-
<package id="NETStandard.Library" version="1.6.1" targetFramework="xamarinios10" />
7+
<package id="NETStandard.Library" version="2.0.0" targetFramework="xamarinios10" />
88
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="xamarinios10" />
99
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />
1010
<package id="System.Collections" version="4.3.0" targetFramework="xamarinios10" />
@@ -54,7 +54,7 @@
5454
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="xamarinios10" />
5555
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="xamarinios10" />
5656
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="xamarinios10" />
57-
<package id="Xamarin.Forms" version="2.5.0.121934" targetFramework="xamarinios10" />
57+
<package id="Xamarin.Forms" version="2.5.0.122203" targetFramework="xamarinios10" />
5858
<package id="xunit" version="2.3.1" targetFramework="xamarinios10" />
5959
<package id="xunit.abstractions" version="2.0.1" targetFramework="xamarinios10" />
6060
<package id="xunit.analyzers" version="0.7.0" targetFramework="xamarinios10" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/eShopOnContainers.iOS.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,4 +380,11 @@
380380
</ItemGroup>
381381
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
382382
<Import Project="..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\..\..\packages\Xamarin.Forms.2.5.0.122203\build\netstandard1.0\Xamarin.Forms.targets')" />
383+
<Import Project="..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" />
384+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
385+
<PropertyGroup>
386+
<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>
387+
</PropertyGroup>
388+
<Error Condition="!Exists('..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\NETStandard.Library.2.0.0\build\netstandard2.0\NETStandard.Library.targets'))" />
389+
</Target>
383390
</Project>

‎src/Mobile/eShopOnContainers/eShopOnContainers.iOS/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="Microsoft.CSharp" version="4.3.0" targetFramework="xamarinios10" />
55
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="xamarinios10" />
66
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="xamarinios10" />
7-
<package id="NETStandard.Library" version="1.6.1" targetFramework="xamarinios10" />
7+
<package id="NETStandard.Library" version="2.0.0" targetFramework="xamarinios10" />
88
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="xamarinios10" />
99
<package id="SlideOverKit" version="2.1.5" targetFramework="xamarinios10" />
1010
<package id="System.AppContext" version="4.3.0" targetFramework="xamarinios10" />

0 commit comments

Comments
 (0)