Skip to content

Commit f4c62a2

Browse files
authored
Merge branch 'release/9.0.1xx' into manodasanW-patch-1
2 parents bf648e7 + 0009da1 commit f4c62a2

File tree

459 files changed

+6768
-3404
lines changed

Some content is hidden

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

459 files changed

+6768
-3404
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

CODEOWNERS

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
/test/dotnet-format.Tests @dotnet/roslyn-ide
103103

104104
# Area: VMR & SourceBuild
105-
/.devcontainer/ @dotnet/source-build-internal
106-
/eng/pipelines/ @dotnet/source-build-internal @dotnet/product-construction
107-
/eng/SourceBuild* @dotnet/source-build-internal
108-
/src/SourceBuild/ @dotnet/source-build-internal @dotnet/product-construction
105+
/.devcontainer/ @dotnet/source-build
106+
/eng/pipelines/ @dotnet/source-build @dotnet/product-construction
107+
/eng/SourceBuild* @dotnet/source-build
108+
/src/SourceBuild/ @dotnet/source-build @dotnet/product-construction
109109
/src/VirtualMonoRepo/ @dotnet/product-construction

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<!-- Begin: Package sources from dotnet-aspnetcore -->
1111
<!-- End: Package sources from dotnet-aspnetcore -->
1212
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
13-
<add key="darc-pub-DotNet-msbuild-Trusted-95c7bf0-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-95c7bf01-1/nuget/v3/index.json" />
13+
<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" />
1414
<!-- End: Package sources from DotNet-msbuild-Trusted -->
1515
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
1616
<!-- End: Package sources from dotnet-roslyn-analyzers -->

0 commit comments

Comments
 (0)