Skip to content

Commit 76aed02

Browse files
David BritchDavid Britch
David Britch
authored and
David Britch
committed
NuGet package consolidation.
1 parent a55822e commit 76aed02

12 files changed

Lines changed: 40 additions & 49 deletions

File tree

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,16 @@
7070
<Private>True</Private>
7171
</Reference>
7272
<Reference Include="FFImageLoading, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
74-
<Private>True</Private>
73+
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.dll</HintPath>
7574
</Reference>
7675
<Reference Include="FFImageLoading.Forms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
78-
<Private>True</Private>
76+
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.dll</HintPath>
7977
</Reference>
8078
<Reference Include="FFImageLoading.Forms.Droid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
82-
<Private>True</Private>
79+
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.Forms.2.2.9\lib\MonoAndroid10\FFImageLoading.Forms.Droid.dll</HintPath>
8380
</Reference>
8481
<Reference Include="FFImageLoading.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
85-
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.6-pre-256\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
86-
<Private>True</Private>
82+
<HintPath>..\..\..\..\packages\Xamarin.FFImageLoading.2.2.9\lib\MonoAndroid10\FFImageLoading.Platform.dll</HintPath>
8783
</Reference>
8884
<Reference Include="IdentityModel.Portable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
8985
<HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<package id="Xamarin.Android.Support.v7.MediaRouter" version="23.3.0" targetFramework="monoandroid70" />
7171
<package id="Xamarin.Android.Support.v7.RecyclerView" version="23.3.0" targetFramework="monoandroid70" />
7272
<package id="Xamarin.Android.Support.Vector.Drawable" version="23.3.0" targetFramework="monoandroid70" />
73-
<package id="Xamarin.FFImageLoading" version="2.2.6-pre-256" targetFramework="monoandroid70" />
74-
<package id="Xamarin.FFImageLoading.Forms" version="2.2.6-pre-256" targetFramework="monoandroid70" />
73+
<package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
74+
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
7575
<package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
7676
<package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="monoandroid60" />
7777
<package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid70" />

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

100644100755
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<Reference Include="mscorlib" />
5454
<Reference Include="System" />
5555
<Reference Include="System.Core" />
56+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
57+
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
58+
</Reference>
59+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60+
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
61+
</Reference>
5662
<Reference Include="System.Xml.Linq" />
5763
<Reference Include="System.Xml" />
5864
<Reference Include="Xamarin.Android.Support.Animated.Vector.Drawable, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -90,6 +96,9 @@
9096
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9197
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Core.dll</HintPath>
9298
</Reference>
99+
<Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
100+
<HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
101+
</Reference>
93102
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
94103
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\MonoAndroid10\Xamarin.Forms.Platform.dll</HintPath>
95104
</Reference>
@@ -152,12 +161,6 @@
152161
<Reference Include="Acr.UserDialogs.Interface">
153162
<HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\MonoAndroid10\Acr.UserDialogs.Interface.dll</HintPath>
154163
</Reference>
155-
<Reference Include="System.Net.Http.Extensions">
156-
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Extensions.dll</HintPath>
157-
</Reference>
158-
<Reference Include="System.Net.Http.Primitives">
159-
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\monoandroid\System.Net.Http.Primitives.dll</HintPath>
160-
</Reference>
161164
<Reference Include="IdentityModel.Portable">
162165
<HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
163166
</Reference>
@@ -179,9 +182,6 @@
179182
<Reference Include="OkHttp">
180183
<HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\MonoAndroid\OkHttp.dll</HintPath>
181184
</Reference>
182-
<Reference Include="Xamarin.Forms.Pages">
183-
<HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.0.38-pre2\lib\MonoAndroid10\Xamarin.Forms.Pages.dll</HintPath>
184-
</Reference>
185185
<Reference Include="Xamarin.Forms.Theme.Android">
186186
<HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\MonoAndroid10\Xamarin.Forms.Theme.Android.dll</HintPath>
187187
</Reference>

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

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="IdentityModel" version="1.3.1" targetFramework="monoandroid60" />
88
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="monoandroid60" />
99
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="monoandroid60" />
10-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="monoandroid60" />
10+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="monoandroid60" />
1111
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="monoandroid60" />
1212
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="monoandroid60" />
1313
<package id="modernhttpclient" version="2.4.2" targetFramework="monoandroid60" />
@@ -70,7 +70,7 @@
7070
<package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="monoandroid60" />
7171
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="monoandroid60" />
7272
<package id="Xamarin.Forms" version="2.3.4.231" targetFramework="monoandroid60" />
73-
<package id="Xamarin.Forms.Pages" version="2.3.0.38-pre2" targetFramework="monoandroid60" />
73+
<package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="monoandroid60" />
7474
<package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
7575
<package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="monoandroid60" />
7676
<package id="xunit.abstractions" version="2.0.0" targetFramework="monoandroid60" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Windows/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"dependencies": {
33
"Microsoft.NETCore.UniversalWindowsPlatform": "5.3.3",
44
"Xamarin.Forms": "2.3.4.231",
5-
"xunit": "2.2.0-beta4-build3444",
5+
"xunit": "2.2.0",
66
"xunit.runner.devices": "2.1.0",
77
"xunit.runner.utility": "2.2.0-beta4-build3444"
88
},

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

100644100755
File mode changed.

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

100644100755
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,20 @@
110110
</ItemGroup>
111111
<ItemGroup>
112112
<Reference Include="System" />
113+
<Reference Include="System.Net.Http.Extensions, Version=2.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114+
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Extensions.dll</HintPath>
115+
</Reference>
116+
<Reference Include="System.Net.Http.Primitives, Version=4.2.29.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
117+
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.29\lib\Xamarin.iOS10\System.Net.Http.Primitives.dll</HintPath>
118+
</Reference>
113119
<Reference Include="System.Xml" />
114120
<Reference Include="System.Core" />
115121
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
116122
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
117123
</Reference>
124+
<Reference Include="Xamarin.Forms.Pages, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
125+
<HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
126+
</Reference>
118127
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
119128
<HintPath>..\..\..\..\packages\Xamarin.Forms.2.3.4.231\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
120129
</Reference>
@@ -175,12 +184,6 @@
175184
<Reference Include="Acr.UserDialogs.Interface">
176185
<HintPath>..\..\..\..\packages\Acr.UserDialogs.6.3.3\lib\Xamarin.iOS10\Acr.UserDialogs.Interface.dll</HintPath>
177186
</Reference>
178-
<Reference Include="System.Net.Http.Extensions">
179-
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Extensions.dll</HintPath>
180-
</Reference>
181-
<Reference Include="System.Net.Http.Primitives">
182-
<HintPath>..\..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\portable-net45+win8\System.Net.Http.Primitives.dll</HintPath>
183-
</Reference>
184187
<Reference Include="IdentityModel.Portable">
185188
<HintPath>..\..\..\..\packages\IdentityModel.1.3.1\lib\portable-net45+wp80+win8+wpa81\IdentityModel.Portable.dll</HintPath>
186189
</Reference>
@@ -202,9 +205,6 @@
202205
<Reference Include="ModernHttpClient">
203206
<HintPath>..\..\..\..\packages\modernhttpclient.2.4.2\lib\Xamarin.iOS10\ModernHttpClient.dll</HintPath>
204207
</Reference>
205-
<Reference Include="Xamarin.Forms.Pages">
206-
<HintPath>..\..\..\..\packages\Xamarin.Forms.Pages.2.3.0.38-pre2\lib\Xamarin.iOS10\Xamarin.Forms.Pages.dll</HintPath>
207-
</Reference>
208208
<Reference Include="Xamarin.Forms.Theme.Base">
209209
<HintPath>..\..\..\..\packages\Xamarin.Forms.Theme.Base.1.0.0.43-pre1\lib\Xamarin.iOS10\Xamarin.Forms.Theme.Base.dll</HintPath>
210210
</Reference>

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

100644100755
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="IdentityModel" version="1.3.1" targetFramework="xamarinios10" />
77
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="xamarinios10" />
88
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="xamarinios10" />
9-
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="xamarinios10" />
9+
<package id="Microsoft.Net.Http" version="2.2.29" targetFramework="xamarinios10" />
1010
<package id="Microsoft.NETCore.Platforms" version="1.0.1" targetFramework="xamarinios10" />
1111
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="xamarinios10" />
1212
<package id="modernhttpclient" version="2.4.2" targetFramework="xamarinios10" />
@@ -62,7 +62,7 @@
6262
<package id="Xamarin.FFImageLoading" version="2.2.9" targetFramework="xamarinios10" />
6363
<package id="Xamarin.FFImageLoading.Forms" version="2.2.9" targetFramework="xamarinios10" />
6464
<package id="Xamarin.Forms" version="2.3.4.231" targetFramework="xamarinios10" />
65-
<package id="Xamarin.Forms.Pages" version="2.3.0.38-pre2" targetFramework="xamarinios10" />
65+
<package id="Xamarin.Forms.Pages" version="2.3.4.231" targetFramework="xamarinios10" />
6666
<package id="Xamarin.Forms.Theme.Base" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
6767
<package id="Xamarin.Forms.Theme.Light" version="1.0.0.43-pre1" targetFramework="xamarinios10" />
6868
<package id="xunit.abstractions" version="2.0.0" targetFramework="xamarinios10" />

‎src/Mobile/eShopOnContainers/eShopOnContainers.Windows/project.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"Newtonsoft.Json": "9.0.1",
77
"SlideOverKit": "2.1.4",
88
"Xam.Plugins.Settings": "2.6.0.12-beta",
9-
"Xamarin.FFImageLoading": "2.2.6-pre-256",
10-
"Xamarin.FFImageLoading.Forms": "2.2.6-pre-256",
9+
"Xamarin.FFImageLoading": "2.2.9",
10+
"Xamarin.FFImageLoading.Forms": "2.2.9",
1111
"Xamarin.Forms": "2.3.4.231",
1212
"Xamarin.Forms.Theme.Base": "1.0.0.43-pre1",
1313
"Xamarin.Forms.Theme.Light": "1.0.0.43-pre1"

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

100644100755
File mode changed.

0 commit comments

Comments
 (0)