Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' #54008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsplaisted merged 19 commits into from
Apr 21, 2026
Merged

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx' #54008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0ed6e62
Enable NuGet Audit for security vulnerability scanning
Copilot Nov 7, 2025
aa16f09
Remove NuGet Audit TODO comments and configuration
marcpopMSFT Apr 3, 2026
0e03a9e
[release/8.0.4xx] Enable NuGet Audit for security vulnerability scann…
marcpopMSFT Apr 16, 2026
4a7d5be
Enable NuGet Audit for security vulnerability scanning
Copilot Nov 7, 2025
fc5d5f2
Remove NuGet Audit TODO comments and configuration
marcpopMSFT Apr 3, 2026
4c56fd7
Update dependencies from https://github.com/dotnet/source-build-exter…
dotnet-maestro[bot] Apr 17, 2026
55801ad
[release/8.0.4xx] Update dependencies from dotnet/source-build-extern…
DonnaChen888 Apr 17, 2026
cddda2e
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#53932)
DonnaChen888 Apr 17, 2026
68f1081
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Apr 17, 2026
2797529
Replace ubuntu22 VM and Helix images with Azure Linux 3 (#53931)
ellahathaway Apr 17, 2026
2de5190
[release/9.0.1xx] Update dependencies from dotnet/templating (#53941)
MiYanni Apr 17, 2026
ed18571
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Apr 18, 2026
5f1e525
[release/8.0.4xx] Update dependencies from dotnet/templating (#53983)
DonnaChen888 Apr 20, 2026
cf39b68
Reset files to release/9.0.1xx
github-actions[bot] Apr 20, 2026
4e41309
Merge branch 'release/9.0.1xx' into merge/release/8.0.4xx-to-release/…
DonnaChen888 Apr 20, 2026
c51a252
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#53986)
DonnaChen888 Apr 20, 2026
eb700d9
Update dependencies from https://github.com/dotnet/arcade build 20260…
dotnet-maestro[bot] Apr 21, 2026
b982448
[release/9.0.1xx] Update dependencies from dotnet/arcade (#54006)
DonnaChen888 Apr 21, 2026
ac083a5
Reset files to release/9.0.3xx
github-actions[bot] Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ extends:
parameters:
pool:
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204
image: build.azurelinux.3.amd64
os: linux
helixTargetQueue: ubuntu.2204.amd64
oneESCompat:
Expand Down
2 changes: 1 addition & 1 deletion .vsts-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ stages:
parameters:
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals build.ubuntu.2204.amd64.open
demands: ImageOverride -equals build.azurelinux.3.amd64.open
os: linux
helixTargetQueue: ubuntu.2204.amd64.open

Expand Down
10 changes: 5 additions & 5 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@

<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>

<!-- Enable NuGet Audit to check for security vulnerabilities -->
<NuGetAudit>true</NuGetAudit>
<NuGetAuditLevel>low</NuGetAuditLevel>
<NuGetAuditMode>all</NuGetAuditMode>
</PropertyGroup>

<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
Expand All @@ -65,11 +70,6 @@
<!-- <TestRunnerAdditionalArguments>-parallel none</TestRunnerAdditionalArguments> -->
</PropertyGroup>

<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/sdk/issues/51465 -->
<PropertyGroup>
<NuGetAudit>false</NuGetAudit>
</PropertyGroup>

<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
10 changes: 6 additions & 4 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,18 @@
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-324a351" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-324a351f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-07da1b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-07da1b9a/nuget/v3/index.json" />
<add key="darc-pub-DotNet-msbuild-Trusted-2a0eb78" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2a0eb78b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4250c83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4250c839/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-pub-dotnet-templating-7a3da72" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-7a3da726/nuget/v3/index.json" />
<add key="darc-pub-dotnet-templating-4d37977" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-4d37977d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-46c3072" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-46c3072d/nuget/v3/index.json" />
Expand All @@ -65,12 +67,12 @@
</packageSources>
<disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-324a351" value="true" />
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4250c83" value="true" />
Expand Down
228 changes: 97 additions & 131 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

95 changes: 48 additions & 47 deletions eng/Versions.props
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions eng/pipelines/templates/jobs/vmr-synchronization.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: $(DncEngPublicBuildPool)
image: 1es-ubuntu-2204-open
image: build.azurelinux.3.amd64.open
os: linux
${{ else }}:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-ubuntu-2204
demands: ImageOverride -equals build.azurelinux.3.amd64
os: linux

steps:
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/variables/vmr-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ variables:
- name: shortStackPoolName
value: NetCore-Public
- name: poolImage_Linux
value: build.ubuntu.2204.amd64.open
value: build.azurelinux.3.amd64.open
- name: poolImage_LinuxArm64
value: Mariner-2-Docker-ARM64
- name: poolName_LinuxArm64
Expand All @@ -102,7 +102,7 @@ variables:
- name: shortStackPoolName
value: $(DncEngInternalBuildPool)
- name: poolImage_Linux
value: build.ubuntu.2204.amd64
value: build.azurelinux.3.amd64
- name: poolImage_LinuxArm64
value: build.azurelinux.3.arm64
- name: poolName_LinuxArm64
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/eng/pipelines/source-build-sdk-diff-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ extends:
parameters:
pool:
name: NetCore1ESPool-Svc-Internal
image: 1es-ubuntu-2204
image: build.azurelinux.3.amd64
os: linux
sdl:
sourceAnalysisPool:
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/eng/pipelines/templates/stages/vmr-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ stages:
displayName: Tag & Scan
pool:
name: $(DncEngInternalBuildPool)
image: 1es-ubuntu-2204
image: build.azurelinux.3.amd64
os: linux

steps:
Expand Down
6 changes: 3 additions & 3 deletions src/SourceBuild/content/eng/pipelines/vmr-license-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ extends:
options: '--memory=20g'
pool:
name: NetCore1ESPool-Svc-Internal
image: 1es-ubuntu-2204
image: build.azurelinux.3.amd64
os: linux
sdl:
sourceAnalysisPool:
Expand Down Expand Up @@ -150,7 +150,7 @@ extends:
container: licenseScanContainer
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals 1es-ubuntu-2204
demands: ImageOverride -equals build.azurelinux.3.amd64
timeoutInMinutes: 420
strategy:
matrix: $[ dependencies.Setup.outputs['GetMatrix.matrix'] ]
Expand Down Expand Up @@ -224,7 +224,7 @@ extends:
condition: or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release'))
pool:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals 1es-ubuntu-2204
demands: ImageOverride -equals build.azurelinux.3.amd64
variables:
- template: /eng/pipelines/templates/variables/pipelines.yml@self
steps:
Expand Down
Loading