From c5067c9647bb3b1f41e32ccabab020a7d097df77 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Jan 2025 00:40:26 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.12 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.12 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ad4f8938af9..f5ec8e008e59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b - + https://github.com/nuget/nuget.client - a4a2e3f31ddc2adb52ebd3204ea6f650d89caf3f + d5280778183adae26d644681c34430197c09554b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 6b07dc559479..cad9904ae3fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,18 +143,18 @@ - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 - 6.14.0-preview.1.11 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 + 6.14.0-preview.1.12 From 61097a0ed12001c95d232a8ffbe77e6d5adfce06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Jan 2025 12:24:56 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.13 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.13 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5ec8e008e59..853c09c51c91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 - + https://github.com/nuget/nuget.client - d5280778183adae26d644681c34430197c09554b + 20096abd28ce2bce6780a2cdd327cfc8963de173 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index cad9904ae3fb..2ce6c7040944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,18 +143,18 @@ - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 - 6.14.0-preview.1.12 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 + 6.14.0-preview.1.13 From 111ac820d02d110604cd540f0d7e7182379ceb7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 12:20:52 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.14 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.14 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 853c09c51c91..d5933dd785ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 - + https://github.com/nuget/nuget.client - 20096abd28ce2bce6780a2cdd327cfc8963de173 + 2b3475a842a5064e946fe9d2cbd9d98f7599c887 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 2ce6c7040944..4dabe51d3e55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,18 +143,18 @@ - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 - 6.14.0-preview.1.13 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 + 6.14.0-preview.1.14 From 922b60fef3b815897e717e1bdd91f8feb51c2b39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 12:20:12 +0000 Subject: [PATCH 04/11] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.15 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.15 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5933dd785ef..af4ae13aadb2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 - + https://github.com/nuget/nuget.client - 2b3475a842a5064e946fe9d2cbd9d98f7599c887 + c9471b4ad12e1fb75a5d929766f9327ad0017c56 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 4dabe51d3e55..a7f1158e329a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,18 +143,18 @@ - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 - 6.14.0-preview.1.14 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 + 6.14.0-preview.1.15 From 22ad276f4f9290ee7518e777f2ec983b52546f80 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 30 Jan 2025 08:42:38 +0100 Subject: [PATCH 05/11] Delete src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch --- ...0001-use-the-documented-artifact-ext.patch | 61 ------------------- 1 file changed, 61 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch deleted file mode 100644 index 39081266220a..000000000000 --- a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 62c4b5f114850d39efdca3df3b9ee83cc0f424ff Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Tue, 21 Jan 2025 16:16:49 -0800 -Subject: [PATCH 1/2] Use the documented Artifact extension point to add - artifacts - -The Artifact extension point handles symbol packages automatically for source-build, and it automatically gets support for new features like Artifact Visibility (required for https://github.com/dotnet/sdk/pull/46063) -Backport: https://github.com/NuGet/NuGet.Client/pull/6233 ---- - eng/Publishing.props | 11 +++-------- - 1 file changed, 3 insertions(+), 8 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 38810c73428..1175200dd59 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -1,11 +1,6 @@ - -- - -- -- <_SymbolsPackages Include="$(ArtifactsDir)nupkgs/*.symbols.nupkg" /> -- -+ - -- -- -\ No newline at end of file -+ - -From 9072cb03cb5c2958df318f59389547caa5de2c8a Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Wed, 22 Jan 2025 10:07:47 -0800 -Subject: [PATCH 2/2] Formatting and PR feedback - ---- - eng/Publishing.props | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 1175200dd59..41f498d4d4a 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -1,6 +1,8 @@ -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ From 851ec1500fdb9697ea85b51ce088de4e6e6a49af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 12:25:40 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/nuget/nuget.client build 6.14.0.17 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.14.0-preview.1.11 -> To Version 6.14.0-preview.1.17 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bda29626541b..497e7279099e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -147,74 +147,74 @@ https://github.com/dotnet/aspnetcore febd7e8bdf05f17fb4e0e4dd3123e9538fbf7e7b - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 - + https://github.com/nuget/nuget.client - c9471b4ad12e1fb75a5d929766f9327ad0017c56 + 4ccad7689eaf96f30d41709369bebc888e4a5db3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 24fb0bbbe443..2c1160cdb1dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,18 +146,18 @@ - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 - 6.14.0-preview.1.15 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 + 6.14.0-preview.1.17 From 5668d1ddee00eb169f4387b75bc5e46de8d251c0 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 5 Feb 2025 18:34:56 +0100 Subject: [PATCH 07/11] Revert the patch to unblock the sync --- ...0001-use-the-documented-artifact-ext.patch | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch new file mode 100644 index 000000000000..bcaef666bad3 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch @@ -0,0 +1,23 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Premek Vysoky +Date: Wed, 5 Feb 2025 12:51:35 +0100 +Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) + +This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 +--- + eng/Publishing.props | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/eng/Publishing.props b/eng/Publishing.props +index d5604fbf8..d7fd329ae 100644 +--- a/eng/Publishing.props ++++ b/eng/Publishing.props +@@ -2,7 +2,6 @@ + + + ++ PublishFlatContainer="false" /> + +- + From 5b059bd5872ef7983bd499b9fdd5c8b35ed1aad0 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 5 Feb 2025 19:02:01 +0100 Subject: [PATCH 08/11] Bump darc --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 91e9458e9a3d..03d998e11759 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.25081.2", + "version": "1.1.0-beta.25105.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1771a7e7a21a..de7f86704edd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -674,13 +674,13 @@ https://github.com/dotnet/runtime 37b1764e19aceaa545d8433c490b850538b8905a - + https://github.com/dotnet/arcade-services - 0a9f6b177026a7473b9225355269c2c9a90b777f + 80c026a326d06471ed64977a044d052fe17c5700 - + https://github.com/dotnet/arcade-services - 0a9f6b177026a7473b9225355269c2c9a90b777f + 80c026a326d06471ed64977a044d052fe17c5700 https://github.com/dotnet/scenario-tests diff --git a/eng/Versions.props b/eng/Versions.props index 8e6e4e544f1d..c3bc2c073bd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -75,7 +75,7 @@ - 1.1.0-beta.25081.2 + 1.1.0-beta.25105.4 From eb823bb3ac100d85fdc7a193e7ddb8cd4a9ec67e Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 09:41:36 +0100 Subject: [PATCH 09/11] Fix CRLF --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 2f46e347155a..020c8aaad53a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -67,3 +67,5 @@ *.verified.txt text eol=lf working-tree-encoding=UTF-8 *.verified.xml text eol=lf working-tree-encoding=UTF-8 *.verified.json text eol=lf working-tree-encoding=UTF-8 + +src/SourceBuild/patches/**/*.patch text eol=lf From 497760fbb33b2541e9c553c144bc07f81b1a454a Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 11:33:00 +0100 Subject: [PATCH 10/11] Try a different darc --- .config/dotnet-tools.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 03d998e11759..8e93b36a3116 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.25105.4", + "version": "1.1.0-beta.25106.1", "commands": [ "darc" ] From ffaa27f063c14997d8612c29f308439a53ea0d25 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 6 Feb 2025 11:57:03 +0100 Subject: [PATCH 11/11] Delete the patch --- ...0001-use-the-documented-artifact-ext.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch diff --git a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch b/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch deleted file mode 100644 index bcaef666bad3..000000000000 --- a/src/SourceBuild/patches/nuget-client/0001-use-the-documented-artifact-ext.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Premek Vysoky -Date: Wed, 5 Feb 2025 12:51:35 +0100 -Subject: [PATCH] Remove extra spaces in Publishing.props (#6251) - -This might help with the VMR sync problems we have in https://github.com/dotnet/sdk/pull/46361 ---- - eng/Publishing.props | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index d5604fbf8..d7fd329ae 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -2,7 +2,6 @@ - - - -+ PublishFlatContainer="false" /> - -- -