Skip to content

Commit 36ed9ca

Browse files
marcpopMSFTmarcpopMSFT
committed
Merge remote-tracking branch 'origin/release/9.0.1xx' into marcpopMSFT-prepforrelease
2 parents 95afe47 + 71ca554 commit 36ed9ca

File tree

123 files changed

+4487
-1944
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+4487
-1944
lines changed

‎.vsts-ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ variables:
3030
# Helix testing requires a token when internally run.
3131
# Variables used: HelixApiAccessToken
3232
- group: DotNet-HelixApi-Access
33+
- group: AzureDevOps-Artifact-Feeds-Pats
3334
# Allows Arcade to run a signed build by disabling post-build signing for release-branch builds or manual builds that are not running tests.
3435
- ${{ if and(eq(parameters.runTestBuild, false), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual'))) }}:
3536
- name: PostBuildSign
@@ -68,12 +69,10 @@ extends:
6869
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
6970
centosStream9:
7071
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
71-
debian11Amd64:
72-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
72+
debian12Amd64:
73+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
7374
fedora39:
7475
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
75-
ubuntu2204:
76-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
7776
mariner20CrossArm:
7877
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
7978
ubuntu2204DebPkg:
@@ -296,6 +295,7 @@ extends:
296295
############### SOURCE BUILD ###############
297296
- template: /eng/common/templates-official/job/source-build.yml@self
298297
parameters:
298+
enableInternalSources: true
299299
platform:
300300
name: Managed
301301
container: centosStream9
@@ -308,6 +308,7 @@ extends:
308308
parameters:
309309
oneESCompat:
310310
publishTaskPrefix: 1ES.
311+
runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
311312

312313
############### PUBLISH STAGE ###############
313314
- ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:

‎.vsts-pr.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ resources:
2020
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
2121
- container: centosStream9
2222
image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
23-
- container: debian11Amd64
24-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
23+
- container: debian12Amd64
24+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
2525
- container: fedora39
2626
image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
27-
- container: ubuntu2204
28-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
27+
- container: ubuntu2204DebPkg
28+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
2929

3030
stages:
3131
############### BUILD STAGE ###############
@@ -62,6 +62,7 @@ stages:
6262
############### SOURCE BUILD ###############
6363
- template: /eng/common/templates/job/source-build.yml
6464
parameters:
65+
enableInternalSources: true
6566
platform:
6667
name: Managed
6768
container: centosStream9

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,19 @@
77
<add key="darc-pub-dotnet-aspire-137e8dc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca/nuget/v3/index.json" />
88
<add key="darc-pub-dotnet-aspire-137e8dc-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspire-137e8dca-1/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-aspire -->
10+
<!-- Begin: Package sources from dotnet-emsdk -->
11+
<add key="darc-pub-dotnet-emsdk-8be5676" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-8be5676a/nuget/v3/index.json" />
12+
<!-- End: Package sources from dotnet-emsdk -->
1013
<!-- Begin: Package sources from dotnet-aspnetcore -->
14+
<add key="darc-pub-dotnet-aspnetcore-1e7a7af" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-1e7a7af6/nuget/v3/index.json" />
1115
<!-- End: Package sources from dotnet-aspnetcore -->
1216
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1317
<add key="darc-pub-DotNet-msbuild-Trusted-4ae11fa" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-4ae11fa8/nuget/v3/index.json" />
1418
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1519
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1620
<!-- End: Package sources from dotnet-roslyn-analyzers -->
1721
<!-- Begin: Package sources from dotnet-runtime -->
22+
<add key="darc-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/nuget/v3/index.json" />
1823
<add key="darc-int-dotnet-runtime-e77011b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3/nuget/v3/index.json" />
1924
<add key="darc-int-dotnet-runtime-e77011b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-5/nuget/v3/index.json" />
2025
<add key="darc-int-dotnet-runtime-e77011b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e77011b3-3/nuget/v3/index.json" />
@@ -24,6 +29,7 @@
2429
<!-- Begin: Package sources from dotnet-templating -->
2530
<!-- End: Package sources from dotnet-templating -->
2631
<!-- Begin: Package sources from dotnet-windowsdesktop -->
32+
<add key="darc-pub-dotnet-windowsdesktop-5307f2a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-windowsdesktop-5307f2ab/nuget/v3/index.json" />
2733
<!-- End: Package sources from dotnet-windowsdesktop -->
2834
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2935
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />

‎eng/ManualVersions.props

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,20 @@
99
Basically: In this file, choose the highest version when resolving merge conflicts.
1010
-->
1111
<PropertyGroup>
12-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.45</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.45</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.45</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.45</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.45</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.45</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.45</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19-
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.43</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20-
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.43</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21-
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.43</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22-
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.43</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23-
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.43</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24-
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.43</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25-
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.43</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
12+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
13+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
14+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
15+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
16+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
17+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
18+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
19+
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
20+
<MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
21+
<MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
22+
<MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
23+
<MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
24+
<MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
25+
<MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
2626
</PropertyGroup>
2727

2828
</Project>

0 commit comments

Comments
 (0)