From 2e10e4ee89f96df86d174b39b8211384fc668878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Sep 2022 21:44:31 +0000 Subject: [PATCH 01/60] Update dependencies from https://github.com/dotnet/arcade build 20220913.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22463.7 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-build.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- global.json | 6 +++--- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b9e7130..8b8c76040 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 778552f02f31d50ec1c3c18a872cc482d04aec75 + 2fbe602d12256bf82de53791ddcbb964c1541b4e diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 9ff6a10a6..aaeb83b4d 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -53,7 +53,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - checkout: self diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 991ae05f5..5b1b77d1c 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -40,7 +40,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 variables: diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 88f6f75a6..b6137f44a 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,10 +46,10 @@ jobs: # source-build builds run in Docker, including the default managed platform. pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: NetCore-Svc-Public demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 48918df74..9c4becbc8 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -89,7 +89,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 270607126..fc022ca9b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -100,7 +100,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -137,7 +137,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -197,7 +197,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -254,7 +254,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Internal + name: NetCore1ESPool-Svc-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml diff --git a/global.json b/global.json index 25934f162..85bff3b53 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.106", + "dotnet": "6.0.109", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.106" + "version": "6.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22411.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7" } } From bded3a7977a6ea0a747bdca8716ed2137d76c6e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 3 Oct 2022 12:27:18 +0000 Subject: [PATCH 02/60] Update dependencies from https://github.com/dotnet/arcade build 20220923.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22473.2 --- eng/Version.Details.xml | 4 ++-- eng/common/build.ps1 | 5 +++++ global.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b8c76040..0ee592fcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 2fbe602d12256bf82de53791ddcbb964c1541b4e + 60c99c0e23b188aa500d0cc10dd0f777b53068fb diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8943da242..33a6f2d0e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,7 @@ Param( [string] $runtimeSourceFeed = '', [string] $runtimeSourceFeedKey = '', [switch] $excludePrereleaseVS, + [switch] $nativeToolsOnMachine, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) @@ -67,6 +68,7 @@ function Print-Usage() { Write-Host " -warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" 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 "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -146,6 +148,9 @@ try { $nodeReuse = $false } + if ($nativeToolsOnMachine) { + $env:NativeToolsOnMachine = $true + } if ($restore) { InitializeNativeTools } diff --git a/global.json b/global.json index 85bff3b53..7e126c312 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22463.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22473.2" } } From 6330cc200d2fe30129725c04a60f89377e1eb7ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 10 Oct 2022 12:28:20 +0000 Subject: [PATCH 03/60] Update dependencies from https://github.com/dotnet/arcade build 20221003.6 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22503.6 --- eng/Version.Details.xml | 4 ++-- eng/common/init-tools-native.ps1 | 1 + global.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ee592fcd..ec5ac1a0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 60c99c0e23b188aa500d0cc10dd0f777b53068fb + 5d4b2b8d6e6bae36a7c07ab6c3a2e9cc6f92f243 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index 7428ef880..6c7a851a8 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -112,6 +112,7 @@ try { $ToolPath = Convert-Path -Path $BinPath Write-Host "Adding $ToolName to the path ($ToolPath)..." Write-Host "##vso[task.prependpath]$ToolPath" + $env:PATH = "$ToolPath;$env:PATH" $InstalledTools += @{ $ToolName = $ToolDirectory.FullName } } } diff --git a/global.json b/global.json index 7e126c312..1ccf568ff 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22473.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22503.6" } } From 729f421274fc292ee8be44314503f21985414f02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Oct 2022 17:55:19 +0000 Subject: [PATCH 04/60] Update dependencies from https://github.com/dotnet/arcade build 20221012.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22512.3 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec5ac1a0b..0f9babe82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 5d4b2b8d6e6bae36a7c07ab6c3a2e9cc6f92f243 + bb1e72113a7eaf8bebda940beba8cf8bee1b453f diff --git a/global.json b/global.json index 1ccf568ff..c6d2510bb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.109", + "dotnet": "6.0.110", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.109" + "version": "6.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22503.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3" } } From b473fe60d7ae6bf2269686d8ce1a420da0c3ca98 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Oct 2022 12:23:59 +0000 Subject: [PATCH 05/60] Update dependencies from https://github.com/dotnet/arcade build 20221017.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22517.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f9babe82..e7c10bb46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - bb1e72113a7eaf8bebda940beba8cf8bee1b453f + afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 diff --git a/global.json b/global.json index c6d2510bb..10f1d7b61 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22512.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1" } } From 6c43de6dfe80c779ce7b943fb27f45b10aaf8061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Oct 2022 12:27:05 +0000 Subject: [PATCH 06/60] Update dependencies from https://github.com/dotnet/arcade build 20221025.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22525.5 --- eng/Version.Details.xml | 4 +- eng/common/sdl/sdl.ps1 | 38 ++++++++++++++ eng/common/templates/steps/execute-sdl.yml | 60 ++++++++++++++-------- global.json | 2 +- 4 files changed, 81 insertions(+), 23 deletions(-) create mode 100644 eng/common/sdl/sdl.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e7c10bb46..cff12eeb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - afc36a16c1ef79fd1969ca7effc7e99b61e4e9a6 + 27f2df0aed469840fd47da3319d1b29e19e81e3c diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 new file mode 100644 index 000000000..648c5068d --- /dev/null +++ b/eng/common/sdl/sdl.ps1 @@ -0,0 +1,38 @@ + +function Install-Gdn { + param( + [Parameter(Mandatory=$true)] + [string]$Path, + + # If omitted, install the latest version of Guardian, otherwise install that specific version. + [string]$Version + ) + + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + $disableConfigureToolsetImport = $true + $global:LASTEXITCODE = 0 + + # `tools.ps1` checks $ci to perform some actions. Since the SDL + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + . $PSScriptRoot\..\tools.ps1 + + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + + if ($Version) { + $argumentList += "-Version $Version" + } + + Start-Process nuget -Verbose -ArgumentList $argumentList -NoNewWindow -Wait + + $gdnCliPath = Get-ChildItem -Filter guardian.cmd -Recurse -Path $Path + + if (!$gdnCliPath) + { + Write-PipelineTelemetryError -Category 'Sdl' -Message 'Failure installing Guardian' + } + + return $gdnCliPath.FullName +} \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 7b8ee18a2..9dd5709f6 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -8,29 +8,28 @@ parameters: condition: '' steps: -- ${{ if ne(parameters.overrideGuardianVersion, '') }}: - - powershell: | - $content = Get-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content was:`n$content" - - $content = $content.Replace('$(DefaultGuardianVersion)', '$(GuardianVersion)') - $content | Set-Content $(GuardianPackagesConfigFile) - - Write-Host "packages.config content updated to:`n$content" - displayName: Use overridden Guardian version ${{ parameters.overrideGuardianVersion }} +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' -- task: NuGetCommand@2 - displayName: 'Install Guardian' - inputs: - restoreSolution: $(Build.SourcesDirectory)\eng\common\sdl\packages.config - feedsToUse: config - nugetConfigPath: $(Build.SourcesDirectory)\eng\common\sdl\NuGet.config - externalFeedCredentials: GuardianConnect - restoreDirectory: $(Build.SourcesDirectory)\.packages +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian - ${{ if ne(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} @@ -40,7 +39,7 @@ steps: - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} - -GuardianPackageName Microsoft.Guardian.Cli.$(GuardianVersion) + -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} @@ -62,7 +61,28 @@ steps: c i condition: succeededOrFailed() + - publish: $(Agent.BuildDirectory)/.gdn artifact: GuardianConfiguration displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs condition: succeededOrFailed() \ No newline at end of file diff --git a/global.json b/global.json index 10f1d7b61..afc998eb6 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22517.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22525.5" } } From 879ad82dd64c48e9dda350ae401aaf380915e7d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 7 Nov 2022 13:22:46 +0000 Subject: [PATCH 07/60] Update dependencies from https://github.com/dotnet/arcade build 20221031.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22531.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cff12eeb8..ee6e3e93b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 27f2df0aed469840fd47da3319d1b29e19e81e3c + ebe7fe2c2bd5143690e7150552562c9e44e3b0b5 diff --git a/global.json b/global.json index afc998eb6..77c368525 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.110" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22525.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22531.5" } } From 4513f8d89d457d204879ed0b25e1e53371588e75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Nov 2022 23:35:07 +0000 Subject: [PATCH 08/60] Update dependencies from https://github.com/dotnet/arcade build 20221108.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22558.2 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee6e3e93b..8a8184706 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - ebe7fe2c2bd5143690e7150552562c9e44e3b0b5 + 841e1fe0d2498a7ac6445e458ae521511ec226ca diff --git a/global.json b/global.json index 77c368525..62103f629 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.110", + "dotnet": "6.0.111", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.110" + "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22531.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2" } } From af2786a2c8200c5f8e3eaf94969798ef308bf589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Nov 2022 00:02:11 +0000 Subject: [PATCH 09/60] Update dependencies from https://github.com/dotnet/arcade build 20221108.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22558.7 --- eng/Version.Details.xml | 4 ++-- eng/common/dotnet-install.sh | 4 ++-- global.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a8184706..444fbbc01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 841e1fe0d2498a7ac6445e458ae521511ec226ca + a7773a9828c67a9b1fba3d2daee061ec90db3505 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index fdfeea66e..b09ea669f 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -52,7 +52,7 @@ done # Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples cpuname=$(uname -m) case $cpuname in - aarch64) + arm64|aarch64) buildarch=arm64 ;; amd64|x86_64) @@ -61,7 +61,7 @@ case $cpuname in armv*l) buildarch=arm ;; - i686) + i[3-6]86) buildarch=x86 ;; *) diff --git a/global.json b/global.json index 62103f629..084114c69 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7" } } From a5ba6c4a3118bab24c7f82aa68c6607bdbfbd2e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 19:03:11 +0000 Subject: [PATCH 10/60] Update dependencies from https://github.com/dotnet/arcade build 20221110.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22560.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 444fbbc01..e5fc4dbb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - a7773a9828c67a9b1fba3d2daee061ec90db3505 + a0fd54b5c2dc3e23aa8466bd4638462df4303633 diff --git a/global.json b/global.json index 084114c69..d2257fc85 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22558.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1" } } From a5f4bc79e63095bf85808f2803212d8107646cc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Nov 2022 21:28:01 +0000 Subject: [PATCH 11/60] Update dependencies from https://github.com/dotnet/arcade build 20221111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22561.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5fc4dbb6..0c9bb9ec7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - a0fd54b5c2dc3e23aa8466bd4638462df4303633 + 0967701e5527a1be21d9473821077c3f4be7f9dc diff --git a/global.json b/global.json index d2257fc85..2955bc991 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22560.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1" } } From d978807880ea6c56aa7f261e185a05bffc7ba59c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 21 Nov 2022 13:08:48 +0000 Subject: [PATCH 12/60] Update dependencies from https://github.com/dotnet/arcade build 20221114.9 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22564.9 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/steps/source-build.yml | 6 ++++++ global.json | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c9bb9ec7..81b7419d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 0967701e5527a1be21d9473821077c3f4be7f9dc + 3a5fc99d467769acc6f951cfefef5a9718ecfc42 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index abb1b2bcd..b5b3e5aeb 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/global.json b/global.json index 2955bc991..31adbea9f 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22561.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9" } } From 70a4103255c022b8fa9f149b41030607ff43d58d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Nov 2022 13:21:17 +0000 Subject: [PATCH 13/60] Update dependencies from https://github.com/dotnet/arcade build 20221121.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22571.3 --- eng/Version.Details.xml | 4 ++-- eng/common/cross/toolchain.cmake | 7 +++++++ global.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81b7419d2..f7b0cf34a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 3a5fc99d467769acc6f951cfefef5a9718ecfc42 + 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index ec8971eb0..51f30e53d 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -1,5 +1,12 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) +# reset platform variables (e.g. cmake 3.25 sets LINUX=1) +unset(LINUX) +unset(FREEBSD) +unset(ILLUMOS) +unset(ANDROID) +unset(TIZEN) + set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) diff --git a/global.json b/global.json index 31adbea9f..ebb96ea10 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22564.9" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22571.3" } } From db95be6f04d8724cb0555719bbe57af5c6025fe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Dec 2022 13:21:21 +0000 Subject: [PATCH 14/60] Update dependencies from https://github.com/dotnet/arcade build 20221201.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22601.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7b0cf34a..0e9792f85 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 90ee0ffcc39e0fc56f6389a075c6f650b2b57018 + 4255f0e27aa7ca1065962df22b65e4f2b0cd9a4c diff --git a/global.json b/global.json index ebb96ea10..9645cee01 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22571.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22601.5" } } From 396b511dfc3366930c075904a083e489a75b40a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Jan 2023 19:26:40 +0000 Subject: [PATCH 15/60] Update dependencies from https://github.com/dotnet/arcade build 20230110.6 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23060.6 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e9792f85..78d1cecf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 4255f0e27aa7ca1065962df22b65e4f2b0cd9a4c + 74b7648c106865057c78ca1e4b2ffcb5e9bce071 diff --git a/global.json b/global.json index 9645cee01..d7d36cc49 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.111", + "dotnet": "6.0.113", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.111" + "version": "6.0.113" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22601.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6" } } From 352699ce4743fb780804ed0a090332b9b50eb4f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Jan 2023 13:19:14 +0000 Subject: [PATCH 16/60] Update dependencies from https://github.com/dotnet/arcade build 20230119.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23069.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78d1cecf9..5e834136b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 74b7648c106865057c78ca1e4b2ffcb5e9bce071 + f8800600643e883856027b572461af5d92ed6ff0 diff --git a/global.json b/global.json index d7d36cc49..4f46b1fcb 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.113" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23060.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23069.5" } } From 36cd2734d700459d7b1e84aa9bfc0bf71708420a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Jan 2023 13:21:22 +0000 Subject: [PATCH 17/60] Update dependencies from https://github.com/dotnet/arcade build 20230123.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23073.7 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e834136b..ea09527fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - f8800600643e883856027b572461af5d92ed6ff0 + 05a8ec6db75694246db7a7b9ab680c9be91bf1d6 diff --git a/global.json b/global.json index 4f46b1fcb..d375bdd19 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.113" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23069.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23073.7" } } From 80763a658513fc288af42d1421f31a97e092be0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Feb 2023 17:38:29 +0000 Subject: [PATCH 18/60] Update dependencies from https://github.com/dotnet/arcade build 20230214.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23114.5 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea09527fa..91136cdd3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 05a8ec6db75694246db7a7b9ab680c9be91bf1d6 + 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 diff --git a/global.json b/global.json index d375bdd19..1fe4163f2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.113", + "dotnet": "6.0.114", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.113" + "version": "6.0.114" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23073.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5" } } From dbc3295d5f65c28a151943e72443f5275afdfc66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 13:19:53 +0000 Subject: [PATCH 19/60] Update dependencies from https://github.com/dotnet/arcade build 20230222.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23122.5 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91136cdd3..752435c6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 0c93c1cb1ef9c9d5c1a59f4ab98c2f7e37f12197 + 2771ba1e1eb9d976b0fd9f39653be81e9883a3f1 diff --git a/global.json b/global.json index 1fe4163f2..e2d2e47d3 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.114" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23114.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23122.5" } } From 214cfdf2922ca0ed74ba92b4ebd421915cb9d80b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Mar 2023 13:44:06 +0000 Subject: [PATCH 20/60] Update dependencies from https://github.com/dotnet/arcade build 20230315.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23165.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 752435c6a..39afccbee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 2771ba1e1eb9d976b0fd9f39653be81e9883a3f1 + 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 diff --git a/global.json b/global.json index e2d2e47d3..facc121ec 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.114", + "dotnet": "6.0.115", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.114" + "version": "6.0.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23122.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1" } } From bd6f7f1d4adc429b1d38080f61a05829161bb29e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Mar 2023 12:23:08 +0000 Subject: [PATCH 21/60] Update dependencies from https://github.com/dotnet/arcade build 20230317.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23167.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 39afccbee..e6748173a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 3e086d41fb3e6cd13c65811aa3882f37a0dad8c6 + 92c39a4f0bacef20812f63e2e1d3f7aa8776038d diff --git a/global.json b/global.json index facc121ec..7347e6549 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.115" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23165.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1" } } From 6df4a16211dde96c03bcbb1a2987c84247fa4300 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Apr 2023 16:08:23 +0000 Subject: [PATCH 22/60] Update dependencies from https://github.com/dotnet/arcade build 20230411.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23211.7 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6748173a..661577d35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 92c39a4f0bacef20812f63e2e1d3f7aa8776038d + 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 diff --git a/global.json b/global.json index 7347e6549..8bde26342 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.115", + "dotnet": "6.0.116", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.115" + "version": "6.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23167.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7" } } From 57c55127140fe3c7c29c5fa7fe6e2be986cd396b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 24 Apr 2023 12:18:08 +0000 Subject: [PATCH 23/60] Update dependencies from https://github.com/dotnet/arcade build 20230421.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23221.7 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/job.yml | 12 ++++++++---- eng/common/templates/steps/component-governance.yml | 10 ++++++++++ global.json | 2 +- 4 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 661577d35..e38e899fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 7bca7a24dfc0eded1f3e364b4ff7bf1235b6eb26 + 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 547d878da..e5784440d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -141,9 +141,13 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 8bde26342..0e2e00444 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23211.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7" } } From 62ffcaae77cb861a3ee58f720b4ead2ddc48fcb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 May 2023 12:37:38 +0000 Subject: [PATCH 24/60] Update dependencies from https://github.com/dotnet/arcade build 20230504.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23254.1 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/job.yml | 4 +++- global.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e38e899fb..4755576a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 3d9c9a4d3d893e903bb3295fd5b55b8e40699888 + eeb78d042d8f2bef222c83790fa253c5a22675ce diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e5784440d..c728a5c50 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -144,10 +144,12 @@ jobs: - template: /eng/common/templates/steps/component-governance.yml parameters: ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/global.json b/global.json index 0e2e00444..ccc52eaa1 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23221.7" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23254.1" } } From 006d1a605b368693ccccee4becc55a95269c0e3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Jun 2023 12:37:23 +0000 Subject: [PATCH 25/60] Update dependencies from https://github.com/dotnet/arcade build 20230601.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23301.1 --- eng/Version.Details.xml | 4 ++-- eng/common/templates/job/job.yml | 12 ++++++++---- global.json | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4755576a8..0999f01f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - eeb78d042d8f2bef222c83790fa253c5a22675ce + 2b9ccd49bbcca2156e229b00a140a8a018baac58 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c728a5c50..0e10e7db6 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -73,6 +73,10 @@ jobs: - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - name: EnableRichCodeNavigation value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 - ${{ each variable in parameters.variables }}: # handle name-value variable syntax # example: @@ -81,7 +85,7 @@ jobs: - ${{ if ne(variable.name, '') }}: - name: ${{ variable.name }} value: ${{ variable.value }} - + # handle variable groups - ${{ if ne(variable.group, '') }}: - group: ${{ variable.group }} @@ -154,7 +158,7 @@ jobs: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks + displayName: Execute Microbuild cleanup tasks condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) continueOnError: ${{ parameters.continueOnError }} env: @@ -222,7 +226,7 @@ jobs: displayName: Publish XUnit Test Results inputs: testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' + testResultsFiles: '*.xml' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} @@ -233,7 +237,7 @@ jobs: displayName: Publish TRX Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' + testResultsFiles: '*.trx' searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} diff --git a/global.json b/global.json index ccc52eaa1..83fa57ef3 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.116" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23254.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23301.1" } } From aec384b3363d3b35726d5d07b7a37c17f63185c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jun 2023 20:47:35 +0000 Subject: [PATCH 26/60] Update dependencies from https://github.com/dotnet/arcade build 20230613.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23313.5 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0999f01f1..1380f3e7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 2b9ccd49bbcca2156e229b00a140a8a018baac58 + 91616785a1a6578c83f7e93d98c34a1eb83d6223 diff --git a/global.json b/global.json index 83fa57ef3..e038179a9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.116", + "dotnet": "6.0.118", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.116" + "version": "6.0.118" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23301.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5" } } From b01fc6b55ae0ff04d612aa7c9c55b085618b647f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Jul 2023 18:54:20 +0000 Subject: [PATCH 27/60] Update dependencies from https://github.com/dotnet/arcade build 20230711.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23361.3 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1380f3e7d..7b16e768c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 91616785a1a6578c83f7e93d98c34a1eb83d6223 + cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 diff --git a/global.json b/global.json index e038179a9..d7b0c59e3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.118", + "dotnet": "6.0.120", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.118" + "version": "6.0.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23313.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3" } } From 853f209648b4644b1bd2dfa1fb005b51f4b5099a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Jul 2023 12:17:00 +0000 Subject: [PATCH 28/60] Update dependencies from https://github.com/dotnet/arcade build 20230720.4 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23370.4 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b16e768c..aba124bc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + bdbba2eef1b23da313d6b03632efa4ca9b6a39b9 diff --git a/global.json b/global.json index d7b0c59e3..d039d7c35 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23370.4" } } From 298a93cf0372ca8b7eda7789e87bf75143b5aa47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 15:21:18 +0000 Subject: [PATCH 29/60] Update dependencies from https://github.com/dotnet/arcade build 20230808.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23408.5 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aba124bc6..d48289948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - bdbba2eef1b23da313d6b03632efa4ca9b6a39b9 + 98fd22588fbb0f407faa6a74cb1aa79031306151 diff --git a/global.json b/global.json index d039d7c35..506f099e1 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.120" + "version": "6.0.121" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23370.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5" } } From f25481f8a09a2c11814f45c87a8fff0c7bfe321e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Aug 2023 12:14:38 +0000 Subject: [PATCH 30/60] Update dependencies from https://github.com/dotnet/arcade build 20230809.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23409.1 --- eng/Version.Details.xml | 4 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 2 +- 4 files changed, 76 insertions(+), 3 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d48289948..ccd86fa3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + c6613f71edcdc0e782300e3a0f2c74ebd51c0e40 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 506f099e1..62944b413 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.121" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23409.1" } } From b0902f9a83ea871e5d9eed9b84fdd3934ab21601 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Sep 2023 12:10:53 +0000 Subject: [PATCH 31/60] Update dependencies from https://github.com/dotnet/arcade build 20230809.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23409.1 From 904e87ac40237cbd5a37195920f25a0874546e00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Sep 2023 12:18:59 +0000 Subject: [PATCH 32/60] Update dependencies from https://github.com/dotnet/arcade build 20230809.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23409.1 From 27764a276fbab2ed1d9de3a4eb90274b3b854b17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Sep 2023 12:09:53 +0000 Subject: [PATCH 33/60] Update dependencies from https://github.com/dotnet/arcade build 20230809.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23409.1 From cd0b2ff7678cfbf54af3fd9c7094f309f93285c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Oct 2023 12:08:10 +0000 Subject: [PATCH 34/60] Update dependencies from https://github.com/dotnet/arcade build 20230926.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23476.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccd86fa3e..30988384b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - c6613f71edcdc0e782300e3a0f2c74ebd51c0e40 + 55b44b1f724b5b1ee65e637b498f123709aba8ba diff --git a/global.json b/global.json index 62944b413..0ed96ed85 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.122", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.121" + "version": "6.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23409.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23476.1" } } From d8394a0d4378078512ce1008702750fe4ab053c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Oct 2023 12:17:54 +0000 Subject: [PATCH 35/60] Update dependencies from https://github.com/dotnet/arcade build 20230926.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23476.1 From b98459bc4912ce2eec872ad62357f0c31aa48460 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 15:32:51 +0000 Subject: [PATCH 36/60] Update dependencies from https://github.com/dotnet/arcade build 20231011.8 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23511.8 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30988384b..814ed3ded 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 55b44b1f724b5b1ee65e637b498f123709aba8ba + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 diff --git a/global.json b/global.json index 0ed96ed85..4de8c0a55 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.122", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.122" + "version": "6.0.123" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23476.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8" } } From dc896e2774c85219aada170db7463853a4f1ea27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Oct 2023 12:18:10 +0000 Subject: [PATCH 37/60] Update dependencies from https://github.com/dotnet/arcade build 20231013.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23513.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 814ed3ded..2998e9783 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 0fa718fbfcb76994f09ea354abfa654a2fd226bf diff --git a/global.json b/global.json index 4de8c0a55..7ef81ef5c 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.123" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23513.1" } } From 3f5ad245b3059c277a0a74a97f78349f5d24382a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:18:10 +0000 Subject: [PATCH 38/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2998e9783..204de077d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 0fa718fbfcb76994f09ea354abfa654a2fd226bf + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c diff --git a/global.json b/global.json index 7ef81ef5c..12ab685c9 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.123" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23513.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3" } } From f102a345358608b54b4e6759f630a04db5f7b0ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Oct 2023 12:17:04 +0000 Subject: [PATCH 39/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From aad01a3aa888f896590d5aae51134d7bd8902277 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:17:51 +0000 Subject: [PATCH 40/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 1a5627284265f0ada91b6198a83e312fb592641f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:17:18 +0000 Subject: [PATCH 41/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 8e2f19e0639a92baef53b54890e9a2c57659fceb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 13:17:07 +0000 Subject: [PATCH 42/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From dabd326b1838ee787d23ae4636329e2f5926d4f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 19:21:07 +0000 Subject: [PATCH 43/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 22c3a1fc343f3276635dbfa4a793d8947c23171e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Nov 2023 13:17:09 +0000 Subject: [PATCH 44/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 2106f60abe9c30545874cd11dc79b2a3f0340d90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Dec 2023 13:17:54 +0000 Subject: [PATCH 45/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 52cdd0b9c8500fa6720dc00c1d44b7c71aa82bee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Dec 2023 13:34:07 +0000 Subject: [PATCH 46/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From 46e3ab727918f261406a7682c1f453f974d0ec72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 13:36:21 +0000 Subject: [PATCH 47/60] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23517.3 From f99a617b5e3b8bc313013ee002f43aff77b00b1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 13:39:34 +0000 Subject: [PATCH 48/60] Update dependencies from https://github.com/dotnet/arcade build 20231220.4 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23620.4 --- eng/Version.Details.xml | 4 ++-- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/post-build/add-build-to-channel.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 2 +- eng/common/post-build/trigger-subscriptions.ps1 | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 4 ++-- eng/common/templates/post-build/common-variables.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 204de077d..8c44675f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c + 10336beb8852ba1f98533413f311fcceb5abb141 diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 435e76413..8fda30bdc 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 39abdbecd..4e4116f1d 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1 index de2d95792..49938f0c8 100644 --- a/eng/common/post-build/add-build-to-channel.ps1 +++ b/eng/common/post-build/add-build-to-channel.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 8508397d7..1e779fec4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -3,7 +3,7 @@ param( [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, [Parameter(Mandatory=$true)][string] $MaestroToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1 index 55dea518a..ac9a95778 100644 --- a/eng/common/post-build/trigger-subscriptions.ps1 +++ b/eng/common/post-build/trigger-subscriptions.ps1 @@ -2,7 +2,7 @@ param( [Parameter(Mandatory=$true)][string] $SourceRepo, [Parameter(Mandatory=$true)][int] $ChannelId, [Parameter(Mandatory=$true)][string] $MaestroApiAccessToken, - [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com', + [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16' ) diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 0e10e7db6..01da2420d 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -123,7 +123,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d91bf9147..239b17010 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -53,7 +53,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication @@ -68,7 +68,7 @@ jobs: arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:Configuration=$(_BuildConfig) /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..fae340f4d 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -11,7 +11,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index fc022ca9b..d49c6156b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -162,7 +162,7 @@ stages: # 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 # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' - task: PowerShell@2 diff --git a/global.json b/global.json index 12ab685c9..5fcd6421c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.123", + "dotnet": "6.0.124", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.123" + "version": "6.0.124" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23620.4" } } From ecafae99d8893fca8bcdfbd44509159a5ef627c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jan 2024 13:40:05 +0000 Subject: [PATCH 49/60] Update dependencies from https://github.com/dotnet/arcade build 20231220.4 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.23620.4 From d5b944aa1278eb748d0f7fe4bbf33fa7f973e3e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 17:11:19 +0000 Subject: [PATCH 50/60] Update dependencies from https://github.com/dotnet/arcade build 20240109.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24059.3 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c44675f1..e374b0008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 10336beb8852ba1f98533413f311fcceb5abb141 + e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 diff --git a/global.json b/global.json index 5fcd6421c..a0d6a5f08 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.124", + "dotnet": "6.0.126", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.124" + "version": "6.0.126" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23620.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3" } } From 84612c6487e11485247c8ae665673fe795bbc5e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 13:41:24 +0000 Subject: [PATCH 51/60] Update dependencies from https://github.com/dotnet/arcade build 20240111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24061.1 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e374b0008..694b3d43b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2 + 553a791830f6a4fb8c93240f8c4a8d2ca6d01ee4 diff --git a/global.json b/global.json index a0d6a5f08..a7c4e0ce3 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.126" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24061.1" } } From 8e40c3fd5ec2ea8833bdc862eaadd0c5e703886f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jan 2024 13:37:43 +0000 Subject: [PATCH 52/60] Update dependencies from https://github.com/dotnet/arcade build 20240111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24061.1 From 0901e833d2da8d913070d0cfab4bbede78c1001b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jan 2024 13:39:52 +0000 Subject: [PATCH 53/60] Update dependencies from https://github.com/dotnet/arcade build 20240111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24061.1 From 74456df7107da5426ba00d38965b8e1a10e14be6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Feb 2024 13:38:32 +0000 Subject: [PATCH 54/60] Update dependencies from https://github.com/dotnet/arcade build 20240111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24061.1 From bdc1512fe1abf763f55c5e8f9eb4a927dd423989 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 12 Feb 2024 13:30:50 +0000 Subject: [PATCH 55/60] Update dependencies from https://github.com/dotnet/arcade build 20240111.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24061.1 From 328d80f9e913e4f036c6c5f15dd9245b79aca334 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Feb 2024 22:07:53 +0000 Subject: [PATCH 56/60] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24113.1 --- eng/Version.Details.xml | 4 ++-- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 10 +++++----- eng/common/templates/jobs/jobs.yml | 10 +++++----- .../templates/post-build/post-build.yml | 20 +++++++++---------- global.json | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 694b3d43b..bdc77eeea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 553a791830f6a4fb8c93240f8c4a8d2ca6d01ee4 + 96facbceaca1e4eb498055c005088764d3b38dff diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4..5a3a32ea8 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 239b17010..bd3d54b76 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -51,7 +51,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: NuGetAuthenticate@1 @@ -74,7 +74,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -83,7 +83,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -109,7 +109,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -118,4 +118,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 9c4becbc8..f70826518 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -88,8 +88,8 @@ jobs: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index d49c6156b..5a0bb8d96 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -220,9 +220,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -253,8 +253,8 @@ stages: name: VSEngSS-MicroBuild2022-1ES demands: Cmd # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Svc-Internal + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -266,10 +266,10 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' \ No newline at end of file + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index a7c4e0ce3..a00baa86a 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.126" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24061.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1" } } From 06ad2470df133272dc9d08ed376e5203430ff973 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Feb 2024 13:37:05 +0000 Subject: [PATCH 57/60] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24113.1 From eb714fb8e37a58b42b2210b28ee29c42cc0e6d19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 13:20:54 +0000 Subject: [PATCH 58/60] Update dependencies from https://github.com/dotnet/arcade build 20240213.1 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24113.1 From df9c343f7b77d004ae5bc734228341344eb7e201 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 13:41:36 +0000 Subject: [PATCH 59/60] Update dependencies from https://github.com/dotnet/arcade build 20240223.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24123.2 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bdc77eeea..65832a214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 96facbceaca1e4eb498055c005088764d3b38dff + a4466feb75bd7750d2e63a7cb061b2bf32896316 diff --git a/global.json b/global.json index a00baa86a..45ce8c562 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.126", + "dotnet": "6.0.127", "runtimes": { "dotnet": [ "3.1.21" @@ -8,9 +8,9 @@ } }, "sdk": { - "version": "6.0.126" + "version": "6.0.127" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24113.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24123.2" } } From 82b3bfdafb6419046f8318ecc6738508dd6f057e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 12:39:49 +0000 Subject: [PATCH 60/60] Update dependencies from https://github.com/dotnet/arcade build 20240306.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.24156.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65832a214..6215685ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - a4466feb75bd7750d2e63a7cb061b2bf32896316 + b77c32ee228088f67a86621af0944e309f019ee7 diff --git a/global.json b/global.json index 45ce8c562..f8846c30f 100644 --- a/global.json +++ b/global.json @@ -11,6 +11,6 @@ "version": "6.0.127" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24123.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24156.3" } }