From c7a8b4b799e545d16f9032f78e2f0acf4d17c228 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:01:24 +0000 Subject: [PATCH 1/5] [VMR] Codeflow d956f00-d956f00 [[ commit created by automation ]] --- src/repos/projects/Directory.Build.props | 10 +++++----- src/repos/projects/Directory.Build.targets | 12 ++++++------ src/repos/projects/netcorecli-fsc.proj | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/repos/projects/Directory.Build.props b/src/repos/projects/Directory.Build.props index e68c5ac21a..9434f95140 100644 --- a/src/repos/projects/Directory.Build.props +++ b/src/repos/projects/Directory.Build.props @@ -4,23 +4,23 @@ $(NetCurrent) - $(MSBuildProjectName) + $(MSBuildProjectName) $(SrcDir)repos/ $(SrcReposDir)keys/ $(SrcReposDir)src/ $(SrcReposDir)patches/ - $([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(RepositoryName)')) + $([MSBuild]::NormalizeDirectory('$(SubmoduleDirectory)', '$(InnerRepoName)')) $([MSBuild]::NormalizeDirectory('$(OriginalProjectDirectory)', 'artifacts', 'clone')) - $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(RepositoryName)')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsLogDir)', '$(InnerRepoName)')) true - $(ArtifactsLogRepoDir)$(RepositoryName).log + $(ArtifactsLogRepoDir)$(InnerRepoName).log > $(RepoConsoleLogFile) 2>&1 - + diff --git a/src/repos/projects/Directory.Build.targets b/src/repos/projects/Directory.Build.targets index 5b374f4fc4..5541b586cb 100644 --- a/src/repos/projects/Directory.Build.targets +++ b/src/repos/projects/Directory.Build.targets @@ -10,7 +10,7 @@ - + <_DependentProject Include="@(RepositoryReference -> '%(Identity).proj')" /> @@ -81,7 +81,7 @@ <_DependentProjectSources Include="@(RepositoryReference -> '%(Identity).proj')"> - %(Identity) + %(Identity) @@ -104,7 +104,7 @@ @@ -156,7 +156,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -184,7 +184,7 @@ - + diff --git a/src/repos/projects/netcorecli-fsc.proj b/src/repos/projects/netcorecli-fsc.proj index edcfbd0f65..4e2685dc2a 100644 --- a/src/repos/projects/netcorecli-fsc.proj +++ b/src/repos/projects/netcorecli-fsc.proj @@ -3,8 +3,8 @@ /bl:$(ArtifactsLogRepoDir)build.binlog $(OutputArgs) /v:$(LogVerbosity) - $(OutputArgs) /p:OutputPath=$(OutputPath)$(RepositoryName)/ - $(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(RepositoryName) + $(OutputArgs) /p:OutputPath=$(OutputPath)$(InnerRepoName)/ + $(OutputArgs) /p:BaseIntermediateOutputPath=$(IntermediatePath)$(InnerRepoName) $(OutputArgs) $(RedirectRepoOutputToLog) pack From 5467592bdee0073b66e10fef2fbf0b9499a68806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 May 2025 02:01:25 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/dotnet build 269352 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25269.109 -> 10.0.0-beta.25270.108) --- eng/Version.Details.xml | 6 ++-- eng/common/build.ps1 | 3 ++ eng/common/build.sh | 14 +++++--- .../core-templates/post-build/post-build.yml | 3 -- .../steps/install-microbuild.yml | 35 ------------------- eng/common/tools.ps1 | 8 ++--- eng/common/tools.sh | 8 ++--- global.json | 2 +- 8 files changed, 25 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acc7102ad4..90b7ae20c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/msbuild e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - a4d6fdc935d5da12efb00a0b3b693ff1439e0b41 + 445fb3a55b402cbe3a43576105e6fdc6686c8e4c diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index ae2309e312..8cfee107e7 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -21,6 +21,7 @@ Param( [switch] $publish, [switch] $clean, [switch][Alias('pb')]$productBuild, + [switch]$fromVMR, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -74,6 +75,7 @@ function Print-Usage() { 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 " -fromVMR Set when building from within the VMR" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -128,6 +130,7 @@ function Build { /p:Test=$test ` /p:Pack=$pack ` /p:DotNetBuild=$productBuild ` + /p:DotNetBuildFromVMR=$fromVMR ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index da906da202..b105db583c 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -43,6 +43,7 @@ usage() 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 " --fromVMR Set when building from within the VMR" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -64,6 +65,7 @@ restore=false build=false source_build=false product_build=false +from_vmr=false rebuild=false test=false integration_test=false @@ -89,7 +91,7 @@ verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' -properties='' +properties=() while [[ $# > 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in @@ -142,6 +144,9 @@ while [[ $# > 0 ]]; do restore=true pack=true ;; + -fromvmr|-from-vmr) + from_vmr=true + ;; -test|-t) test=true ;; @@ -187,7 +192,7 @@ while [[ $# > 0 ]]; do shift ;; *) - properties="$properties $1" + properties+=("$1") ;; esac @@ -221,7 +226,7 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then - properties="$properties /p:Projects=$projects" + properties+=("/p:Projects=$projects") fi local bl="" @@ -243,6 +248,7 @@ function Build { /p:Build=$build \ /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ + /p:DotNetBuildFromVMR=$from_vmr \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ @@ -251,7 +257,7 @@ function Build { /p:Sign=$sign \ /p:Publish=$publish \ /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ - $properties + "${properties[@]}" ExitWithExitCode 0 } diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 5757915edb..a151fd811e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -193,9 +193,6 @@ stages: buildId: $(AzDOBuildId) artifactName: PackageArtifacts checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 2bcf974ee1..a3540ba00c 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -48,38 +48,3 @@ 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', '') - - $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 - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux')) diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 5f40a3f823..046ec9d08a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,8 +65,8 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } -# True if the build is a product build -[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } +# True when the build is running within the VMR. +[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false } function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null @@ -850,8 +850,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild) { + # Skip this when the build is a child of the VMR build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 25f5932eee..8bc68e8460 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -72,8 +72,8 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} -# True if the build is a product build -product_build=${product_build:-false} +# True when the build is running within the VMR. +from_vmr=${from_vmr:-false} # Resolve any symlinks in the given path. function ResolvePath { @@ -506,8 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true ]]; then + # Skip this when the build is a child of the VMR build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index 9c3d677079..2dec7cd211 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.5.25265.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25270.108", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109", "Microsoft.Build.NoTargets": "3.7.0" } } From 17b201a6db03d1f41c3ba0abfa0aeb5708132d60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 May 2025 02:02:01 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/dotnet build 269418 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25272.109 -> 10.0.0-beta.25270.108) --- eng/Version.Details.xml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90b7ae20c8..75f3e7380f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/msbuild e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 445fb3a55b402cbe3a43576105e6fdc6686c8e4c + 786c3a0b373ac9601859c24ff774f959d1b64fe7 diff --git a/global.json b/global.json index 2dec7cd211..18ebd41352 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.5.25265.106" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25272.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25273.101", "Microsoft.Build.NoTargets": "3.7.0" } } From 0199734e0be0200359d0e389e1169cf15b5a5cc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 May 2025 02:01:39 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/dotnet build 269499 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25273.101 -> 10.0.0-beta.25270.108) --- eng/Version.Details.xml | 6 +++--- global.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75f3e7380f..e4ee43e5cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/msbuild e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 786c3a0b373ac9601859c24ff774f959d1b64fe7 + 9d86ce59f05e31b1bccb0cd5604f803416796fe4 diff --git a/global.json b/global.json index 18ebd41352..6724dce9dd 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "10.0.100-preview.5.25265.106" + "dotnet": "10.0.100-preview.6.25272.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25273.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104", "Microsoft.Build.NoTargets": "3.7.0" } } From de18d5b024764cb5be2427cca4609307803d4b5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 May 2025 02:01:49 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/dotnet build 269610 No dependency updates to commit --- eng/Version.Details.xml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4ee43e5cd..ff4f3ae84b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/msbuild e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 9d86ce59f05e31b1bccb0cd5604f803416796fe4 + f5705c8f4c5079bba77bae8698ba1583bde0388c diff --git a/global.json b/global.json index 6724dce9dd..fbc9f4083a 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "10.0.100-preview.6.25272.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25274.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25276.103", "Microsoft.Build.NoTargets": "3.7.0" } }