diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 650697bd1087..15ee12605f22 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -15,46 +15,46 @@
ed18af72023b6abf81d68840b0025b1d29e0dc33
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
@@ -63,14 +63,14 @@
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/emsdk
- 235d38cd586eeed59513cf865f4771914d654e4a
+ 11e2cd6f4b4bd65b10692fbdc17f597fa79793c8
-
+
https://github.com/dotnet/emsdk
- 235d38cd586eeed59513cf865f4771914d654e4a
+ 11e2cd6f4b4bd65b10692fbdc17f597fa79793c8
@@ -230,29 +230,29 @@
fc785088a28006c774dcfe0916b69ff54e6f99c1
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
https://github.com/dotnet/windowsdesktop
@@ -503,89 +503,89 @@
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
https://github.com/dotnet/aspnetcore
e991e92d9a0b886808d4b1d7c08f3ed2c9294945
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
@@ -619,9 +619,9 @@
45d845e04c05fbe5da9838c454bbc3af1df6be81
-
+
https://github.com/dotnet/runtime
- 20dc14622a3985fb4eac2b31194bf1c2a8c64680
+ 9482c1ed378dfde2f540b99cb99685396b3bd4c2
https://github.com/dotnet/arcade-services
diff --git a/eng/Versions.props b/eng/Versions.props
index aab103599fa0..c00949253768 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -104,43 +104,43 @@
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
8.0.0-rc.1.23414.4
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
2.1.0
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
- 10.0.0-alpha.1.24616.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
+ 10.0.0-alpha.1.24617.1
8.0.0
@@ -324,7 +324,7 @@
14.2.9714-net9-p6
17.2.9714-net9-p6
- 10.0.0-alpha.1.24575.2
+ 10.0.0-alpha.1.24613.1
$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion)
10.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`))
diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
index ffd1f6206670..c5222352b315 100644
--- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
+++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.InstallRecords.cs
@@ -69,9 +69,13 @@ protected List GetWorkloadSetRecords()
"Microsoft.NET.Workload.Emscripten.Current",
"Microsoft.NET.Workload.Emscripten.net6",
"Microsoft.NET.Workload.Emscripten.net7",
+ "Microsoft.NET.Workload.Emscripten.net8",
+ "Microsoft.NET.Workload.Emscripten.net9",
"Microsoft.NET.Workload.Mono.ToolChain.Current",
"Microsoft.NET.Workload.Mono.ToolChain.net6",
"Microsoft.NET.Workload.Mono.ToolChain.net7",
+ "Microsoft.NET.Workload.Mono.ToolChain.net8",
+ "Microsoft.NET.Workload.Mono.ToolChain.net9",
];
private static readonly IReadOnlyDictionary ManifestIdCasing = CasedManifestIds.ToDictionary(id => id.ToLowerInvariant()).AsReadOnly();
diff --git a/src/Installer/redist-installer/targets/BundledManifests.targets b/src/Installer/redist-installer/targets/BundledManifests.targets
index e0301c8b7480..a8e34fcbdbc6 100644
--- a/src/Installer/redist-installer/targets/BundledManifests.targets
+++ b/src/Installer/redist-installer/targets/BundledManifests.targets
@@ -13,9 +13,11 @@
+
+
@@ -60,7 +62,7 @@
+ Exclude="Microsoft.NET.Workload.Mono.ToolChain.Current;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Mono.ToolChain.net8;Microsoft.NET.Workload.Mono.ToolChain.net9;Microsoft.NET.Workload.Emscripten.Current;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7;Microsoft.NET.Workload.Emscripten.net8;Microsoft.NET.Workload.Emscripten.net9;Microsoft.NET.Sdk.Aspire">
$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))
diff --git a/src/Layout/redist/targets/OverlaySdkOnLKG.targets b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
index d7132776fa57..bad7bec58ac5 100644
--- a/src/Layout/redist/targets/OverlaySdkOnLKG.targets
+++ b/src/Layout/redist/targets/OverlaySdkOnLKG.targets
@@ -60,20 +60,19 @@
+ Lines="microsoft.net.sdk.android;microsoft.net.sdk.aspire;microsoft.net.sdk.ios;microsoft.net.sdk.maccatalyst;microsoft.net.sdk.macos;microsoft.net.sdk.maui;microsoft.net.sdk.tvos;microsoft.net.workload.mono.toolchain.current;microsoft.net.workload.emscripten.current;microsoft.net.workload.emscripten.net6;microsoft.net.workload.emscripten.net7;microsoft.net.workload.emscripten.net8;microsoft.net.workload.emscripten.net9;microsoft.net.workload.mono.toolchain.net6;microsoft.net.workload.mono.toolchain.net7;microsoft.net.workload.mono.toolchain.net8;microsoft.net.workload.mono.toolchain.net9"/>
+
-
-
+
+
-
-
-
+
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs
index f0a32830d6fa..95f8c7449e89 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/ShowMissingWorkloads.cs
@@ -19,7 +19,7 @@ public class ShowMissingWorkloads : TaskBase
{ "android", "android-aot", "ios", "maccatalyst", "macos", "maui", "maui-android",
"maui-desktop", "maui-ios", "maui-maccatalyst", "maui-mobile", "maui-windows", "tvos" };
private static readonly HashSet WasmWorkloadIds = new(StringComparer.OrdinalIgnoreCase)
- { "wasm-tools", "wasm-tools-net6", "wasm-tools-net7" };
+ { "wasm-tools", "wasm-tools-net6", "wasm-tools-net7", "wasm-tools-net8", "wasm-tools-net9" };
public ITaskItem[] MissingWorkloadPacks { get; set; }
diff --git a/test/Microsoft.NET.Build.Tests/WorkloadTests.cs b/test/Microsoft.NET.Build.Tests/WorkloadTests.cs
index 08d2f0424bb9..5b9a5262139d 100644
--- a/test/Microsoft.NET.Build.Tests/WorkloadTests.cs
+++ b/test/Microsoft.NET.Build.Tests/WorkloadTests.cs
@@ -229,13 +229,13 @@ public void It_should_import_aliased_pack()
.BeEquivalentTo("true");
}
- [Fact]
+ [Fact(Skip="https://github.com/dotnet/sdk/issues/45516")]
public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
{
var mainProject = new TestProject()
{
Name = "MainProject",
- TargetFrameworks = $"net9.0-android",
+ TargetFrameworks = $"{ToolsetInfo.CurrentTargetFramework}-android",
IsSdkProject = true,
IsExe = true
};
@@ -259,11 +259,11 @@ public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
.BeEquivalentTo("android");
}
- [Theory]
- [InlineData("net9.0-android;net9.0-ios", "net9.0-android;net9.0-ios", "android;ios")]
- [InlineData("net9.0", "net9.0;net9.0-android;net9.0-ios", "android;ios")]
- [InlineData("net9.0;net9.0-ios", "net9.0;net9.0-android", "android;ios")]
- [InlineData("net9.0", "net9.0", null)]
+ [Theory(Skip="https://github.com/dotnet/sdk/issues/45516")]
+ [InlineData($"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "android;ios")]
+ [InlineData(ToolsetInfo.CurrentTargetFramework, $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android;{ToolsetInfo.CurrentTargetFramework}-ios", "android;ios")]
+ [InlineData($"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-ios", $"{ToolsetInfo.CurrentTargetFramework};{ToolsetInfo.CurrentTargetFramework}-android", "android;ios")]
+ [InlineData(ToolsetInfo.CurrentTargetFramework, ToolsetInfo.CurrentTargetFramework, null)]
public void Given_multi_target_It_should_get_suggested_workload_by_GetRequiredWorkloads_target(string mainTfm, string referencingTfm, string expected)
{
// Skip Test if SDK is < 6.0.400
@@ -312,12 +312,6 @@ public void Given_multi_target_It_should_get_suggested_workload_by_GetRequiredWo
}
else
{
- // Conditionally check the OS and modify the expected workloads on Linux
- if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
- {
- expected = "android;wasi-experimental";
- }
-
getValuesCommand.GetValues()
.Should()
.Contain(expected.Split(";")); // there are extra workloads in certain platform, only assert contains