diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd496198fe1d..02771f221860 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 74ed5fee860bc24b3b88902ccfccc89e52e678c7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 53288f87c588907e8ff01f129786820fe998573c + e7d444894e9573d02b91a07028304c260839d3f3 - + https://github.com/dotnet/emsdk - 53288f87c588907e8ff01f129786820fe998573c + e7d444894e9573d02b91a07028304c260839d3f3 @@ -222,25 +222,25 @@ b521aa2c9c981f53b85af7c923175a850986173a - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 https://github.com/dotnet/windowsdesktop @@ -491,29 +491,29 @@ - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 @@ -547,9 +547,9 @@ a62b4639193b96a1a848ccddaf9fe421c3d3f21b - + https://github.com/dotnet/runtime - 84b33395057737db3ea342a5151feb6b90c1b6f6 + 56d7e5d80ed6dd5e80ca8225ab689a60cae3cfc7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7904c93caaf6..baf6eb8dfb40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,12 +82,12 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24260.2 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24260.2 4.6.0 2.0.0-beta4.24209.3 0.4.0-alpha.24209.3 @@ -138,21 +138,21 @@ - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 8.0.0-rc.1.23414.4 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 2.1.0 @@ -185,9 +185,9 @@ - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 - 9.0.0-preview.5.24256.1 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 + 9.0.0-preview.5.24260.2 @@ -361,7 +361,7 @@ 14.2.9088-net9-p1 17.2.9088-net9-p1 - 9.0.0-preview.5.24223.2 + 9.0.0-preview.5.24252.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index e379569f23b4..ecf4c5b1a2e4 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -35,7 +35,7 @@ variables: - name: androidCrossContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-android-amd64 - name: browserCrossContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly-20230917141449-2aaa02c + value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly - name: wasiCrossContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-webassembly diff --git a/src/WasmSdk/Sdk/Sdk.targets b/src/WasmSdk/Sdk/Sdk.targets index 67cc54176997..b2d612736773 100644 --- a/src/WasmSdk/Sdk/Sdk.targets +++ b/src/WasmSdk/Sdk/Sdk.targets @@ -21,5 +21,9 @@ Copyright (c) .NET Foundation. All rights reserved. This will go away once the wasm build is updated to do this directly. --> + + <_TempWasmWorkaroundsDisabled>true + +