Skip to content

Commit c5e09e9

Browse files
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.4xx' (#20809)
2 parents 4c1b2e0 + 79788f8 commit c5e09e9

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

eng/pipelines/templates/jobs/vmr-synchronization.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,12 @@ jobs:
4040
pool:
4141
${{ if eq(variables['System.TeamProject'], 'public') }}:
4242
name: $(DncEngPublicBuildPool)
43-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
44-
${{ if eq(variables['System.TeamProject'], 'internal') }}:
43+
image: 1es-ubuntu-2204-open
44+
os: linux
45+
${{ else }}:
4546
name: $(DncEngInternalBuildPool)
46-
demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
47+
demands: ImageOverride -equals 1es-ubuntu-2204
48+
os: linux
4749

4850
steps:
4951
- template: ../steps/vmr-prepare.yml

eng/pipelines/templates/variables/vmr-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ variables:
4040
- name: defaultPoolName
4141
value: NetCore-Public-XL
4242
- name: poolImage_Linux
43-
value: 1es-ubuntu-2004-open
43+
value: build.ubuntu.2204.amd64.open
4444
- name: poolImage_LinuxArm64
4545
value: Mariner-2-Docker-ARM64
4646
- name: poolName_LinuxArm64

eng/vmr-sync.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,8 @@ set -e
238238
highlight 'Installing .NET, preparing the tooling..'
239239
source "$scriptroot/common/tools.sh"
240240
InitializeDotNetCli true
241-
dotnet=$(realpath "$scriptroot/../.dotnet/dotnet")
241+
dotnetDir=$_InitializeDotNetCli
242+
dotnet=$dotnetDir/dotnet
242243
"$dotnet" tool restore
243244

244245
highlight "Starting the synchronization of '$repository'.."

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
These URLs can't be composed from their base URL and version as we read them from the
3131
prep.sh and pipeline scripts, outside of MSBuild.
3232
-->
33-
<PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.123-servicing.25611.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
34-
<PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.123-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
33+
<PrivateSourceBuiltArtifactsUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.124-servicing.26072.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
34+
<PrivateSourceBuiltSdkUrl>https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.124-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
3535
</PropertyGroup>
3636
</Project>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"tools": {
3-
"dotnet": "8.0.123"
3+
"dotnet": "8.0.124"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.CentralPackageVersions": "2.0.1",
77
"Microsoft.Build.Traversal": "2.0.2",
88
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
9-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4",
9+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2",
1010
"Yarn.MSBuild": "1.15.2"
1111
}
1212
}

0 commit comments

Comments
 (0)