[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20239)

dotnet · Nov 15, 2024 · 4d52c9f · 4d52c9f
2 parents 5e6d6bb + 6119725
commit 4d52c9f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
@@ -15,6 +15,11 @@
     <UsagePattern IdentityGlob="Microsoft.Build*/17.10.4" />
     <UsagePattern IdentityGlob="Microsoft.NET.StringTools/17.10.4" />
 
+    <!-- These emsdk packages are allowed for installer repo build. The live version will be flowed in for the VMR build. -->
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net6.Manifest-8.0.100/8.0.*" />
+    <UsagePattern IdentityGlob="Microsoft.NET.Workload.Emscripten.net7.Manifest-8.0.100/8.0.*" />
+
     <!-- These are coming in via runtime but the source-build infra isn't able to automatically pick up the right intermediate. -->
     <UsagePattern IdentityGlob="Microsoft.NETCore.App.Crossgen2.linux-x64/*8.0.*" />
 

diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
@@ -30,7 +30,7 @@
       These URLs can't be composed from their base URL and version as we read them from the
       prep.sh and pipeline scripts, outside of MSBuild.
     -->
-    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.110-servicing.24474.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
-    <PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.110-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
+    <PrivateSourceBuiltArtifactsUrl>https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.111-servicing.24523.1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl>
+    <PrivateSourceBuiltSdkUrl>https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.111-centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl>
   </PropertyGroup>
 </Project>
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
@@ -1,12 +1,12 @@
 {
   "tools": {
-    "dotnet": "8.0.110"
+    "dotnet": "8.0.111"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
     "Microsoft.Build.Traversal": "2.0.2",
     "Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01",
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3",
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1",
     "Yarn.MSBuild": "1.15.2"
   }
 }