diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 14cbc101e..9efb421fd 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -65,7 +65,7 @@ extends:
ubuntu2204:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
mariner20CrossArm:
- image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
+ image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
ubuntu2204DebPkg:
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
sdl:
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
index ba1bb5f01..3df1cf509 100644
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@@ -203,7 +203,7 @@ stages:
parameters:
agentOs: Linux
jobName: Build_Linux_musl_Release_arm
- container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm'
+ container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine'
buildConfiguration: Release
buildArchitecture: arm
runtimeIdentifier: 'linux-musl-arm'
diff --git a/eng/pipelines/vmr-build-internal.yml b/eng/pipelines/vmr-build-internal.yml
index 85e8fe313..a28dd253f 100644
--- a/eng/pipelines/vmr-build-internal.yml
+++ b/eng/pipelines/vmr-build-internal.yml
@@ -23,7 +23,7 @@ variables:
value: ${{ replace(parameters.vmrBranch, ' ', '') }}
- ${{ else }}:
- name: VmrBranch
- value: release/8.0.1xx
+ value: internal/release/8.0.1xx
resources:
repositories:
diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props
index 384c27bc6..fec86482b 100644
--- 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.
-->
- https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.104-servicing.24171.1.centos.8-x64.tar.gz
- https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.104-centos.8-x64.tar.gz
+ https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.105-servicing.24224.1.centos.8-x64.tar.gz
+ https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.105-centos.8-x64.tar.gz
diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json
index 99d15d703..c598d7514 100644
--- a/src/SourceBuild/content/global.json
+++ b/src/SourceBuild/content/global.json
@@ -1,6 +1,6 @@
{
"tools": {
- "dotnet": "8.0.104"
+ "dotnet": "8.0.105"
},
"msbuild-sdks": {
"Microsoft.Build.CentralPackageVersions": "2.0.1",
diff --git a/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch b/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch
new file mode 100644
index 000000000..267e45546
--- /dev/null
+++ b/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch
@@ -0,0 +1,79 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nikola Milosavljevic
+Date: Tue, 23 Apr 2024 01:55:17 +0000
+Subject: [PATCH] Update MSBuild dependencies
+
+Backport: https://github.com/dotnet/runtime/issues/101395
+---
+ eng/Version.Details.xml | 12 ++++++++++++
+ eng/Versions.props | 6 +++---
+ src/tasks/AotCompilerTask/MonoAOTCompiler.csproj | 1 -
+ src/tasks/WasmAppBuilder/WasmAppBuilder.csproj | 3 ---
+ 4 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
+index fe35dc0997e..b90337395f6 100644
+--- a/eng/Version.Details.xml
++++ b/eng/Version.Details.xml
+@@ -414,6 +414,18 @@
+ https://github.com/dotnet/msbuild
+ 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22
+
++
++ https://github.com/dotnet/msbuild
++ 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22
++
++
++ https://github.com/dotnet/msbuild
++ 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22
++
++
++ https://github.com/dotnet/msbuild
++ 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22
++
+
+ https://github.com/dotnet/msbuild
+ 195e7f5a3a8e51c37d83cd9e54cb99dc3fc69c22
+diff --git a/eng/Versions.props b/eng/Versions.props
+index f012e409095..bf16c6ee71f 100644
+--- a/eng/Versions.props
++++ b/eng/Versions.props
+@@ -173,9 +173,9 @@
+ 1.0.4-preview6.19326.1
+ 2.0.5
+ 17.8.3
+- $(MicrosoftBuildVersion)
+- $(MicrosoftBuildVersion)
+- $(MicrosoftBuildVersion)
++ 17.8.3
++ 17.8.3
++ 17.8.3
+ 6.2.4
+ 6.2.4
+ 7.0.412701
+diff --git a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
+index e76730b5aec..88ae0fb136c 100644
+--- a/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
++++ b/src/tasks/AotCompilerTask/MonoAOTCompiler.csproj
+@@ -14,7 +14,6 @@
+
+
+
+-
+
+
+
+diff --git a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
+index 34a51095986..d8c95954dd8 100644
+--- a/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
++++ b/src/tasks/WasmAppBuilder/WasmAppBuilder.csproj
+@@ -24,9 +24,6 @@
+
+
+
+-
+-
+-
+
+
+