From f43d9fb135a9e65a2fd6839916a8434e89ddabbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Apr 2025 05:01:13 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20250412.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.25209.3 -> To Version 10.0.0-beta.25212.1 --- eng/Version.Details.xml | 32 +++++++++---------- eng/Versions.props | 8 ++--- .../steps/install-microbuild.yml | 14 ++++++-- eng/common/sdl/packages.config | 2 +- global.json | 6 ++-- 5 files changed, 36 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f846987596..a0bad2fc59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -235,38 +235,38 @@ https://github.com/dotnet/llvm-project bcbadea190f4548a30eb43d770f34af321e2cc8e - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 03b4b258fc72e5663f2ad701df5d70129aa2df8a + 87401be5731aa537bbf4cb71d7800d1c74d5e429 diff --git a/eng/Versions.props b/eng/Versions.props index 0da47be3c2..83127b8640 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,10 +57,10 @@ release - 10.0.0-beta.25209.3 - 10.0.0-beta.25209.3 - 10.0.0-beta.25209.3 - 10.0.0-beta.25209.3 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 1.1.87-gba258badda diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index dba506e74c..d0422085cb 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -91,8 +91,18 @@ steps: script: | Write-Host "Copying Linux Path" $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)' - $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', '' - $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build' + $MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '') + + $versionRegex = '\d+\.\d+\.\d+' + $package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory | + Where-Object { $_.Name -match $versionRegex } + + if ($package.Count -ne 1) { + Write-Host "There should be exactly one matching subfolder, but found $($package.Count)." + exit 1 + } + + $MBSIGN_APPFOLDER = $package[0].FullName + '/build' $MBSIGN_APPFOLDER | Write-Host $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml' Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bb..e5f543ea68 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/global.json b/global.json index 8b944650f6..bc421c7a02 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "10.0.100-preview.3.25167.3" + "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1", "Microsoft.Build.Traversal": "3.4.0" } }