Skip to content

Commit c8f727a

Browse files
authored
Update NuGet client libraries to 5.8.0 prerelease (#8229)
The Gallery uses an older version of `NuGet.Packaging` that depends on `NuGet.Packaging.Core`. The Orchestrator was updated to use a newer version of `NuGet.Packaging` that no longer depends on `NuGet.Packaging.Core`. The Orchestrator uses assemblies produced from the Gallery, thereby causing runtime issues when these assemblies attempt to reference types from `NuGet.Packaging.Core.dll` which is unavailable. Part of #8228
1 parent 23c13a5 commit c8f727a

6 files changed

Lines changed: 16 additions & 12 deletions

File tree

src/NuGetGallery.Core/NuGetGallery.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@
283283
<PrivateAssets>all</PrivateAssets>
284284
</PackageReference>
285285
<PackageReference Include="NuGet.Packaging">
286-
<Version>5.0.0-preview1.5665</Version>
286+
<Version>5.8.0-preview.3.6823</Version>
287287
</PackageReference>
288288
<PackageReference Include="WindowsAzure.Storage">
289289
<Version>9.3.3</Version>

src/NuGetGallery.Core/Packaging/PackageMetadata.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ public static PackageMetadata FromNuspecReader(NuspecReader nuspecReader, bool s
276276
return new PackageMetadata(
277277
nuspecReader.GetMetadata().ToDictionary(kvp => kvp.Key, kvp => kvp.Value),
278278
nuspecReader.GetDependencyGroups(useStrictVersionCheck: strict),
279-
nuspecReader.GetFrameworkReferenceGroups(),
279+
nuspecReader.GetFrameworkAssemblyGroups(),
280280
nuspecReader.GetPackageTypes(),
281281
nuspecReader.GetMinClientVersion(),
282282
nuspecReader.GetRepositoryMetadata(),

src/NuGetGallery.Services/NuGetGallery.Services.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@
298298
<Version>4.1.0</Version>
299299
</PackageReference>
300300
<PackageReference Include="NuGet.Packaging">
301-
<Version>5.0.0-preview1.5665</Version>
301+
<Version>5.8.0-preview.3.6823</Version>
302302
</PackageReference>
303303
<PackageReference Include="NuGet.Protocol">
304-
<Version>5.0.0-preview1.5665</Version>
304+
<Version>5.8.0-preview.3.6823</Version>
305305
</PackageReference>
306306
<PackageReference Include="NuGet.Services.Configuration">
307307
<Version>2.74.0</Version>

src/NuGetGallery/NuGetGallery.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2236,10 +2236,10 @@
22362236
<Version>1.4.0</Version>
22372237
</PackageReference>
22382238
<PackageReference Include="NuGet.Configuration">
2239-
<Version>5.0.0-preview1.5665</Version>
2239+
<Version>5.8.0-preview.3.6823</Version>
22402240
</PackageReference>
22412241
<PackageReference Include="NuGet.Protocol">
2242-
<Version>5.0.0-preview1.5665</Version>
2242+
<Version>5.8.0-preview.3.6823</Version>
22432243
</PackageReference>
22442244
<PackageReference Include="NuGet.Services.Licenses">
22452245
<Version>2.74.0</Version>

src/NuGetGallery/Web.config

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,10 @@
572572
</system.diagnostics>
573573
<runtime>
574574
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
575+
<dependentAssembly>
576+
<assemblyIdentity name="NuGet.Packaging" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
577+
<bindingRedirect oldVersion="0.0.0.0-5.8.0.6823" newVersion="5.8.0.6823"/>
578+
</dependentAssembly>
575579
<dependentAssembly>
576580
<assemblyIdentity name="WebGrease" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
577581
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
@@ -590,11 +594,11 @@
590594
</dependentAssembly>
591595
<dependentAssembly>
592596
<assemblyIdentity name="NuGet.Versioning" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
593-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
597+
<bindingRedirect oldVersion="0.0.0.0-5.8.0.6823" newVersion="5.8.0.6823"/>
594598
</dependentAssembly>
595599
<dependentAssembly>
596600
<assemblyIdentity name="NuGet.Frameworks" publicKeyToken="31BF3856AD364E35" culture="neutral"/>
597-
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1"/>
601+
<bindingRedirect oldVersion="0.0.0.0-5.8.0.6823" newVersion="5.8.0.6823"/>
598602
</dependentAssembly>
599603
<dependentAssembly>
600604
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
@@ -662,4 +666,4 @@
662666
</dependentAssembly>
663667
</assemblyBinding>
664668
</runtime>
665-
</configuration>
669+
</configuration>

tests/NuGetGallery.Facts/Services/PackageMetadataValidationServiceFacts.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,13 @@ private static PackageMetadataValidationService CreateService(
6767
return packageMetadataValidationService.Object;
6868
}
6969

70-
public class TheValidateMetadatabeforeUploadAsyn : FactsBase
70+
public class TheValidateMetadataBeforeUploadAsync : FactsBase
7171
{
7272
private Mock<TestPackageReader> _nuGetPackage;
7373
private PackageRegistration _packageRegistration;
7474
private User _currentUser;
7575

76-
public TheValidateMetadatabeforeUploadAsyn()
76+
public TheValidateMetadataBeforeUploadAsync()
7777
{
7878
_nuGetPackage = GeneratePackage(isSigned: true);
7979
_packageRegistration = _package.PackageRegistration;
@@ -611,7 +611,7 @@ public async Task RejectsUnlicensedPackages()
611611
[InlineData("Vim WITH Font-exception-2.0", true)] // we are not checking if license expression make sense
612612
[InlineData("Vim with Font-exception-2.0", false)]
613613
[InlineData("Vim With Font-exception-2.0", false)]
614-
[InlineData("(EUPL-1.1+ OR (SPL-1.0 WITH Nokia-Qt-exception-1.1) AND Sleepycat)", true)]
614+
[InlineData("(EUPL-1.1+ OR (SPL-1.0 WITH Font-exception-2.0) AND Sleepycat)", true)]
615615
public async Task ChecksLicenseExpressionCorrectness(string licenseExpression, bool expectedSuccess)
616616
{
617617
_nuGetPackage = GeneratePackageWithUserContent(licenseUrl: GetLicenseExpressionDeprecationUrl(licenseExpression), licenseExpression: licenseExpression, licenseFilename: null);

0 commit comments

Comments
 (0)