diff --git a/azure-pipelines-richnav.yml b/azure-pipelines-richnav.yml index d1c19896907..8c94b7fed42 100644 --- a/azure-pipelines-richnav.yml +++ b/azure-pipelines-richnav.yml @@ -2,6 +2,9 @@ trigger: - master - main +variables: +- template: /eng/common/templates/variables/pool-providers.yml + stages: - stage: build displayName: Build @@ -16,7 +19,7 @@ stages: enableRichCodeNavigation: true richCodeNavigationEnvironment: 'production' pool: - name: NetCore-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64.open steps: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 04910f06d94..8ba94c0ec10 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -157,13 +157,15 @@ stages: - stage: PublishAssetRegistry displayName: Publish to Build Asset Registry dependsOn: Build + variables: + - template: /eng/common/templates/variables/pool-providers.yml jobs: # Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact. - template: /eng/common/templates/job/publish-build-assets.yml parameters: publishUsingPipelines: true pool: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab81bdeaec1..30eedbdd40a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -130,29 +130,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 - + https://github.com/dotnet/arcade - 691fd54681d10eef3c2681fceb8b09b9f9ba9bb0 + afa0b37a066ac10768e49b29c82e5e039e714655 diff --git a/eng/Versions.props b/eng/Versions.props index 57c58cc5975..073cc903569 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,9 +54,9 @@ - 8.0.0-beta.23077.1 - 8.0.0-beta.23077.1 - 8.0.0-beta.23077.1 + 8.0.0-beta.23102.4 + 8.0.0-beta.23102.4 + 8.0.0-beta.23102.4 17.4.0-preview-20220707-01 diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 69e65eeae7d..bcb579e37a9 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -137,6 +137,7 @@ $locJson = @{ @{ LanguageSet = $LanguageSet CloneLanguageSet = "VS_macOS_CloneLanguages" + LssFiles = @( ".\eng\common\loc\P22DotNetHtmlLocalization.lss" ) LocItems = @( $macosHtmlFiles | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss new file mode 100644 index 00000000000..858a0b237c6 Binary files /dev/null and b/eng/common/loc/P22DotNetHtmlLocalization.lss differ diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index e40bf35203b..8a3deef2b72 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -46,20 +46,12 @@ jobs: # source-build builds run in Docker, including the default managed platform. # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic pool: - # Main environments - ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}: - name: NetCore-Public + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}: - name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 - # Servicing build environments - ${{ if and(eq(variables['System.TeamProject'], 'public'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}: - name: NetCore-Svc-Public - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open - ${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}: - name: NetCore1ESPool-Svc-Internal + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 1b820b41605..9cc5c550d3b 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -26,23 +26,32 @@ # demands: ImageOverride -equals windows.vs2019.amd64 variables: -# Coalesce the target and source branches so we know when a PR targets a release branch -# If these variables are somehow missing, fall back to main (tends to have more capacity) -- name: BranchNameForPoolSelection - value: ${{ coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main') }} + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) -# Any new -Svc alternative pools should have variables added here to allow for splitting work - -# Main branch pools -- ${{ if ne(contains(variables['BranchNameForPoolSelection'], 'release'), true) }}: + # Any new -Svc alternative pools should have variables added here to allow for splitting work - name: DncEngPublicBuildPool - value: NetCore-Public - - name: DncEngInternalBuildPool - value: NetCore1ESPool-Internal + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] -# Release branch pools -- ${{ if contains(variables['BranchNameForPoolSelection'], 'release') }}: - - name: DncEngPublicBuildPool - value: NetCore-Svc-Public - name: DncEngInternalBuildPool - value: NetCore1ESPool-Svc-Internal + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/eng/pipelines/azure-pipelines-codeql.yml b/eng/pipelines/azure-pipelines-codeql.yml index 9dc037c0361..9320e2a6074 100644 --- a/eng/pipelines/azure-pipelines-codeql.yml +++ b/eng/pipelines/azure-pipelines-codeql.yml @@ -24,6 +24,7 @@ variables: value: Release - name: NativeToolsOnMachine value: true +- template: /eng/common/templates/variables/pool-providers.yml trigger: none @@ -41,7 +42,7 @@ jobs: - job: codeql displayName: CodeQL pool: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals 1es-windows-2022 timeoutInMinutes: 90 diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index a296cc71f45..e02f8cf6125 100644 --- a/eng/pipelines/build.yml +++ b/eng/pipelines/build.yml @@ -12,12 +12,14 @@ jobs: - job: ${{ parameters.name }} displayName: ${{ parameters.name }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + variables: + - template: /eng/common/templates/variables/pool-providers.yml pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: NetCore-Public + name: $(DncEngPublicBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if ne(variables['System.TeamProject'], 'public') }}: - name: NetCore1ESPool-Internal + name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2022preview.amd64 strategy: matrix: diff --git a/global.json b/global.json index b691f15b7fd..4c1f3499e6d 100644 --- a/global.json +++ b/global.json @@ -14,9 +14,9 @@ "version": "8.0.100-alpha.1.23061.8" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23077.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23077.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23077.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23102.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23102.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23102.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.1.23104.3" },