From 193aa8f1fbfcae43126620143761dc59fb74e8fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 19:18:28 +0000 Subject: [PATCH 01/16] Update dependencies from https://github.com/dotnet/arcade build 20231017.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23511.8 -> To Version 6.0.0-beta.23517.3 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.22 -> To Version 6.0.25 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0 --- NuGet.config | 8 -------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f8067f09..03d3587a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,16 @@ - - - - @@ -41,16 +37,12 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10158d645..492e94748 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 3c754f28788fae642dc307a948479204e9f7dd5a + d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91 https://github.com/dotnet/source-build @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7814defb1..6407cb843 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23511.8 + 6.0.0-beta.23517.3 @@ -185,7 +185,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.22 + 6.0.25 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index eeff7fa00..1410185dd 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From 66c787891e4032897eb5df029c11ea97a5a4b89a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 21:01:01 +0000 Subject: [PATCH 02/16] [release/6.0.1xx] Update dependencies from dotnet/arcade (#17517) [release/6.0.1xx] Update dependencies from dotnet/arcade - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-25252fb3-bc5a-4401-85d9-c93e83346b2b --- NuGet.config | 9 ----- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 7 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index a735b4622..dd632b04b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,16 @@ - - - - - @@ -42,17 +37,13 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7af92d1e..039431cba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c858d3a61..616f2592a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23517.3 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/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654..00aa98eb3 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, 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 327cfe027..1410185dd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23517.3" } } From d60339e96f69c69153a754512fcb8683cbb64bd0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 18:57:29 +0000 Subject: [PATCH 03/16] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231128.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23219.1 -> To Version 7.0.0-alpha.1.23578.1 --- NuGet.config | 21 --------------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index be7632bd2..9c94cf60c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,27 +9,15 @@ - - - - - - - - - - - - @@ -53,18 +41,9 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a464c3fa3..327438c20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -207,9 +207,9 @@ https://github.com/dotnet/arcade ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/source-build-reference-packages - 525b6c35cc5c5c9b80b47044be2e4e77858d505a + 6d5841c05f04d60eccf3358588b8c8968215d9e2 From f3408134a4434bf293b704fdc7369aec172f9f6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 17:42:52 +0000 Subject: [PATCH 04/16] Update dependencies from https://github.com/dotnet/arcade build 20231130.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23564.5 -> To Version 7.0.0-beta.23580.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 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/publish-build-assets.yml | 2 +- eng/common/templates/jobs/source-build.yml | 2 +- eng/common/templates/post-build/common-variables.yml | 2 +- global.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e86c9c4ef..d2ead3a98 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 - + https://github.com/dotnet/arcade - ca53a3149aaedb03e5d79ee0e259d31ac8719290 + 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 3012a3afa..b2a622e42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23564.5 + 7.0.0-beta.23580.4 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 84c1d0cc2..c305ae6bd 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/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index c5fedd7f7..e8c6c2d09 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -87,7 +87,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:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb5..8dd2d355f 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8-20220809204800-17a4aab' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 776bd9700..b504fe55c 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -10,7 +10,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/global.json b/global.json index 154f5f035..d3f802679 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" } } From b654f3e01bd56d01afd22663f05a63baf4c5eb22 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Tue, 5 Dec 2023 12:15:32 -0800 Subject: [PATCH 05/16] Enable open ssl sha 1 signatures for CentOS Stream 9 (#17889) --- .../templates/job/source-build-build-tarball.yml | 11 ++++++++--- .../templates/job/source-build-run-tarball-build.yml | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml index 2c7900e09..f5569e26b 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml @@ -123,19 +123,24 @@ jobs: set -x df -h - networkArgs= + customRunArgs= customBuildArgs= if [[ '$(_RunOnline)' == 'true' ]]; then customBuildArgs='--online' else - networkArgs='--network none' + customRunArgs='--network none' + fi + + # See https://github.com/dotnet/source-build/issues/3712 + if [[ '$(_OverrideDistroDisablingSha1)' == 'true' ]]; then + customRunArgs="$customRunArgs -e OPENSSL_ENABLE_SHA1_SIGNATURES=1" fi if [[ '$(_EnablePoison)' == 'true' ]]; then customBuildArgs="$customBuildArgs --poison" fi - docker run --rm -v $(tarballDir):/tarball -w /tarball ${networkArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) + docker run --rm -v $(tarballDir):/tarball -w /tarball ${customRunArgs} $(_Container) ./build.sh --clean-while-building ${customBuildArgs} $(additionalBuildArgs) displayName: Build Tarball - ${{ if ne(variables['System.TeamProject'], 'public') }}: diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml index bfea7becd..a4a18425a 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml @@ -11,7 +11,7 @@ parameters: # ----------------------------------------------------------------------------------------------- alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17 centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build - centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9-20220107135047-4cd394c + centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8 fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38 ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 @@ -40,18 +40,21 @@ jobs: _BootstrapPrep: true _Container: ${{ parameters.alpine317Container }} _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false CentOS7-Online: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: true CentOS7-Offline: _BootstrapPrep: false _Container: ${{ parameters.centOS7Container }} _EnablePoison: false _ExcludeOmniSharpTests: true + _OverrideDistroDisablingSha1: false _RunOnline: false ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: CentOSStream9-Offline: @@ -59,18 +62,21 @@ jobs: _Container: ${{ parameters.centOSStream9Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: true _RunOnline: false Fedora38-Offline: _BootstrapPrep: false _Container: ${{ parameters.fedora38Container }} _EnablePoison: true _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false Ubuntu1804-Offline: _BootstrapPrep: false _Container: ${{ parameters.ubuntu1804Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64 pool: @@ -94,6 +100,7 @@ jobs: _Container: ${{ parameters.debian11Arm64Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_arm64 pool: ${{ parameters.poolInternalArm64 }} @@ -114,6 +121,7 @@ jobs: _Container: ${{ parameters.fedora38Container }} _EnablePoison: false _ExcludeOmniSharpTests: false + _OverrideDistroDisablingSha1: false _RunOnline: false name: Build_Tarball_x64_Using_Previous pool: From e488f0c8cf38a7baf3d67d553c001be76b63e84d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 14 Dec 2023 11:13:41 -0600 Subject: [PATCH 06/16] Add back security-partners-dotnet pipeline (#17956) --- .../pipelines/security-partners-dotnet.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml new file mode 100644 index 000000000..844f876f6 --- /dev/null +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -0,0 +1,32 @@ +trigger: none + +variables: +- name: cfsNPMWarnLevel + value: none + +- name: cfsNugetWarnLevel + value: none + +- name: myGetWarnLevel + value: none + +- name: NuGetSecurityAnalysisWarningLevel + value: none + +jobs: +- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu2004-Offline: + _BootstrapPrep: true + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + _WithPreviousSDK: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 From fe9a639fb4b4509617a59f0d44a384478c5638fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Dec 2023 17:39:53 +0000 Subject: [PATCH 07/16] [release/7.0.3xx] Update dependencies from dotnet/arcade (#18012) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- global.json | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d2ead3a98..6cc0c1769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/arcade - 28c80dc37ad1f33e5b0cca62d6a962ee130a1d09 + ef97d6e7478f4ae77cf6e827ee40e8c41120093c https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b2a622e42..a82728ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23580.4 + 7.0.0-beta.23620.3 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index ef337eac5..11c345c58 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -124,7 +124,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - 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 e8c6c2d09..4ff83a536 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Enable cross-org NuGet feed authentication diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index c051f1b65..7b989985b 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,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 @@ -272,7 +272,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/global.json b/global.json index d3f802679..73ab36895 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23580.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23580.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" } } From b015286fbf1aa466c5ea93ddafb2641d4c6b6eac Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:51 -0800 Subject: [PATCH 08/16] Update branding to 6.0.322 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c689826cd..a0544d921 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 21 + 22 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 9c3dc27baa46731dfe71d44ebd14dac55a98036d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:55 -0800 Subject: [PATCH 09/16] Update branding to 6.0.419 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6407cb843..50201197d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 377a557649f9237e02ee15dc150e07a3ba567c12 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:57:59 -0800 Subject: [PATCH 10/16] Update branding to 7.0.116 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a42e5dcf5..192f8e1a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 9a55503c824a8bca5589fb75188cafc41b0d1961 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jan 2024 13:58:04 -0800 Subject: [PATCH 11/16] Update branding to 7.0.313 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a82728ae8..95123c15c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 802d734f374f7ae1a95a741dc1f38ba09fda0d27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 19:50:04 +0000 Subject: [PATCH 12/16] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..f07547d28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - c47ba6c19d50081f90008da8bc61b3ac20348f20 + d6ad546c83ce94b3efb4662513bed71a3e6192ef From 5ecf815011b53316e2e0e7b8b2d30df67c16d8b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:42:40 +0000 Subject: [PATCH 13/16] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 7.0.0-alpha.1.22505.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f07547d28..394548a19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,9 +180,9 @@ c3ad00ae84489071080a606f6a8e43c9a91a5cc2 - + https://github.com/dotnet/source-build-externals - d6ad546c83ce94b3efb4662513bed71a3e6192ef + 4bed7bdd937666fac4c4f351b9b02adddf8d035b From 41d248a950569d308a3579d72d8dd1569748b9b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:29:19 +0000 Subject: [PATCH 14/16] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240109.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.23578.1 -> To Version 7.0.0-alpha.1.24059.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..5406651dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,9 +205,9 @@ https://github.com/dotnet/arcade ef97d6e7478f4ae77cf6e827ee40e8c41120093c - + https://github.com/dotnet/source-build-reference-packages - 6d5841c05f04d60eccf3358588b8c8968215d9e2 + 727ef4887d561dae6069d6b9c035773013dad041 From 4c34f145ba150bdd52b89be6d820992b217c3894 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 01:53:36 +0000 Subject: [PATCH 15/16] Update dependencies from https://github.com/dotnet/arcade build 20240109.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23620.3 -> To Version 7.0.0-beta.24059.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b29928cb2..e8e0535a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 - + https://github.com/dotnet/arcade - ef97d6e7478f4ae77cf6e827ee40e8c41120093c + 02d5538bac1bacfd6fb310d92ab8914de08f3358 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1b89b449..828e9255a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23620.3 + 7.0.0-beta.24059.5 diff --git a/global.json b/global.json index 73ab36895..fd9164f9a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113", + "dotnet": "7.0.115", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23620.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23620.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.24059.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.24059.5" } } From 895635d93949b833000344bf65493edfcbe9511a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 10 Jan 2024 08:49:09 -0600 Subject: [PATCH 16/16] Revert change for internal update --- src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets index 0a9a2ddc0..dc33e0a03 100644 --- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets +++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets @@ -172,9 +172,8 @@ WorkingDirectory="$(TarballRepoSourceDir)" Condition="$(IsRootRepo) != 'true'" /> -