Skip to content

Commit a2059de

Browse files
ryuyuryuyu
authored
Update CS Dependencies (#7259)
* Update to latest server common packages. * Update references to dependencies pulling in Microsoft.Data.OData 5.7.0 -> 5.8.4 * Fix binding redirects * Update to real release of ServerCommon
1 parent 8a3f5f9 commit a2059de

8 files changed

Lines changed: 26 additions & 72 deletions

File tree

‎src/DatabaseMigrationTools/DatabaseMigrationTools.csproj‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,6 @@
5454
<None Include="App.config" />
5555
</ItemGroup>
5656
<ItemGroup>
57-
<PackageReference Include="Autofac.Extensions.DependencyInjection">
58-
<Version>4.2.0</Version>
59-
</PackageReference>
6057
<PackageReference Include="EntityFramework">
6158
<Version>6.2.0</Version>
6259
</PackageReference>
@@ -65,15 +62,6 @@
6562
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
6663
<PrivateAssets>all</PrivateAssets>
6764
</PackageReference>
68-
<PackageReference Include="Microsoft.Extensions.Configuration">
69-
<Version>1.1.2</Version>
70-
</PackageReference>
71-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions">
72-
<Version>1.1.2</Version>
73-
</PackageReference>
74-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder">
75-
<Version>1.1.2</Version>
76-
</PackageReference>
7765
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables">
7866
<Version>1.1.2</Version>
7967
</PackageReference>
@@ -83,23 +71,17 @@
8371
<PackageReference Include="Microsoft.Extensions.Configuration.Json">
8472
<Version>1.1.2</Version>
8573
</PackageReference>
86-
<PackageReference Include="Microsoft.Extensions.Logging">
87-
<Version>1.0.0</Version>
88-
</PackageReference>
89-
<PackageReference Include="Microsoft.Extensions.Options">
90-
<Version>1.1.2</Version>
91-
</PackageReference>
9274
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
9375
<Version>1.1.2</Version>
9476
</PackageReference>
9577
<PackageReference Include="NuGet.Jobs.Common">
9678
<Version>4.1.0-master-2602271</Version>
9779
</PackageReference>
9880
<PackageReference Include="NuGet.Services.Configuration">
99-
<Version>2.49.0</Version>
81+
<Version>2.50.0</Version>
10082
</PackageReference>
10183
<PackageReference Include="NuGet.Services.Validation">
102-
<Version>2.49.0</Version>
84+
<Version>2.50.0</Version>
10385
</PackageReference>
10486
</ItemGroup>
10587
<ItemGroup>

‎src/GalleryTools/GalleryTools.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@
8686
<PackageReference Include="Microsoft.Extensions.CommandLineUtils">
8787
<Version>1.1.1</Version>
8888
</PackageReference>
89-
<PackageReference Include="Newtonsoft.Json">
90-
<Version>9.0.1</Version>
91-
</PackageReference>
9289
<PackageReference Include="System.ValueTuple">
9390
<Version>4.5.0</Version>
9491
</PackageReference>

‎src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
<Reference Include="System.Data.DataSetExtensions" />
4949
<Reference Include="Microsoft.CSharp" />
5050
<Reference Include="System.Data" />
51-
<Reference Include="System.Net.Http" />
5251
<Reference Include="System.Xml" />
5352
</ItemGroup>
5453
<ItemGroup>
@@ -109,7 +108,7 @@
109108
<Version>4.1.0-master-2602271</Version>
110109
</PackageReference>
111110
<PackageReference Include="NuGet.Services.Configuration">
112-
<Version>2.49.0</Version>
111+
<Version>2.50.0</Version>
113112
</PackageReference>
114113
</ItemGroup>
115114
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎src/NuGetGallery.Core/NuGetGallery.Core.csproj‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,16 @@
227227
<Version>2.49.0</Version>
228228
</PackageReference>
229229
<PackageReference Include="NuGet.Services.FeatureFlags">
230-
<Version>2.49.0</Version>
230+
<Version>2.50.0</Version>
231231
</PackageReference>
232232
<PackageReference Include="NuGet.Services.Messaging.Email">
233-
<Version>2.49.0</Version>
233+
<Version>2.50.0</Version>
234234
</PackageReference>
235235
<PackageReference Include="NuGet.Services.Validation">
236-
<Version>2.49.0</Version>
236+
<Version>2.50.0</Version>
237237
</PackageReference>
238238
<PackageReference Include="NuGet.Services.Validation.Issues">
239-
<Version>2.49.0</Version>
239+
<Version>2.50.0</Version>
240240
</PackageReference>
241241
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
242242
<Version>1.2.0</Version>
@@ -256,10 +256,7 @@
256256
<Version>1.0.0</Version>
257257
</PackageReference>
258258
<PackageReference Include="Microsoft.Data.Services.Client">
259-
<Version>5.7.0</Version>
260-
</PackageReference>
261-
<PackageReference Include="Newtonsoft.Json">
262-
<Version>9.0.1</Version>
259+
<Version>5.8.4</Version>
263260
</PackageReference>
264261
<PackageReference Include="Microsoft.WindowsAzure.ConfigurationManager">
265262
<Version>3.1.0</Version>
@@ -272,7 +269,7 @@
272269
<Version>5.0.0-preview1.5665</Version>
273270
</PackageReference>
274271
<PackageReference Include="WindowsAzure.Storage">
275-
<Version>7.1.2</Version>
272+
<Version>9.3.3</Version>
276273
</PackageReference>
277274
</ItemGroup>
278275
<ItemGroup>

‎src/NuGetGallery.Services/NuGetGallery.Services.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
<Reference Include="System.Data.DataSetExtensions" />
3838
<Reference Include="Microsoft.CSharp" />
3939
<Reference Include="System.Data" />
40-
<Reference Include="System.Net.Http" />
4140
<Reference Include="System.Xml" />
4241
</ItemGroup>
4342
<ItemGroup>
@@ -198,7 +197,7 @@
198197
<Version>5.0.0-preview1.5665</Version>
199198
</PackageReference>
200199
<PackageReference Include="NuGet.Services.Logging">
201-
<Version>2.49.0</Version>
200+
<Version>2.50.0</Version>
202201
</PackageReference>
203202
<PackageReference Include="System.Runtime">
204203
<Version>4.3.1</Version>

‎src/NuGetGallery/NuGetGallery.csproj‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,7 +2071,7 @@
20712071
<Version>2.2.0</Version>
20722072
</PackageReference>
20732073
<PackageReference Include="NuGet.Services.Licenses">
2074-
<Version>2.49.0</Version>
2074+
<Version>2.50.0</Version>
20752075
</PackageReference>
20762076
<PackageReference Include="NuGet.StrongName.AnglicanGeek.MarkdownMailer">
20772077
<Version>1.2.0</Version>
@@ -2219,17 +2219,8 @@
22192219
<PackageReference Include="Microsoft.Bcl.Compression">
22202220
<Version>3.9.85</Version>
22212221
</PackageReference>
2222-
<PackageReference Include="Microsoft.Data.Edm">
2223-
<Version>5.7.0</Version>
2224-
</PackageReference>
2225-
<PackageReference Include="Microsoft.Data.OData">
2226-
<Version>5.7.0</Version>
2227-
</PackageReference>
22282222
<PackageReference Include="Microsoft.Data.Services">
2229-
<Version>5.7.0</Version>
2230-
</PackageReference>
2231-
<PackageReference Include="Microsoft.Data.Services.Client">
2232-
<Version>5.7.0</Version>
2223+
<Version>5.8.4</Version>
22332224
</PackageReference>
22342225
<PackageReference Include="Microsoft.Extensions.Logging">
22352226
<Version>2.2.0</Version>
@@ -2285,26 +2276,20 @@
22852276
<PackageReference Include="MvcTreeView">
22862277
<Version>1.4.0</Version>
22872278
</PackageReference>
2288-
<PackageReference Include="Newtonsoft.Json">
2289-
<Version>9.0.1</Version>
2290-
</PackageReference>
22912279
<PackageReference Include="NuGet.Configuration">
22922280
<Version>5.0.0-preview1.5665</Version>
22932281
</PackageReference>
22942282
<PackageReference Include="NuGet.Protocol">
22952283
<Version>5.0.0-preview1.5665</Version>
22962284
</PackageReference>
22972285
<PackageReference Include="NuGet.Services.KeyVault">
2298-
<Version>2.49.0</Version>
2299-
</PackageReference>
2300-
<PackageReference Include="NuGet.Services.Logging">
2301-
<Version>2.49.0</Version>
2286+
<Version>2.50.0</Version>
23022287
</PackageReference>
23032288
<PackageReference Include="NuGet.Services.Owin">
2304-
<Version>2.49.0</Version>
2289+
<Version>2.50.0</Version>
23052290
</PackageReference>
23062291
<PackageReference Include="NuGet.Services.Sql">
2307-
<Version>2.49.0</Version>
2292+
<Version>2.50.0</Version>
23082293
</PackageReference>
23092294
<PackageReference Include="Owin">
23102295
<Version>1.0.0</Version>
@@ -2352,7 +2337,7 @@
23522337
<Version>4.1.3</Version>
23532338
</PackageReference>
23542339
<PackageReference Include="WindowsAzure.Storage">
2355-
<Version>7.1.2</Version>
2340+
<Version>9.3.3</Version>
23562341
</PackageReference>
23572342
</ItemGroup>
23582343
<PropertyGroup>

‎src/NuGetGallery/Web.config‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -492,6 +492,10 @@
492492
</system.webServer>
493493
<runtime>
494494
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
495+
<dependentAssembly>
496+
<assemblyIdentity name="NuGet.Services.Contracts" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
497+
<bindingRedirect oldVersion="0.0.0.0-2.50.0.0" newVersion="2.50.0.0"/>
498+
</dependentAssembly>
495499
<dependentAssembly>
496500
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral"/>
497501
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0"/>
@@ -734,7 +738,7 @@
734738
</dependentAssembly>
735739
<dependentAssembly>
736740
<assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
737-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
741+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
738742
</dependentAssembly>
739743
<dependentAssembly>
740744
<assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
@@ -754,7 +758,7 @@
754758
</dependentAssembly>
755759
<dependentAssembly>
756760
<assemblyIdentity name="System.Spatial" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
757-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
761+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
758762
</dependentAssembly>
759763
<dependentAssembly>
760764
<assemblyIdentity name="Microsoft.Extensions.Logging" publicKeyToken="ADB9793829DDAE60" culture="neutral"/>
@@ -774,11 +778,11 @@
774778
</dependentAssembly>
775779
<dependentAssembly>
776780
<assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
777-
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
781+
<bindingRedirect oldVersion="0.0.0.0-5.8.4.0" newVersion="5.8.4.0"/>
778782
</dependentAssembly>
779783
<dependentAssembly>
780784
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
781-
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
785+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
782786
</dependentAssembly>
783787
<dependentAssembly>
784788
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
@@ -846,4 +850,4 @@
846850
</listeners>
847851
</trace>
848852
</system.diagnostics>
849-
</configuration>
853+
</configuration>

‎tests/NuGetGallery.Facts/NuGetGallery.Facts.csproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -327,17 +327,8 @@
327327
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
328328
</ItemGroup>
329329
<ItemGroup>
330-
<PackageReference Include="Microsoft.Data.Edm">
331-
<Version>5.7.0</Version>
332-
</PackageReference>
333-
<PackageReference Include="Microsoft.Data.OData">
334-
<Version>5.7.0</Version>
335-
</PackageReference>
336330
<PackageReference Include="Microsoft.Data.Services">
337-
<Version>5.7.0</Version>
338-
</PackageReference>
339-
<PackageReference Include="Microsoft.Data.Services.Client">
340-
<Version>5.7.0</Version>
331+
<Version>5.8.4</Version>
341332
</PackageReference>
342333
<PackageReference Include="Moq">
343334
<Version>4.8.2</Version>

0 commit comments

Comments
 (0)