diff --git a/.vsts-ci.yml b/.vsts-ci.yml index e0d29f5cfb..e9840a9e83 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -118,10 +118,10 @@ stages: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore-Svc-Public - demands: ImageOverride -equals 1es-ubuntu-2004-open + demands: ImageOverride -equals 1es-ubuntu-2204-open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals 1es-ubuntu-2004 + demands: ImageOverride -equals 1es-ubuntu-2204 strategy: matrix: ${{ if in(variables['Build.Reason'], 'PullRequest') }}: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1296934692..19a8d4ac06 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,10 +1,10 @@ - - https://github.com/dotnet/source-build-reference-packages - 8a91992a869b6e4dccd49b1c3246486e963595af - + + https://github.com/dotnet/source-build-assets + e726d9647b47c6635533d8eebfc2992749128d7e + @@ -24,4 +24,4 @@ - + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 08038d3017..427cef63db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ - 8.0.0-alpha.1.23217.1 + 8.0.0-alpha.1.26208.5 1.2.0-beta-22518-02 1.0.0-beta.22631.1 diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index e40bf35203..98a22bc9ab 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -49,18 +49,18 @@ jobs: # 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 - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + demands: ImageOverride -equals Build.Ubuntu.2204.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 + demands: ImageOverride -equals Build.Ubuntu.2204.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 + demands: ImageOverride -equals Build.Ubuntu.2204.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 - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }}