From b9555e57fccce6dcfaf855809109768d08b299ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Apr 2025 05:02:37 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250404.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 303c0099304..ac80d476d33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 @@ -100,9 +100,9 @@ 919d4dbfb0dffb35a702417e28ceea652d248bc6 - + https://github.com/dotnet/arcade - 802042c6e779b73b4edb012ee1d5bae02ec8d41c + faa1471063676aca349da6b48c56dd0fc95aa869 diff --git a/eng/Versions.props b/eng/Versions.props index cc6feb7ff89..3a5a629b190 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.25164.5 + 8.0.0-beta.25204.7 7.0.0 6.0.1 4.10.0-3.24175.2 diff --git a/global.json b/global.json index 5023d005478..296b75a2181 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25204.7" } } From 72a295db7ea78bd0454180952359f4aa59356482 Mon Sep 17 00:00:00 2001 From: Jenny Bai Date: Mon, 7 Apr 2025 15:41:50 +0800 Subject: [PATCH 2/4] Update Versions.props VersionPrefix --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3a5a629b190..e95ec001bb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.10.25 + 17.10.26 release 17.8.3 15.1.0.0 From 990bbc6dfdc7e05a3cab841a1a289df001289619 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 9 Apr 2025 13:01:42 +0200 Subject: [PATCH 3/4] Update PreReleaseVersionLabel to 'service' --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e95ec001bb4..946a05d87e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ release 17.8.3 15.1.0.0 - preview + service true true From 03b41eac7837ecb9493397f20d53975d0d357f2e Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Wed, 9 Apr 2025 14:24:13 +0200 Subject: [PATCH 4/4] Update eng/Versions.props MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jan Provazník --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 946a05d87e7..197ccce027a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ release 17.8.3 15.1.0.0 - service + servicing true true