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

Rename WebAssembly.JSInterop -> Microsoft.JSInterop.WebAssembly

This commit is contained in:
Pranav K 2020-03-10 13:42:35 -07:00
parent 6833facda4
commit a0c76e5a4c
No known key found for this signature in database
GPG Key ID: F748807460A27E91
10 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
eng/ProjectReferences.props
View File

@ -5,13 +5,14 @@
-->
<Project>
<ItemGroup>
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Build" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Build\src\Microsoft.AspNetCore.Components.WebAssembly.Build.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.HttpClient" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj" />
<ProjectReferenceProvider Include="WebAssembly.JSInterop" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\WebAssembly.JSInterop.csproj" />
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Validation\src\Microsoft.AspNetCore.Components.DataAnnotations.Validation.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
<ProjectReferenceProvider Include="Microsoft.Authentication.WebAssembly.Msal" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Authentication.Msal\src\Microsoft.Authentication.WebAssembly.Msal.csproj" />
<ProjectReferenceProvider Include="Wasm.Performance.Driver" ProjectPath="$(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\Driver\Wasm.Performance.Driver.csproj" RefProjectPath="$(RepoRoot)src\Components\benchmarkapps\Wasm.Performance\ref\Wasm.Performance.Driver.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" RefProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\ref\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
</ItemGroup>
</Project>

2
src/Components/Blazor.sln
View File

@ -47,7 +47,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebAssembly.JSInterop", "WebAssembly.JSInterop", "{37FA056D-A7B3-4F72-A8B9-8D3C175E831E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebAssembly.JSInterop", "WebAssembly\JSInterop\src\WebAssembly.JSInterop.csproj", "{FBD7C733-200E-4BED-8B31-2610C2263F72}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebAssembly.JSInterop", "WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj", "{FBD7C733-200E-4BED-8B31-2610C2263F72}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{7920B09F-8016-49CF-A229-E72D0CECDD17}"
EndProject

4
src/Components/WebAssembly/Build/test/RuntimeDependenciesResolverTest.cs
View File

@ -56,6 +56,8 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
"Microsoft.Extensions.Logging.Abstractions.dll",
"Microsoft.Extensions.Primitives.dll",
"Microsoft.JSInterop.dll",
"Microsoft.JSInterop.WebAssembly.dll",
"Microsoft.JSInterop.WebAssembly.pdb",
"Mono.Security.dll",
"mscorlib.dll",
"netstandard.dll",
@ -86,8 +88,6 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
"System.Xml.dll",
"System.Xml.Linq.dll",
"WebAssembly.Bindings.dll",
"WebAssembly.JSInterop.dll",
"WebAssembly.JSInterop.pdb",
"WebAssembly.Net.Http.dll",
"WebAssembly.Net.WebSockets.dll",
}.OrderBy(i => i, StringComparer.Ordinal)

3
src/Components/WebAssembly/JSInterop/src/InternalCalls.cs
View File

@ -7,12 +7,13 @@ namespace WebAssembly.JSInterop
{
/// <summary>
/// Methods that map to the functions compiled into the Mono WebAssembly runtime,
/// as defined by 'mono_add_internal_call' calls in driver.c
/// as defined by 'mono_add_internal_call' calls in driver.c.
/// </summary>
internal static class InternalCalls
{
// The exact namespace, type, and method names must match the corresponding entries
// in driver.c in the Mono distribution
/// See: https://github.com/mono/mono/blob/90574987940959fe386008a850982ea18236a533/sdks/wasm/src/driver.c#L318-L319
// We're passing asyncHandle by ref not because we want it to be writable, but so it gets
// passed as a pointer (4 bytes). We can pass 4-byte values, but not 8-byte ones.

0
src/Components/WebAssembly/JSInterop/src/WebAssembly.JSInterop.csproj → src/Components/WebAssembly/JSInterop/src/Microsoft.JSInterop.WebAssembly.csproj
View File

4
src/Components/WebAssembly/JSInterop/src/WebAssemblyJSRuntime.cs
View File

@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Text.Json;
using Microsoft.JSInterop;
using Microsoft.JSInterop.Infrastructure;
using WebAssembly.JSInterop;
namespace WebAssembly.JSInterop
namespace Microsoft.JSInterop.WebAssembly
{
/// <summary>
/// Provides methods for invoking JavaScript functions for applications running

3
src/Components/WebAssembly/WebAssembly/ref/Microsoft.AspNetCore.Components.WebAssembly.csproj
View File

@ -2,12 +2,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.1</TargetFrameworks>
<NoWarn>$(NoWarn);BL0006</NoWarn>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
<Compile Include="Microsoft.AspNetCore.Components.WebAssembly.netstandard2.1.cs" />
<Reference Include="Mono.WebAssembly.Interop" />
<Reference Include="Microsoft.AspNetCore.Components.Web" />
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="Microsoft.JSInterop.WebAssembly" />
</ItemGroup>
</Project>

24
src/Components/WebAssembly/WebAssembly/ref/Microsoft.AspNetCore.Components.WebAssembly.netstandard2.1.cs
View File

@ -1,15 +1,6 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
namespace Microsoft.AspNetCore.Components.WebAssembly
{
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public static partial class JSInteropMethods
{
[Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")]
public static void NotifyLocationChanged(string uri, bool isInterceptedLink) { }
}
}
namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
{
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
@ -43,6 +34,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
public Microsoft.AspNetCore.Components.WebAssembly.Hosting.RootComponentMappingCollection RootComponents { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
public Microsoft.Extensions.DependencyInjection.IServiceCollection Services { [System.Runtime.CompilerServices.CompilerGeneratedAttribute]get { throw null; } }
public Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHost Build() { throw null; }
public void ConfigureContainer<TBuilder>(Microsoft.Extensions.DependencyInjection.IServiceProviderFactory<TBuilder> factory, System.Action<TBuilder> configure = null) { }
public static Microsoft.AspNetCore.Components.WebAssembly.Hosting.WebAssemblyHostBuilder CreateDefault(string[] args = null) { throw null; }
}
}
@ -59,11 +51,21 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Http
public static Microsoft.AspNetCore.Components.WebAssembly.Http.FetchCredentialsOption DefaultCredentials { get { throw null; } set { } }
}
}
namespace Microsoft.AspNetCore.Components.WebAssembly.Rendering
namespace Microsoft.AspNetCore.Components.WebAssembly.Infrastructure
{
public static partial class WebAssemblyEventDispatcher
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
public static partial class JSInteropMethods
{
[Microsoft.JSInterop.JSInvokableAttribute("DispatchEvent")]
public static System.Threading.Tasks.Task DispatchEvent(Microsoft.AspNetCore.Components.RenderTree.WebEventDescriptor eventDescriptor, string eventArgsJson) { throw null; }
[Microsoft.JSInterop.JSInvokableAttribute("NotifyLocationChanged")]
public static void NotifyLocationChanged(string uri, bool isInterceptedLink) { }
}
}
namespace Microsoft.Extensions.DependencyInjection
{
public static partial class HttpClientServiceCollectionExtensions
{
public static Microsoft.Extensions.DependencyInjection.IServiceCollection AddBaseAddressHttpClient(this Microsoft.Extensions.DependencyInjection.IServiceCollection serviceCollection) { throw null; }
}
}

2
src/Components/WebAssembly/WebAssembly/src/Microsoft.AspNetCore.Components.WebAssembly.csproj
View File

@ -10,7 +10,7 @@
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components.Web" />
<Reference Include="Microsoft.Extensions.Configuration" />
<Reference Include="WebAssembly.JSInterop" />
<Reference Include="Microsoft.JSInterop.WebAssembly" />
</ItemGroup>
<ItemGroup>

2
src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs
View File

@ -2,7 +2,7 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using Microsoft.JSInterop.Infrastructure;
using WebAssembly.JSInterop;
using Microsoft.JSInterop.WebAssembly;
namespace Microsoft.AspNetCore.Components.WebAssembly.Services
{