-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[main] Update dependencies from nuget/nuget.client (#46642)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jonatan Gonzalez <[email protected]> Co-authored-by: Premek Vysoky <[email protected]> Co-authored-by: Daniel Plaisted <[email protected]> Co-authored-by: Ella Hathaway <[email protected]> Co-authored-by: Viktor Hofer <[email protected]>
- Loading branch information
7 people
authored
Feb 11, 2025
1 parent
0065640
commit 1316636
Showing
12 changed files
with
1,003 additions
and
112 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
src/SourceBuild/patches/fsharp/0002-React-to-NuGet-package-pruning-warnings.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| From 33ac19502896addb6693d606ca6e7351ec6610ec Mon Sep 17 00:00:00 2001 | ||
| From: Viktor Hofer <[email protected]> | ||
| Date: Mon, 10 Feb 2025 15:00:47 +0100 | ||
| Subject: [PATCH] React to NuGet package pruning warnings | ||
|
|
||
| Backport: https://github.com/dotnet/fsharp/pull/18304 | ||
|
|
||
| --- | ||
| eng/Versions.props | 1 - | ||
| src/fsc/fsc.targets | 9 ++++++--- | ||
| 2 files changed, 6 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/eng/Versions.props b/eng/Versions.props | ||
| index 3b36ad6a7..ce0f5f5ac 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -87,7 +87,6 @@ | ||
| <SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion> | ||
| <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion> | ||
| <SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow> | ||
| - <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> | ||
| <MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion> | ||
| <!-- Versions for package groups --> | ||
| <RoslynVersion>4.11.0-2.24264.2</RoslynVersion> | ||
| diff --git a/src/fsc/fsc.targets b/src/fsc/fsc.targets | ||
| index 1c67ceb39..dc80ab5c4 100644 | ||
| --- a/src/fsc/fsc.targets | ||
| +++ b/src/fsc/fsc.targets | ||
| @@ -45,13 +45,16 @@ | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| + <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> | ||
| + <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> | ||
| + <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> | ||
| + </ItemGroup> | ||
| + | ||
| + <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'"> | ||
| <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" /> | ||
| <PackageReference Include="System.Memory" Version="$(SystemMemoryVersion)" /> | ||
| <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="$(SystemRuntimeCompilerServicesUnsafeVersion)" /> | ||
| <PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" /> | ||
| - <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> | ||
| - <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> | ||
| - <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
| -- | ||
| 2.47.1.windows.2 | ||
|
|
86 changes: 86 additions & 0 deletions
86
src/SourceBuild/patches/nuget-client/0001-React-to-NuGet-package-pruning-warnings.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| From 61efe20e89726378bdf14443443f0c2da45c053d Mon Sep 17 00:00:00 2001 | ||
| From: Viktor Hofer <[email protected]> | ||
| Date: Mon, 10 Feb 2025 15:04:23 +0100 | ||
| Subject: [PATCH] React to NuGet package pruning warnings | ||
|
|
||
| Backport: https://github.com/NuGet/NuGet.Client/pull/6261 | ||
|
|
||
| --- | ||
| src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | 2 +- | ||
| src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | 2 +- | ||
| .../NuGet.PackageManagement/NuGet.PackageManagement.csproj | 3 ++- | ||
| src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | 2 +- | ||
| src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | 2 +- | ||
| 5 files changed, 6 insertions(+), 5 deletions(-) | ||
|
|
||
| diff --git a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | ||
| index 75ed5accd..c1815cb84 100644 | ||
| --- a/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | ||
| +++ b/src/NuGet.Core/NuGet.Common/NuGet.Common.csproj | ||
| @@ -27,7 +27,7 @@ | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| - <PackageReference Include="System.Collections.Immutable" /> | ||
| + <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| diff --git a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | ||
| index c20604eb9..21db96e44 100644 | ||
| --- a/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | ||
| +++ b/src/NuGet.Core/NuGet.LibraryModel/NuGet.LibraryModel.csproj | ||
| @@ -17,7 +17,7 @@ | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| - <PackageReference Include="System.Collections.Immutable" /> | ||
| + <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| diff --git a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj | ||
| index fd1bd0cd7..d355f79d4 100644 | ||
| --- a/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj | ||
| +++ b/src/NuGet.Core/NuGet.PackageManagement/NuGet.PackageManagement.csproj | ||
| @@ -22,12 +22,13 @@ | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Web.Xdt" /> | ||
| - <PackageReference Include="Microsoft.CSharp" /> | ||
| + <PackageReference Include="Microsoft.CSharp" Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Condition=" '$(TargetFramework)' == '$(NETFXTargetFramework)' "> | ||
| <Reference Include="System.ComponentModel.Composition" /> | ||
| <Reference Include="Microsoft.Build" /> | ||
| + <Reference Include="Microsoft.CSharp" /> | ||
| <Reference Include="System.IO.Compression" /> | ||
| <Reference Include="System.Net.Http" /> | ||
| </ItemGroup> | ||
| diff --git a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | ||
| index 1a140570e..df0f64c7d 100644 | ||
| --- a/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | ||
| +++ b/src/NuGet.Core/NuGet.Packaging/NuGet.Packaging.csproj | ||
| @@ -66,7 +66,7 @@ | ||
| This package is a dependency of System.Security.Cryptography.Pkcs | ||
| When it is upgraded to a newer version, try deleting the below PackageReference | ||
| --> | ||
| - <PackageReference Include="System.Formats.Asn1" Condition=" '$(TargetFramework)' != '$(NETFXTargetFramework)'" /> | ||
| + <PackageReference Include="System.Formats.Asn1" Condition="'$(TargetFramework)' != '$(NETFXTargetFramework)' and '$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| diff --git a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | ||
| index bec334cd4..43308010a 100644 | ||
| --- a/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | ||
| +++ b/src/NuGet.Core/NuGet.ProjectModel/NuGet.ProjectModel.csproj | ||
| @@ -20,7 +20,7 @@ | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| - <PackageReference Include="System.Collections.Immutable" /> | ||
| + <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> |
61 changes: 0 additions & 61 deletions
61
src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch
This file was deleted.
Oops, something went wrong.
24 changes: 24 additions & 0 deletions
24
src/SourceBuild/patches/razor/0001-React-to-NuGet-package-pruning-warnings.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From 287f933c0f361fb128b634c6a0315b1042fb8a8c Mon Sep 17 00:00:00 2001 | ||
| From: Viktor Hofer <[email protected]> | ||
| Date: Mon, 10 Feb 2025 15:26:10 +0100 | ||
| Subject: [PATCH] React to NuGet package pruning warnings | ||
|
|
||
| Backport: https://github.com/dotnet/razor/pull/11471 | ||
|
|
||
| --- | ||
| .../Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | ||
| index 8c00b4d35f..73431d922b 100644 | ||
| --- a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | ||
| +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj | ||
| @@ -13,7 +13,7 @@ | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Microsoft.Extensions.ObjectPool" /> | ||
| - <PackageReference Include="System.Collections.Immutable" /> | ||
| + <PackageReference Include="System.Collections.Immutable" Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup Label="String Resources"> |
Oops, something went wrong.