Merge pull request #106301 from carlossanlop/release/8.0-staging

[manual] Merge release/8.0-staging into release/8.0
dotnet · Aug 13, 2024 · b379c7b · b379c7b
2 parents 62f69f1 + ecefd44
commit b379c7b
Show file tree

Hide file tree

Showing 94 changed files with 1,228 additions and 331 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -10,6 +10,16 @@
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-emsdk -->
     <add key="darc-pub-dotnet-emsdk-2674f58" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2674f580/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-9/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-8/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-7/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-6/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-5/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-4/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-3/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-emsdk-e92f92e-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-e92f92ef-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-sdk -->
     <!--  End: Package sources from dotnet-sdk -->

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -99,14 +99,14 @@
       <Sha>2674f580a4b1d27322914df8488498065e71a3f2</Sha>
       <SourceBuild RepoName="emsdk" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24257.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.24372.3">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
-      <Sha>6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb</Sha>
+      <Sha>30ed464acd37779c64e9dc652d4460543ebf9966</Sha>
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24269.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.24379.1">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>4f2151df120194f0268944f1b723c14820738fc8</Sha>
+      <Sha>fb970eccb0a9cae3092464e29cbabda0d4115049</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
@@ -185,57 +185,57 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>c9efa535175049eb9cba06cae1f8c3d5dbe768a9</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Data.Common.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Drawing.Common.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Formats.Tar.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.IO.Compression.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.IO.Packaging.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Net.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Net.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Private.Runtime.UnicodeData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Runtime.TimeZoneData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Text.RegularExpressions.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Windows.Extensions.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24270.1">
+    <Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
     <Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="16.0.5-alpha.1.23566.1" CoherentParentDependency="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100">
       <Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -354,13 +354,13 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
       <Sha>67613417f5e1af250e6ddfba79f8f2885d8e90fb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24365.1">
+    <Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="8.0.0-alpha.0.24402.1">
       <Uri>https://github.com/dotnet/hotreload-utils</Uri>
-      <Sha>9fd9805b21b21e16d1c81f0ffabd6ee81fe3e8a2</Sha>
+      <Sha>907017dae648b642c122f9a34573bd88ea0d9730</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24270.1">
+    <Dependency Name="System.Runtime.Numerics.TestData" Version="8.0.0-beta.24362.2">
       <Uri>https://github.com/dotnet/runtime-assets</Uri>
-      <Sha>20ef600733c107d19f57de4955dfb025d39b99e3</Sha>
+      <Sha>50994571d2f8b4b689c7a0b96c96356fc444b406</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.8.0-7.23566.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -145,20 +145,20 @@
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
     <runtimenativeSystemIOPortsVersion>8.0.0-rc.1.23406.6</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
-    <SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24270.1</SystemRuntimeNumericsTestDataVersion>
-    <SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24270.1</SystemComponentModelTypeConverterTestDataVersion>
-    <SystemDataCommonTestDataVersion>8.0.0-beta.24270.1</SystemDataCommonTestDataVersion>
-    <SystemDrawingCommonTestDataVersion>8.0.0-beta.24270.1</SystemDrawingCommonTestDataVersion>
-    <SystemFormatsTarTestDataVersion>8.0.0-beta.24270.1</SystemFormatsTarTestDataVersion>
-    <SystemIOCompressionTestDataVersion>8.0.0-beta.24270.1</SystemIOCompressionTestDataVersion>
-    <SystemIOPackagingTestDataVersion>8.0.0-beta.24270.1</SystemIOPackagingTestDataVersion>
-    <SystemNetTestDataVersion>8.0.0-beta.24270.1</SystemNetTestDataVersion>
-    <SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24270.1</SystemPrivateRuntimeUnicodeDataVersion>
-    <SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24270.1</SystemRuntimeTimeZoneDataVersion>
-    <SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24270.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
-    <SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24270.1</SystemTextRegularExpressionsTestDataVersion>
-    <SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24270.1</SystemWindowsExtensionsTestDataVersion>
-    <MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24270.1</MicrosoftDotNetCilStripSourcesVersion>
+    <SystemRuntimeNumericsTestDataVersion>8.0.0-beta.24362.2</SystemRuntimeNumericsTestDataVersion>
+    <SystemComponentModelTypeConverterTestDataVersion>8.0.0-beta.24362.2</SystemComponentModelTypeConverterTestDataVersion>
+    <SystemDataCommonTestDataVersion>8.0.0-beta.24362.2</SystemDataCommonTestDataVersion>
+    <SystemDrawingCommonTestDataVersion>8.0.0-beta.24362.2</SystemDrawingCommonTestDataVersion>
+    <SystemFormatsTarTestDataVersion>8.0.0-beta.24362.2</SystemFormatsTarTestDataVersion>
+    <SystemIOCompressionTestDataVersion>8.0.0-beta.24362.2</SystemIOCompressionTestDataVersion>
+    <SystemIOPackagingTestDataVersion>8.0.0-beta.24362.2</SystemIOPackagingTestDataVersion>
+    <SystemNetTestDataVersion>8.0.0-beta.24362.2</SystemNetTestDataVersion>
+    <SystemPrivateRuntimeUnicodeDataVersion>8.0.0-beta.24362.2</SystemPrivateRuntimeUnicodeDataVersion>
+    <SystemRuntimeTimeZoneDataVersion>8.0.0-beta.24362.2</SystemRuntimeTimeZoneDataVersion>
+    <SystemSecurityCryptographyX509CertificatesTestDataVersion>8.0.0-beta.24362.2</SystemSecurityCryptographyX509CertificatesTestDataVersion>
+    <SystemTextRegularExpressionsTestDataVersion>8.0.0-beta.24362.2</SystemTextRegularExpressionsTestDataVersion>
+    <SystemWindowsExtensionsTestDataVersion>8.0.0-beta.24362.2</SystemWindowsExtensionsTestDataVersion>
+    <MicrosoftDotNetCilStripSourcesVersion>8.0.0-beta.24362.2</MicrosoftDotNetCilStripSourcesVersion>
     <!-- dotnet-optimization dependencies -->
     <optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx64MIBCRuntimeVersion>
     <optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationwindows_ntx86MIBCRuntimeVersion>
@@ -188,7 +188,7 @@
     <MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
     <MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
     <MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.24229.2</MicrosoftDotNetXHarnessCLIVersion>
-    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24365.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
+    <MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>8.0.0-alpha.0.24402.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
     <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitAnalyzersVersion>1.0.0</XUnitAnalyzersVersion>
     <XUnitRunnerVisualStudioVersion>2.4.5</XUnitRunnerVisualStudioVersion>

diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml
@@ -48,7 +48,7 @@ jobs:
 
     # Android x64
     - ${{ if in(parameters.platform, 'android_x64') }}:
-      - Ubuntu.1804.Amd64.Android.29.Open
+      - Ubuntu.2004.Amd64.Android.29.Open
 
     # Browser wasm
     - ${{ if eq(parameters.platform, 'browser_wasm') }}:
@@ -74,28 +74,28 @@ jobs:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
         - (Ubuntu.2204.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - (Ubuntu.1804.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8
+        - (Ubuntu.2204.Arm64)[email protected]/dotnet-buildtools/prereqs:ubuntu-22.04-helix-arm64v8
 
     # Linux musl x64
     - ${{ if eq(parameters.platform, 'linux_musl_x64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - (Alpine.317.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-amd64
+        - (Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - (Alpine.319.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-amd64
+        - (Alpine.318.Amd64)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64
 
     # Linux musl arm32
     - ${{ if eq(parameters.platform, 'linux_musl_arm') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - (Alpine.317.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm32v7
+        - (Alpine.318.Arm32.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - (Alpine.319.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm32v7
+        - (Alpine.318.Arm32)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm32v7
 
     # Linux musl arm64
     - ${{ if eq(parameters.platform, 'linux_musl_arm64') }}:
       - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-        - (Alpine.317.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.17-helix-arm64v8
+        - (Alpine.318.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
       - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-        - (Alpine.319.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.19-helix-arm64v8
+        - (Alpine.318.Arm64)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-arm64v8
 
     # Linux x64
     - ${{ if eq(parameters.platform, 'linux_x64') }}:

diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-other.yml
@@ -93,7 +93,7 @@ jobs:
       testGroup: innerloop
       isSingleFile: true
       nameSuffix: NativeAOT_Libs
-      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true
+      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false
       timeoutInMinutes: 300 # doesn't normally take this long, but I've seen Helix queues backed up for 160 minutes
       # extra steps, run tests
       extraStepsTemplate: /eng/pipelines/libraries/helix.yml
@@ -122,7 +122,7 @@ jobs:
       testGroup: innerloop
       isSingleFile: true
       nameSuffix: NativeAOT_Checked_Libs
-      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true
+      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:IlcUseServerGc=false
       timeoutInMinutes: 360
       # extra steps, run tests
       extraStepsTemplate: /eng/pipelines/libraries/helix.yml
@@ -151,7 +151,7 @@ jobs:
       testGroup: innerloop
       isSingleFile: true
       nameSuffix: NativeAOT_Checked_Libs_SizeOpt
-      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Size
+      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Size /p:IlcUseServerGc=false
       timeoutInMinutes: 240
       # extra steps, run tests
       extraStepsTemplate: /eng/pipelines/libraries/helix.yml
@@ -180,7 +180,7 @@ jobs:
       testGroup: innerloop
       isSingleFile: true
       nameSuffix: NativeAOT_Checked_Libs_SpeedOpt
-      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Speed
+      buildArgs: -s clr.aot+host.native+libs+libs.tests -c $(_BuildConfig) -rc Checked /p:TestNativeAot=true /p:ArchiveTests=true /p:OptimizationPreference=Speed /p:IlcUseServerGc=false
       timeoutInMinutes: 240
       # extra steps, run tests
       extraStepsTemplate: /eng/pipelines/libraries/helix.yml

diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
@@ -39,7 +39,7 @@ extends:
         timeoutInMinutes: 120
         pool:
           name: $(DncEngPublicBuildPool)
-          demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+          demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open
         steps:
         - bash: |
             cd $(enterpriseTestsSetup)