From 71b28484b2c33e7730c956e9b2aa86f6c41bdd38 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 14 Feb 2024 12:43:58 -0600 Subject: [PATCH 1/5] [release/8.0] Update to latest wix (#674) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 571cc040c7..0b0a2efb5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,7 +50,7 @@ 1.1.87-gba258badda - 1.0.0-v3.14.0.5722 + 3.14.0-8606.20240208.1 From 7762b63e0d90bc7b0a7e6d9338a38ea5c4158364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:55:20 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/arcade build 20240213.2 (#679) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24113.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 14 +++++------ .../templates/post-build/post-build.yml | 16 ++++++------- .../templates/variables/pool-providers.yml | 12 +++++----- global.json | 4 ++-- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b3c518a6b..fb362e354c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -215,30 +215,30 @@ https://github.com/dotnet/llvm-project f8a384870a24da097e757885235dfff2acffe7a1 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 0b0a2efb5f..7d6a6acb1c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,10 +43,10 @@ release - 8.0.0-beta.24059.4 - 8.0.0-beta.24059.4 - 8.0.0-beta.24059.4 - 8.0.0-beta.24059.4 + 8.0.0-beta.24113.2 + 8.0.0-beta.24113.2 + 8.0.0-beta.24113.2 + 8.0.0-beta.24113.2 1.1.87-gba258badda diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4d..5a3a32ea8d 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 fa5446c093..8ec0151def 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -58,7 +58,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -71,7 +71,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 - task: PowerShell@2 @@ -86,7 +86,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -95,7 +95,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: @@ -121,7 +121,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 @@ -137,7 +137,7 @@ jobs: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' @@ -148,4 +148,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/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f74abf7ce..aba44a25a3 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 @@ -131,8 +131,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 @@ -221,9 +221,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 @@ -258,7 +258,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -272,7 +272,7 @@ 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)' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d3..d236f9fdbb 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,15 +1,15 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, # otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. -# Motivation: +# Motivation: # Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS # (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing # (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template # file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. -# How to use: +# How to use: # This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). # If we find alternate naming conventions in broad usage it can be added to the condition below. # @@ -54,4 +54,4 @@ variables: False, 'NetCore1ESPool-Internal' ) - ] \ No newline at end of file + ] diff --git a/global.json b/global.json index 7b43673889..3688c18dbb 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "8.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24113.2", "Microsoft.Build.Traversal": "2.0.34" } } From 84081690e56f77398b05736c2cc03e6d5094a1f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 19:27:52 +0100 Subject: [PATCH 3/5] [release/8.0] Update dependencies from dotnet/emscripten, dotnet/node (#682) * Update dependencies from https://github.com/dotnet/emscripten build 20240214.1 Microsoft.NETCore.Runtime.Wasm.Emscripten.Transport From Version 8.0.0-rtm.24073.2 -> To Version 8.0.0-rtm.24114.1 * Update dependencies from https://github.com/dotnet/node build 20240214.1 runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport , runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport From Version 8.0.0-rtm.24060.1 -> To Version 8.0.0-rtm.24114.1 --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb362e354c..25d1d92774 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,29 +41,29 @@ https://github.com/dotnet/cpython a63a34c9711a8f2be10a92670602735609541ed0 - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b - + https://github.com/dotnet/node - 59978291363a8e81aea508ce34d02a9eb3cc89ee + 91cff70eb7c60a2f4cc7881457418dffe2f7da2b https://github.com/dotnet/llvm-project @@ -153,9 +153,9 @@ https://github.com/dotnet/llvm-project f8a384870a24da097e757885235dfff2acffe7a1 - + https://github.com/dotnet/emscripten - 8bf869819a80b59f98ca196ab7c2d74b4655fa62 + af30a42f5d08352de0680472c6b6354d21931a95 diff --git a/eng/Versions.props b/eng/Versions.props index 7d6a6acb1c..cedcdcaeaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -24,19 +24,19 @@ 8.0.0-rtm.24060.1 8.0.0-rtm.24060.1 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 - 8.0.0-rtm.24060.1 + 8.0.0-rtm.24114.1 + 8.0.0-rtm.24114.1 + 8.0.0-rtm.24114.1 + 8.0.0-rtm.24114.1 + 8.0.0-rtm.24114.1 + 8.0.0-rtm.24114.1 16.0.5-alpha.1.23566.1 16.0.5-alpha.1.23566.1 16.0.5-alpha.1.23566.1 16.0.5-alpha.1.23566.1 16.0.5-alpha.1.23566.1 16.0.5-alpha.1.23566.1 - 8.0.0-rtm.24073.2 + 8.0.0-rtm.24114.1 true From 1bcc6676a5b1732478a2dd668382284a9b57c64c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 14:26:02 +0100 Subject: [PATCH 4/5] add ProducesDotNetReleaseShippingAssets property (#688) Co-authored-by: MilenaHristova --- eng/Publishing.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Publishing.props b/eng/Publishing.props index a150c49581..e2e82fa9ef 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -3,6 +3,7 @@ 3 false + true From 1639670c6547454278f51afc5c74e20f8acc7abd Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 6 Mar 2024 03:55:56 -0800 Subject: [PATCH 5/5] Update branding to 8.0.4 (#698) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cedcdcaeaf..5e13fba50a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,7 +3,7 @@ 8 0 - 3 + 4 $(MajorVersion).$(MinorVersion).$(PatchVersion) servicing