From b52ecc9b3fc3e0dbd00327d623a64f29a5fec316 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Mar 2025 05:02:06 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20250321.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk From Version 10.0.0-beta.25164.6 -> To Version 10.0.0-beta.25171.1 --- eng/Version.Details.xml | 32 +++++++++---------- eng/Versions.props | 10 +++--- eng/common/CIBuild.cmd | 2 +- eng/common/build.ps1 | 7 +++- eng/common/build.sh | 13 +++++++- eng/common/cibuild.sh | 2 +- .../steps/install-microbuild.yml | 30 +++++++++++++++-- global.json | 6 ++-- 8 files changed, 72 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a20346f8ab4f..5a3f88f587e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,39 +388,39 @@ https://github.com/dotnet/runtime 4ff64a03e5c31fa824c4bc9377ef1ae8134d3f7a - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b - + https://github.com/dotnet/arcade - 1912d9f4fc410d421a01b5a09131aae234b603fa + 235443a5c1136571cacdfd40576f263f26bf5b9b https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 7bd571da999c..d6585a6e70be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,11 +166,11 @@ 6.2.4 6.2.4 - 10.0.0-beta.25164.6 - 10.0.0-beta.25164.6 - 10.0.0-beta.25164.6 - 10.0.0-beta.25164.6 - 10.0.0-beta.25164.6 + 10.0.0-beta.25171.1 + 10.0.0-beta.25171.1 + 10.0.0-beta.25171.1 + 10.0.0-beta.25171.1 + 10.0.0-beta.25171.1 10.0.616001 diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd index 56c2f25ac22f..ac1f72bf94e0 100644 --- a/eng/common/CIBuild.cmd +++ b/eng/common/CIBuild.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 438f9920c43e..d419c3a2eff5 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -7,6 +7,7 @@ Param( [string] $msbuildEngine = $null, [bool] $warnAsError = $true, [bool] $nodeReuse = $true, + [switch] $buildCheck = $false, [switch][Alias('r')]$restore, [switch] $deployDeps, [switch][Alias('b')]$build, @@ -71,6 +72,8 @@ function Print-Usage() { Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" + Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" + Write-Host " -buildCheck Sets /check msbuild parameter" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -97,6 +100,7 @@ function Build { $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' } $platformArg = if ($platform) { "/p:Platform=$platform" } else { '' } + $check = if ($buildCheck) { '/check' } else { '' } if ($projects) { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. @@ -113,6 +117,7 @@ function Build { MSBuild $toolsetBuildProj ` $bl ` $platformArg ` + $check ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` /p:Restore=$restore ` @@ -166,4 +171,4 @@ catch { ExitWithExitCode 1 } -ExitWithExitCode 0 +ExitWithExitCode 0 \ No newline at end of file diff --git a/eng/common/build.sh b/eng/common/build.sh index 483647daf182..e24bb68f4840 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -42,6 +42,7 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --buildCheck Sets /check msbuild parameter" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -76,6 +77,7 @@ clean=false warn_as_error=true node_reuse=true +build_check=false binary_log=false exclude_ci_binary_log=false pipelines_log=false @@ -173,6 +175,9 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; + -buildcheck) + build_check=true + ;; -runtimesourcefeed) runtime_source_feed=$2 shift @@ -224,8 +229,14 @@ function Build { bl="/bl:\"$log_dir/Build.binlog\"" fi + local check="" + if [[ "$build_check" == true ]]; then + check="/check" + fi + MSBuild $_InitializeToolset \ $bl \ + $check \ /p:Configuration=$configuration \ /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ @@ -256,4 +267,4 @@ if [[ "$restore" == true ]]; then InitializeNativeTools fi -Build +Build \ No newline at end of file diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh index 1a02c0dec8fd..66e3b0ac61c3 100755 --- a/eng/common/cibuild.sh +++ b/eng/common/cibuild.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ \ No newline at end of file +. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 2a6a529482b5..dba506e74c3c 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -5,7 +5,7 @@ parameters: # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false # Location of the MicroBuild output folder - microBuildOutputFolder: '$(Agent.TempDirectory)' + microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false steps: @@ -41,7 +41,7 @@ steps: inputs: packageType: sdk version: 8.0.x - installationPath: ${{ parameters.microBuildOutputFolder }}/dotnet + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) @@ -53,6 +53,7 @@ steps: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}: azureSubscription: 'MicroBuild Signing Task (DevDiv)' + useEsrpCli: true env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} @@ -71,3 +72,28 @@ steps: eq(variables['_SignType'], 'real') ) )) + + # Workaround for ESRP CLI on Linux - https://github.com/dotnet/source-build/issues/4964 + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: + - task: UseDotNet@2 + displayName: Install .NET 9.0 SDK for ESRP CLI Workaround + inputs: + packageType: sdk + version: 9.0.x + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet + workingDirectory: ${{ parameters.microBuildOutputFolder }} + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) + + - task: PowerShell@2 + displayName: Workaround for ESRP CLI on Linux + inputs: + targetType: 'inline' + 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 | Write-Host + $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml' + Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force + condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) diff --git a/global.json b/global.json index e8e6f114ef8e..296d57f1eace 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25164.6", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25164.6", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25164.6", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25171.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25171.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25171.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" } From 856dfcd581ec40e6e2ea3971a922c33f28797ab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 24 Mar 2025 17:20:27 +0100 Subject: [PATCH 2/2] Remove duplicate .msi FileExtensionSignInfo --- eng/Signing.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 5d4786646198..9b981c9c8abc 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -8,9 +8,6 @@ - - -