From 176462b89b4fb6675b12a7a52f417a2c8359a6c5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 Jun 2025 10:00:12 -0700 Subject: [PATCH 1/6] Update the nuget version to the latest and update STJ to the in-product one that's being used already in most of the build here --- Directory.Packages.props | 8 +++++--- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 22e71e3344f..9ed074cd1f6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,9 +16,9 @@ - - - + + + @@ -29,6 +29,7 @@ + @@ -57,5 +58,6 @@ + \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21469819584..4d6f58dd117 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,5 +50,9 @@ https://github.com/dotnet/runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + + https://github.com/dotnet/runtime + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + diff --git a/eng/Versions.props b/eng/Versions.props index 4d06af5932f..b657740056d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,5 +24,6 @@ 9.0.3 9.0.3 9.0.3 + 9.0.3 From d0adea5e04b1bc01d1c0f7789abc2e07d3125a05 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jun 2025 11:13:27 -0700 Subject: [PATCH 2/6] Update the PR to match the test that Ella ran on the source build leg --- Directory.Packages.props | 20 +++++++------------ eng/Version.Details.xml | 42 +++++++++++++++++++++++++++++++++++++--- eng/Versions.props | 19 +++++++++++++----- 3 files changed, 60 insertions(+), 21 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9ed074cd1f6..90ded2da880 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,20 +16,20 @@ - - - + + + - - - + + + - + @@ -51,13 +51,7 @@ - - - - - - \ No newline at end of file diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d6f58dd117..d511d039d8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,6 +34,18 @@ https://github.com/dotnet/runtime d3981726bc8b0e179db50301daf9f22d42393096 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 @@ -50,9 +62,33 @@ https://github.com/dotnet/runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - - https://github.com/dotnet/runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c + + + https://github.com/nuget/nuget.client + 95a470a557091cdbdc9f68a178b60bd19329942c diff --git a/eng/Versions.props b/eng/Versions.props index b657740056d..6d20d2fc5f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,10 +20,19 @@ 9.0.0 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 + 9.0.3 From 80840157e29fe7f9585b0ffa715de341f46c176b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jun 2025 15:19:17 -0700 Subject: [PATCH 3/6] Fix the nuget versions --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6d20d2fc5f1..51f3427a4fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,12 +27,12 @@ 9.0.3 9.0.3 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 - 9.0.3 + 16.12.4 + 16.12.4 + 16.12.4 + 16.12.4 + 16.12.4 + 16.12.4 + 16.12.4 From 77f6714ea9b7b843aa670e3fc4ca0830ad8622f3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Jun 2025 12:53:51 -0700 Subject: [PATCH 4/6] fix the nuget versions --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 51f3427a4fe..fbd2e35d067 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,12 +27,12 @@ 9.0.3 9.0.3 9.0.3 - 16.12.4 - 16.12.4 - 16.12.4 - 16.12.4 - 16.12.4 - 16.12.4 - 16.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 From cd2d8ed3f3b172de710163de878a662115bcc395 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 20 Jun 2025 15:46:50 -0700 Subject: [PATCH 5/6] Update based on PR feedback and update the prebuilts --- Directory.Packages.props | 1 - eng/SourceBuildPrebuiltBaseline.xml | 10 ++++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 90ded2da880..448d6a6bddf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -52,6 +52,5 @@ - \ No newline at end of file diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 413f86d6cc2..65ce6418ad6 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -10,5 +10,15 @@ + + + + + + + + + + From 1e64d258d4a6e90d99e8034fe50a52bb5c6d761d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 4 Aug 2025 10:38:43 -0700 Subject: [PATCH 6/6] Update branding to 9.0.110 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b8a6686f36c..0d96f1dad50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 9.0.109 + 9.0.110 true release