diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9b942cb53881..0baa333b1877 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -783,20 +783,19 @@ stages: publishOnError: true includeForks: true - # Source build - skip until https://github.com/dotnet/source-build/issues/3111 is resolved - - ${{ if False }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - platform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' - buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' - skipPublishValidation: true - jobProperties: - timeoutInMinutes: 120 - variables: - # Log environment variables in binary logs to ease debugging - MSBUILDLOGALLENVIRONMENTVARIABLES: true + # Source build + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildScript: './eng/build.sh $(_PublishArgs) --no-build-repo-tasks' + skipPublishValidation: true + jobProperties: + timeoutInMinutes: 120 + variables: + # Log environment variables in binary logs to ease debugging + MSBUILDLOGALLENVIRONMENTVARIABLES: true # Publish to the BAR and perform source indexing. Wait until everything else is done. - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -831,6 +830,7 @@ stages: - MacOS_Test - Linux_Test - Helix_x64 + - Source_Build_Managed pool: name: NetCore1ESPool-Internal demands: ImageOverride -equals 1es-windows-2019 @@ -869,6 +869,7 @@ stages: - MacOS_Test - Linux_Test - Helix_x64 + - Source_Build_Managed pool: name: NetCore1ESPool-Internal # Visual Studio Enterprise - no BuildTools agents exist internally and job must run on Windows diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df0ad8002eef..cb3a82402d13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -302,26 +302,26 @@ https://github.com/dotnet/runtime ae70a1c51a334a5e13fa22d500f8a8390052eef5 - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 083fc0406279952794c853630a08a141eef7244f - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 083fc0406279952794c853630a08a141eef7244f - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 083fc0406279952794c853630a08a141eef7244f - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 083fc0406279952794c853630a08a141eef7244f - + https://github.com/dotnet/arcade - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 + 083fc0406279952794c853630a08a141eef7244f diff --git a/eng/Versions.props b/eng/Versions.props index 74bfc6d16c94..877d260d338f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,9 +135,9 @@ 8.0.0-alpha.1.23073.4 8.0.0-alpha.1.23073.4 - 8.0.0-beta.23067.5 - 8.0.0-beta.23067.5 - 8.0.0-beta.23067.5 + 8.0.0-beta.23073.10 + 8.0.0-beta.23073.10 + 8.0.0-beta.23073.10 8.0.0-alpha.1.23062.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9217ee06bb67..7caacc6de2e1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -498,7 +498,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { # Two part minimal VS version, e.g. "15.9", "16.0", etc. # "components": ["componentId1", "componentId2", ...] # Array of ids of workload components that must be available in the VS instance. -# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise +# See e.g. https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-enterprise?view=vs-2017 # # Returns JSON describing the located VS instance (same format as returned by vswhere), # or $null if no instance meeting the requirements is found on the machine. diff --git a/global.json b/global.json index 48c04c363db1..a439c55f0ef2 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23067.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23067.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23073.10", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23073.10" } }