diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e57d05dc2..7e233cbe0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,9 +9,9 @@ --> - + https://github.com/dotnet/blazor - 4008d90a1ff3146c3452de3985f7998bcbf857ff + 4d92695415b066a06a233b462d276f2f3e789354 https://github.com/dotnet/corefx @@ -19,17 +19,17 @@ - + https://github.com/dotnet/arcade - 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 + b16cd6899775d52db4d4ac255908853bf4ee8833 - + https://github.com/dotnet/arcade - 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 + b16cd6899775d52db4d4ac255908853bf4ee8833 - + https://github.com/dotnet/arcade - 0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7 + b16cd6899775d52db4d4ac255908853bf4ee8833 diff --git a/eng/Versions.props b/eng/Versions.props index 1613900425..69a034bda4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -59,7 +59,7 @@ --> - 1.0.0-beta.20208.8 + 1.0.0-beta.20218.1 3.4.1-beta4-20127-10 @@ -96,7 +96,7 @@ 3.1.0 - 3.2.0-rc1.20217.1 + 3.2.0-rc1.20220.1 3.1.3-servicing.20128.2 3.1.3-servicing.20128.2 diff --git a/global.json b/global.json index 5d863a103f..9a2f9c3d39 100644 --- a/global.json +++ b/global.json @@ -25,7 +25,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.15.2", - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20208.8", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20208.8" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.20218.1", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.20218.1" } } diff --git a/src/Components/WebAssembly/testassets/MonoSanityClient/Examples.cs b/src/Components/WebAssembly/testassets/MonoSanityClient/Examples.cs index 1d56128e35..7bae673449 100644 --- a/src/Components/WebAssembly/testassets/MonoSanityClient/Examples.cs +++ b/src/Components/WebAssembly/testassets/MonoSanityClient/Examples.cs @@ -58,6 +58,6 @@ namespace MonoSanityClient public static string GetRuntimeInformation() => $"OSDescription: '{RuntimeInformation.OSDescription}';" + $" OSArchitecture: '{RuntimeInformation.OSArchitecture}';" - + $" IsOSPlatform(WEBASSEMBLY): '{RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY"))}'"; + + $" IsOSPlatform(BROWSER): '{RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))}'"; } } diff --git a/src/Components/test/E2ETest/Tests/MonoSanityTest.cs b/src/Components/test/E2ETest/Tests/MonoSanityTest.cs index b8db27fd2b..181a1f9974 100644 --- a/src/Components/test/E2ETest/Tests/MonoSanityTest.cs +++ b/src/Components/test/E2ETest/Tests/MonoSanityTest.cs @@ -137,7 +137,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests { Browser.FindElement(By.CssSelector("#getRuntimeInformation button")).Click(); Assert.Equal( - "OSDescription: 'web'; OSArchitecture: 'X86'; IsOSPlatform(WEBASSEMBLY): 'True'", + "OSDescription: 'web'; OSArchitecture: 'X86'; IsOSPlatform(BROWSER): 'True'", GetValue(Browser, "getRuntimeInformationResult")); } diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor index 0024d8bb75..9e2167b4b0 100644 --- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor +++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor @@ -67,7 +67,7 @@ public async Task InvokeInteropAsync() { - var shouldSupportSyncInterop = RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY")); + var shouldSupportSyncInterop = RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")); var testDTOTOPassByRef = new TestDTO(nonSerializedValue: 123); var instanceMethodsTarget = new JavaScriptInterop(); var genericType = new JavaScriptInterop.GenericType { Value = "Initial value" };