Skip to content

Commit da91c0f

Browse files
wtgodbewtgodbe
committed
Merge from public
2 parents dad4732 + 14dbda5 commit da91c0f

File tree

22 files changed

+536
-380
lines changed

22 files changed

+536
-380
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ stages:
414414
jobName: Linux_musl_x64_build
415415
jobDisplayName: "Build: Linux Musl x64"
416416
agentOs: Linux
417-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
417+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
418418
buildArgs:
419419
--arch x64
420420
--os-name linux-musl
@@ -449,7 +449,7 @@ stages:
449449
jobDisplayName: "Build: Linux Musl ARM"
450450
agentOs: Linux
451451
useHostedUbuntu: false
452-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
452+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
453453
buildArgs:
454454
--arch arm
455455
--os-name linux-musl
@@ -483,7 +483,7 @@ stages:
483483
jobDisplayName: "Build: Linux Musl ARM64"
484484
agentOs: Linux
485485
useHostedUbuntu: false
486-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
486+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
487487
buildArgs:
488488
--arch arm64
489489
--os-name linux-musl
@@ -612,7 +612,7 @@ stages:
612612
parameters:
613613
platform:
614614
name: 'Managed'
615-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
615+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64'
616616
buildScript: './eng/build.sh $(_PublishArgs) --no-build-nodejs --no-build-repo-tasks $(_InternalRuntimeDownloadArgs)'
617617
skipPublishValidation: true
618618
jobProperties:

‎.azure/pipelines/ci.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,8 @@ extends:
143143
tsa:
144144
enabled: true
145145
containers:
146-
alpine319WithNode:
147-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
148-
mariner20CrossArmAlpine:
149-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
150-
mariner20CrossArm64Alpine:
151-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
146+
azureLinux30Net8BuildAmd64:
147+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
152148
stages:
153149
- stage: build
154150
displayName: Build
@@ -483,7 +479,7 @@ extends:
483479
jobName: Linux_musl_x64_build
484480
jobDisplayName: "Build: Linux Musl x64"
485481
agentOs: Linux
486-
container: alpine319WithNode
482+
container: azureLinux30Net8BuildAmd64
487483
buildArgs:
488484
--arch x64
489485
--os-name linux-musl
@@ -518,7 +514,7 @@ extends:
518514
jobDisplayName: "Build: Linux Musl ARM"
519515
agentOs: Linux
520516
useHostedUbuntu: false
521-
container: mariner20CrossArmAlpine
517+
container: azureLinux30Net8BuildAmd64
522518
buildArgs:
523519
--arch arm
524520
--os-name linux-musl
@@ -552,7 +548,7 @@ extends:
552548
jobDisplayName: "Build: Linux Musl ARM64"
553549
agentOs: Linux
554550
useHostedUbuntu: false
555-
container: mariner20CrossArm64Alpine
551+
container: azureLinux30Net8BuildAmd64
556552
buildArgs:
557553
--arch arm64
558554
--os-name linux-musl

‎eng/Baseline.Designer.props‎

Lines changed: 237 additions & 237 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml‎

Lines changed: 106 additions & 106 deletions
Large diffs are not rendered by default.

‎eng/Version.Details.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@
189189
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
190190
<Sha>d8ee7c837b53a52795d374c694ff2c72b62bcef0</Sha>
191191
</Dependency>
192-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25060.2">
192+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25104.1">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
194-
<Sha>c7cb4da26e74ef645e3e98fcb4534a7d66247a82</Sha>
194+
<Sha>dc30cd1ec22f198d658e011c14525d4d65873991</Sha>
195195
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
196196
</Dependency>
197197
<Dependency Name="Microsoft.SourceBuild.Intermediate.symreader" Version="2.0.0-beta-23228-03">
@@ -338,9 +338,9 @@
338338
<Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
339339
<SourceBuild RepoName="xdt" ManagedOnly="true" />
340340
</Dependency>
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25081.5">
342342
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
343-
<Sha>f9542c50beaefc38dd9d7ec9ea38d54fd154f21a</Sha>
343+
<Sha>d73fc552386797322e84fa9b2ef5eaa5369de83c</Sha>
344344
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
345345
</Dependency>
346346
<!-- Not updated automatically -->

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AspNetCorePatchVersion>14</AspNetCorePatchVersion>
1212
<PreReleaseVersionIteration>
1313
</PreReleaseVersionIteration>
14-
<ValidateBaseline>false</ValidateBaseline>
14+
<ValidateBaseline>true</ValidateBaseline>
1515
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' != 'true'">7.1.2</IdentityModelVersion>
1616
<IdentityModelVersion Condition="'$(IsIdentityModelTestJob)' == 'true'">7.*</IdentityModelVersion>
1717
<!--
@@ -166,9 +166,9 @@
166166
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25060.1</MicrosoftDotNetBuildTasksTemplatingVersion>
167167
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25060.1</MicrosoftDotNetRemoteExecutorVersion>
168168
<!-- Packages from dotnet/source-build-externals -->
169-
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25060.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
169+
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.25104.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
170170
<!-- Packages from dotnet/source-build-reference-packages -->
171-
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25060.2</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
171+
<MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.25081.5</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
172172
<!-- Packages from dotnet/symreader -->
173173
<MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
174174
<!-- Packages from dotnet/runtime -->

‎eng/common/templates/steps/source-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ steps:
4444
# in the default public locations.
4545
internalRuntimeDownloadArgs=
4646
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
47-
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
47+
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
4848
fi
4949
5050
buildConfig=Release

‎eng/scripts/InstallJdk.ps1‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ $installDir = "$repoRoot\.tools\jdk\win-x64\"
2222
$javacExe = "$installDir\bin\javac.exe"
2323
$tempDir = "$repoRoot\obj"
2424
if (-not $JdkVersion) {
25-
$globalJson = Get-Content "$repoRoot\global.json" | ConvertFrom-Json
26-
$JdkVersion = $globalJson.'native-tools'.jdk
25+
$JdkVersion = "11.0.24"
2726
}
2827

2928
if (Test-Path $javacExe) {

‎eng/targets/Helix.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<!-- aspnetcore-quarantined-pr (quarantined-pr.yml) -->
3030
<ItemGroup>
3131
<HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
32-
<HelixAvailableTargetQueue Include="OSX.13.Amd64.Open" Platform="OSX" />
32+
<HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />
3333
<HelixAvailableTargetQueue Include="Windows.11.Amd64.Client.Open" Platform="Windows" />
3434
<HelixAvailableTargetQueue Include="Windows.Amd64.VS2022.Pre.Open" Platform="Windows" />
3535
</ItemGroup>

‎eng/targets/Helix.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
1818
<SkipHelixQueues>
1919
$(HelixQueueAlmaLinux8);
20-
$(HelixQueueAlpine316);
20+
$(HelixQueueAlpine318);
2121
$(HelixQueueDebian12);
2222
$(HelixQueueFedora40);
2323
$(HelixQueueMariner);

0 commit comments

Comments
 (0)