huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[blazor-wasm] Update dependencies from dotnet/arcade dotnet/blazor (#20972) 

* Update dependencies from https://github.com/dotnet/blazor build 20200417.2

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-rc1.20217.1 -> 3.2.0-rc1.20217.2

* Update dependencies from https://github.com/dotnet/blazor build 20200418.1

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-rc1.20217.1 -> 3.2.0-rc1.20218.1

* Update dependencies from https://github.com/dotnet/arcade build 20200418.1

- Microsoft.DotNet.Arcade.Sdk: 1.0.0-beta.20208.8 -> 1.0.0-beta.20218.1
- Microsoft.DotNet.GenAPI: 1.0.0-beta.20208.8 -> 1.0.0-beta.20218.1
- Microsoft.DotNet.Helix.Sdk: 2.0.0-beta.20208.8 -> 2.0.0-beta.20218.1

* Update dependencies from https://github.com/dotnet/blazor build 20200420.1

- Microsoft.AspNetCore.Components.WebAssembly.Runtime: 3.2.0-rc1.20217.1 -> 3.2.0-rc1.20220.1

* Update to BROWSER RID

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Pranav K <prkrishn@hotmail.com>
This commit is contained in:
dotnet-maestro[bot] 2020-04-21 20:19:04 +00:00 committed by GitHub
parent 2612ec89b2
commit b8f7dde377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eng/Version.Details.xml
View File

@ -9,9 +9,9 @@
-->
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="3.2.0-rc1.20217.1">
<Dependency Name="Microsoft.AspNetCore.Components.WebAssembly.Runtime" Version="3.2.0-rc1.20220.1">
<Uri>https://github.com/dotnet/blazor</Uri>
<Sha>4008d90a1ff3146c3452de3985f7998bcbf857ff</Sha>
<Sha>4d92695415b066a06a233b462d276f2f3e789354</Sha>
</Dependency>
<Dependency Name="System.Net.Http.Json" Version="3.2.0-rc1.20217.1">
<Uri>https://github.com/dotnet/corefx</Uri>
@ -19,17 +19,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20208.8">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.20218.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
<Sha>b16cd6899775d52db4d4ac255908853bf4ee8833</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20208.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.20218.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
<Sha>b16cd6899775d52db4d4ac255908853bf4ee8833</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20208.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.20218.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0554dd21ef58e0ad23ad20388d05f11ab6cf3fa7</Sha>
<Sha>b16cd6899775d52db4d4ac255908853bf4ee8833</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

4
eng/Versions.props
View File

@ -59,7 +59,7 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20208.8</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.20218.1</MicrosoftDotNetGenAPIPackageVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/core-setup -->
@ -96,7 +96,7 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>3.1.0</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from aspnet/Blazor -->
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0-rc1.20217.1</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0-rc1.20220.1</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.1.3-servicing.20128.2</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.1.3-servicing.20128.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>

4
global.json
View File

@ -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"
}
}

2
src/Components/WebAssembly/testassets/MonoSanityClient/Examples.cs
View File

@ -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"))}'";
}
}

2
src/Components/test/E2ETest/Tests/MonoSanityTest.cs
View File

@ -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"));
}

2
src/Components/test/testassets/BasicTestApp/InteropComponent.razor
View File

@ -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<string> { Value = "Initial value" };