diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 7c0094f6ba..61a96f9002 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 182735bcf6..ad4c897950 100644
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@@ -201,7 +201,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/NuGet.config b/NuGet.config
index c8bd4d7c78..20b03e4136 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -7,17 +7,22 @@
+
+
+
+
+
@@ -37,11 +42,15 @@
+
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 9328d9f2ce..ecbc2a215e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -5,46 +5,46 @@
Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos.
The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal.
-->
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 04094d116496e0bd1d376fd346397ec7900141f8
+ dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 04094d116496e0bd1d376fd346397ec7900141f8
+ dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 04094d116496e0bd1d376fd346397ec7900141f8
+ dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- 04094d116496e0bd1d376fd346397ec7900141f8
+ dda23bbe00c4a4bfdd3732783f0cce37c11a4f40
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
@@ -52,55 +52,55 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- 8486d31e24f30e3fa1809a95699a0adc16f448d7
+ c9e3996173cec136bc2e9f3b4ec45f2a323b1d63
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 88e8f6129d6e8bb551a121f7969a5e0f33eb6881
+ ecfb8a05aeaa93057ae0003d406280239b2c4c7b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 88e8f6129d6e8bb551a121f7969a5e0f33eb6881
+ ecfb8a05aeaa93057ae0003d406280239b2c4c7b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 88e8f6129d6e8bb551a121f7969a5e0f33eb6881
+ ecfb8a05aeaa93057ae0003d406280239b2c4c7b
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- 88e8f6129d6e8bb551a121f7969a5e0f33eb6881
+ ecfb8a05aeaa93057ae0003d406280239b2c4c7b
https://github.com/dotnet/test-templates
@@ -124,13 +124,13 @@
1e5f3603af2277910aad946736ee23283e7f3e16
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- 41a4bd690229661e3ec74276ce3f93863b22435b
+ 6c37c986b6c8fc0669b38a03a03445a75b8227a6
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- ebbf01f54996755566db36e2e962ba6364da2ecc
+ b5af29a8f41f880f38fd015c6bcb7aeb816fcef6
https://github.com/dotnet/fsharp
@@ -146,9 +146,9 @@
aa59400b11e1aeee2e8af48928dbd48748a8bef9
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- 2d7eea252964e69be94cb9c847b371b23e4dd470
+ 087e15321bb712ef6fe8b0ba6f8bd12facf92629
https://github.com/dotnet/roslyn
@@ -159,6 +159,11 @@
https://github.com/dotnet/msbuild
b5265ef370a651f8c3458110b804e5cbf869eeb5
+
+ https://github.com/dotnet/msbuild
+ b5265ef370a651f8c3458110b804e5cbf869eeb5
+
+
https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted
550277e0616e549446f03fda35d3e23dff75dc01
@@ -168,18 +173,18 @@
https://github.com/Microsoft/ApplicationInsights-dotnet
53b80940842204f78708a538628288ff5d741a1d
-
+
https://github.com/dotnet/emsdk
- 08a90ca2c88b17f1b5d081318354a41db0882cff
+ 71359b18c2d83c01a68bf155244a65962a7e8c8e
https://dev.azure.com/dnceng/internal/_git/dotnet-aspire
48e42f59d64d84b404e904996a9ed61f2a17a569
-
+
https://github.com/dotnet/emsdk
- 08a90ca2c88b17f1b5d081318354a41db0882cff
+ 71359b18c2d83c01a68bf155244a65962a7e8c8e
diff --git a/eng/Versions.props b/eng/Versions.props
index add1322a08..19af3b257e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -48,11 +48,11 @@
- 8.0.4-servicing.24169.11
+ 8.0.5-servicing.24217.4
- 8.0.4-servicing.24169.10
+ 8.0.5-servicing.24217.2
@@ -66,22 +66,22 @@
- 8.0.4
- 8.0.4
- 8.0.4-servicing.24170.14
- 8.0.4-servicing.24170.14
- 8.0.4-servicing.24170.14
- 8.0.4-servicing.24170.14
- 8.0.4-servicing.24170.14
+ 8.0.5
+ 8.0.5
+ 8.0.5-servicing.24224.4
+ 8.0.5-servicing.24224.4
+ 8.0.5-servicing.24224.4
+ 8.0.5-servicing.24224.4
+ 8.0.5-servicing.24224.4
0.2.0
- 8.0.104
- 8.0.104-servicing.24170.24
- 8.0.104-servicing.24170.24
+ 8.0.105
+ 8.0.105-servicing.24224.15
+ 8.0.105-servicing.24224.15
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
$(MicrosoftNETSdkPackageVersion)
@@ -92,24 +92,24 @@
- 8.0.4-servicing.24169.9
+ 8.0.5-servicing.24216.15
- 8.0.4-servicing.24169.9
- 8.0.4-servicing.24169.9
- 8.0.4
- 8.0.4
- 8.0.4
- 8.0.4
+ 8.0.5-servicing.24216.15
+ 8.0.5-servicing.24216.15
+ 8.0.5
+ 8.0.5
+ 8.0.5
+ 8.0.5
2.1.0
- 8.0.4-servicing.24169.24
- 8.0.4-servicing.24169.24
- 8.0.4
- 8.0.4
+ 8.0.5-servicing.24217.5
+ 8.0.5-servicing.24217.5
+ 8.0.5
+ 8.0.5
@@ -213,7 +213,7 @@
14.0.8478
17.0.8478
- 8.0.4
+ 8.0.5
$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion)
8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`))
diff --git a/eng/pipelines/vmr-build-internal.yml b/eng/pipelines/vmr-build-internal.yml
index 85e8fe313f..a28dd253fb 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/patches/runtime/0002-Update-MSBuild-dependencies.patch b/src/SourceBuild/patches/runtime/0002-Update-MSBuild-dependencies.patch
new file mode 100644
index 0000000000..267e455462
--- /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 @@
+
+
+
+-
+-
+-
+
+
+