diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 9d7eb72c8..07645f529 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -63,8 +63,8 @@ extends:
template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines
parameters:
containers:
- fedora38:
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
+ fedora39:
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
sdl:
sourceAnalysisPool:
name: $(DncEngInternalBuildPool)
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
index 7cba0c4ea..d9df2e4e5 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml
@@ -2,7 +2,7 @@
jobs:
- job: Source_Build_Create_Tarball
- container: fedora38
+ container: fedora39
displayName: Source-Build Create Tarball
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
index 1474bec5f..dde2f3a8e 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build-pr.yml
@@ -12,9 +12,8 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
- debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
- fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
- ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
+ fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
+ ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
@@ -64,20 +63,13 @@ jobs:
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true
_RunOnline: false
- Fedora38-Offline:
+ Fedora39-Offline:
_BootstrapPrep: false
- _Container: ${{ parameters.fedora38Container }}
+ _Container: ${{ parameters.fedora39Container }}
_EnablePoison: true
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
_RunOnline: false
- Ubuntu1804-Offline:
- _BootstrapPrep: false
- _Container: ${{ parameters.ubuntu1804Container }}
- _EnablePoison: false
- _ExcludeOmniSharpTests: false
- _OverrideDistroDisablingSha1: false
- _RunOnline: false
name: Build_Tarball_x64
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
@@ -95,9 +87,9 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
- Debian11-Offline:
+ Ubuntu2004-Offline:
_BootstrapPrep: true
- _Container: ${{ parameters.debian11Arm64Container }}
+ _Container: ${{ parameters.ubuntu2004Arm64Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
@@ -116,9 +108,9 @@ jobs:
excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
- Fedora38-Offline:
- _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts
- _Container: ${{ parameters.fedora38Container }}
+ Fedora39-Offline:
+ _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
+ _Container: ${{ parameters.fedora39Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
index 78cde5475..b52bdf80c 100644
--- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
+++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml
@@ -12,9 +12,8 @@ parameters:
alpine317Container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.17
centOS7Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-source-build
centOSStream9Container: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
- debian11Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-arm64v8
- fedora38Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-38
- ubuntu1804Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
+ fedora39Container: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
+ ubuntu2004Arm64Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-arm64
poolInternalAmd64:
name: NetCore1ESPool-Svc-Internal
image: 1es-ubuntu-2004
@@ -70,20 +69,13 @@ jobs:
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: true
_RunOnline: false
- Fedora38-Offline:
+ Fedora39-Offline:
_BootstrapPrep: false
- _Container: ${{ parameters.fedora38Container }}
+ _Container: ${{ parameters.fedora39Container }}
_EnablePoison: true
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
_RunOnline: false
- Ubuntu1804-Offline:
- _BootstrapPrep: false
- _Container: ${{ parameters.ubuntu1804Container }}
- _EnablePoison: false
- _ExcludeOmniSharpTests: false
- _OverrideDistroDisablingSha1: false
- _RunOnline: false
name: Build_Tarball_x64
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
@@ -101,9 +93,9 @@ jobs:
dependsOn: ${{ parameters.dependsOn }}
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
- Debian11-Offline:
+ Ubuntu2004-Offline:
_BootstrapPrep: true
- _Container: ${{ parameters.debian11Arm64Container }}
+ _Container: ${{ parameters.ubuntu2004Arm64Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
@@ -122,9 +114,9 @@ jobs:
excludeSdkContentTests: true
installerBuildResourceId: ${{ parameters.installerBuildResourceId }}
matrix:
- Fedora38-Offline:
- _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora38-Offline_Artifacts
- _Container: ${{ parameters.fedora38Container }}
+ Fedora39-Offline:
+ _PreviousSourceBuildArtifact: Build_Tarball_x64 Fedora39-Offline_Artifacts
+ _Container: ${{ parameters.fedora39Container }}
_EnablePoison: false
_ExcludeOmniSharpTests: false
_OverrideDistroDisablingSha1: false
diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml
index 9130b7552..b6e0caaa4 100644
--- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml
+++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml
@@ -37,9 +37,9 @@ extends:
architecture: x64
excludeSdkContentTests: true
matrix:
- Ubuntu1804-Offline:
+ Ubuntu2004-Offline:
_BootstrapPrep: false
- _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04
+ _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04
_EnablePoison: false
_ExcludeOmniSharpTests: false
_RunOnline: false
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
index 537b03e4f..6d3d215c4 100644
--- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
+++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff
@@ -14,7 +14,20 @@ index ------------
./packs/Microsoft.AspNetCore.App.Ref/
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/
@@ ------------ @@
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml
+ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll
./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml
-./packs/Microsoft.NETCore.App.Host.portable-rid/
@@ -29,6 +42,10 @@ index ------------
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h
-./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll
++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml
+./packs/Microsoft.NETCore.App.Host.banana-rid/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/
+./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/
diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
index 56f3b8d1c..5bf77d895 100644
--- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
+++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/PoisonUsage.txt
@@ -107,6 +107,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -119,6 +125,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -251,12 +263,30 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -269,6 +299,18 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -317,6 +359,24 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -491,12 +551,24 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -509,6 +581,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -911,6 +989,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -923,6 +1007,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -935,6 +1025,12 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute
@@ -1259,6 +1355,24 @@
AssemblyAttribute
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
+
+ AssemblyAttribute
+
AssemblyAttribute