Skip to content

Commit 9dac8af

Browse files
agragr
authored
Package updates to address new warnings. (#10166)
* Package updates to address new warnings. * Test fix
1 parent 8accd3c commit 9dac8af

4 files changed

Lines changed: 23 additions & 16 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@
4040
<PackageVersion Include="Microsoft.ApplicationInsights" Version="2.21.0" />
4141
<PackageVersion Include="Microsoft.AspNet.DynamicData.EFProvider" Version="6.0.0" />
4242
<PackageVersion Include="Microsoft.AspNet.Identity.Core" Version="1.0.0" />
43-
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.3" />
43+
<PackageVersion Include="Microsoft.AspNet.Mvc" Version="5.2.9" />
4444
<PackageVersion Include="Microsoft.AspNet.Razor" Version="3.2.9" />
4545
<PackageVersion Include="Microsoft.AspNet.Web.Optimization" Version="1.1.3" />
46-
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
47-
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
46+
<PackageVersion Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
47+
<PackageVersion Include="Microsoft.AspNet.WebApi.Core" Version="5.2.9" />
4848
<PackageVersion Include="Microsoft.AspNet.WebApi.MessageHandlers.Compression.StrongName" Version="1.3.0" />
4949
<PackageVersion Include="Microsoft.AspNet.WebApi.OData" Version="5.7.0" />
50-
<PackageVersion Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.3" />
51-
<PackageVersion Include="Microsoft.AspNet.WebHelpers" Version="3.2.3" />
52-
<PackageVersion Include="Microsoft.AspNet.WebPages.Data" Version="3.2.3" />
53-
<PackageVersion Include="Microsoft.AspNet.WebPages.WebData" Version="3.2.3" />
54-
<PackageVersion Include="Microsoft.AspNet.WebPages" Version="3.2.3" />
50+
<PackageVersion Include="Microsoft.AspNet.WebApi.WebHost" Version="5.2.9" />
51+
<PackageVersion Include="Microsoft.AspNet.WebHelpers" Version="3.2.9" />
52+
<PackageVersion Include="Microsoft.AspNet.WebPages.Data" Version="3.2.9" />
53+
<PackageVersion Include="Microsoft.AspNet.WebPages.WebData" Version="3.2.9" />
54+
<PackageVersion Include="Microsoft.AspNet.WebPages" Version="3.2.9" />
5555
<PackageVersion Include="Microsoft.AspNetCore.Cryptography.Internal" Version="1.0.0" />
5656
<PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="1.0.0" />
5757
<PackageVersion Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
@@ -134,6 +134,7 @@
134134
<PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
135135
<PackageVersion Include="System.Drawing.Common" Version="4.7.2" />
136136
<PackageVersion Include="System.Formats.Asn1" Version="6.0.1" />
137+
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="5.7.0" />
137138
<PackageVersion Include="System.Linq.Expressions" Version="4.3.0" />
138139
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
139140
<PackageVersion Include="System.Reflection.Metadata" Version="1.7.0-preview1-26717-04" />

‎src/NuGetGallery/NuGetGallery.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2239,8 +2239,10 @@
22392239
<PackageReference Include="Strathweb.CacheOutput.WebApi2.StrongName" />
22402240
<PackageReference Include="System.Data.SqlClient" />
22412241
<PackageReference Include="System.Diagnostics.Debug" />
2242+
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
22422243
<PackageReference Include="System.Linq.Expressions" />
22432244
<PackageReference Include="System.Net.Http" />
2245+
<PackageReference Include="System.Text.Json" />
22442246
<PackageReference Include="NuGet.StrongName.WebActivator" />
22452247
<PackageReference Include="WebActivatorEx" />
22462248
<PackageReference Include="NuGet.StrongName.WebBackgrounder.EntityFramework" />

‎src/NuGetGallery/Web.config‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,10 @@
529529
</system.diagnostics>
530530
<runtime>
531531
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
532+
<dependentAssembly>
533+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
534+
<bindingRedirect oldVersion="0.0.0.0-5.7.0.0" newVersion="5.7.0.0"/>
535+
</dependentAssembly>
532536
<dependentAssembly>
533537
<assemblyIdentity name="WebGrease" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
534538
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
@@ -539,11 +543,11 @@
539543
</dependentAssembly>
540544
<dependentAssembly>
541545
<assemblyIdentity name="System.Text.Json" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
542-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.3" newVersion="7.0.0.3"/>
546+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4"/>
543547
</dependentAssembly>
544548
<dependentAssembly>
545549
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
546-
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
550+
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
547551
</dependentAssembly>
548552
<dependentAssembly>
549553
<assemblyIdentity name="System.Spatial" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
@@ -635,15 +639,15 @@
635639
</dependentAssembly>
636640
<dependentAssembly>
637641
<assemblyIdentity name="System.Web.Http" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
638-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
642+
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/>
639643
</dependentAssembly>
640644
<dependentAssembly>
641645
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
642-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
646+
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/>
643647
</dependentAssembly>
644648
<dependentAssembly>
645649
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
646-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
650+
<bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0"/>
647651
</dependentAssembly>
648652
<dependentAssembly>
649653
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31BF3856AD364E35" culture="neutral"/>

‎tests/NuGetGallery.Facts/AppConfigIsCorrectlyApplied.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) .NET Foundation. All rights reserved.
1+
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System;
@@ -19,11 +19,11 @@ public void VerifyAppDomainHasConfigurationSettings()
1919
[Fact]
2020
public void VerifyBindingRedirectToMvc5IsWorking()
2121
{
22-
// System.Web.Mvc should be binding redirected from version 3.0.0.0 to 5.2.3.0 just like in our actual app.
22+
// System.Web.Mvc should be binding redirected from version 3.0.0.0 to 5.2.9.0 just like in our actual app.
2323
string typeName = "System.Web.Mvc.Controller, System.Web.Mvc, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
2424
Type resolvedType = Type.GetType(typeName);
2525
Version runtimeVersion = resolvedType.Assembly.GetName().Version;
26-
Assert.Equal(new Version("5.2.3.0"), runtimeVersion);
26+
Assert.Equal(new Version("5.2.9.0"), runtimeVersion);
2727
}
2828
}
2929
}

0 commit comments

Comments
 (0)