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

Merge branch 'master' into 5431-work

This commit is contained in:
Isaac Levin 2019-07-02 10:24:18 -04:00 committed by GitHub
parent e0ba612fe4 8a7508d818
commit 5f5ba7a592
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
172 changed files with 9581 additions and 16662 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eng/ProjectReferences.props
View File

@ -133,9 +133,10 @@
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR" ProjectPath="$(RepoRoot)src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj" RefProjectPath="$(RepoRoot)src\SignalR\server\SignalR\ref\Microsoft.AspNetCore.SignalR.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR" ProjectPath="$(RepoRoot)src\SignalR\server\SignalR\src\Microsoft.AspNetCore.SignalR.csproj" RefProjectPath="$(RepoRoot)src\SignalR\server\SignalR\ref\Microsoft.AspNetCore.SignalR.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" RefProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\ref\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" ProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\src\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" RefProjectPath="$(RepoRoot)src\SignalR\server\StackExchangeRedis\ref\Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor" ProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\src\Microsoft.AspNetCore.Blazor.csproj" RefProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\ref\Microsoft.AspNetCore.Blazor.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor" ProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\src\Microsoft.AspNetCore.Blazor.csproj" RefProjectPath="$(RepoRoot)src\Components\Blazor\Blazor\ref\Microsoft.AspNetCore.Blazor.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.HttpClient" ProjectPath="$(RepoRoot)src\Components\Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj" RefProjectPath="$(RepoRoot)src\Components\Blazor\Http\ref\Microsoft.AspNetCore.Blazor.HttpClient.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" RefProjectPath="$(RepoRoot)src\Components\Blazor\Server\ref\Microsoft.AspNetCore.Blazor.Server.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Server" ProjectPath="$(RepoRoot)src\Components\Blazor\Server\src\Microsoft.AspNetCore.Blazor.Server.csproj" RefProjectPath="$(RepoRoot)src\Components\Blazor\Server\ref\Microsoft.AspNetCore.Blazor.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Browser" ProjectPath="$(RepoRoot)src\Components\Browser\src\Microsoft.AspNetCore.Components.Browser.csproj" RefProjectPath="$(RepoRoot)src\Components\Browser\ref\Microsoft.AspNetCore.Components.Browser.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" RefProjectPath="$(RepoRoot)src\Components\Components\ref\Microsoft.AspNetCore.Components.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.Components" ProjectPath="$(RepoRoot)src\Components\Components\src\Microsoft.AspNetCore.Components.csproj" RefProjectPath="$(RepoRoot)src\Components\Components\ref\Microsoft.AspNetCore.Components.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Server" ProjectPath="$(RepoRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" RefProjectPath="$(RepoRoot)src\Components\Server\ref\Microsoft.AspNetCore.Components.Server.csproj" /> <ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Server" ProjectPath="$(RepoRoot)src\Components\Server\src\Microsoft.AspNetCore.Components.Server.csproj" RefProjectPath="$(RepoRoot)src\Components\Server\ref\Microsoft.AspNetCore.Components.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.Web" ProjectPath="$(RepoRoot)src\Components\Web\src\Microsoft.AspNetCore.Components.Web.csproj" RefProjectPath="$(RepoRoot)src\Components\Web\ref\Microsoft.AspNetCore.Components.Web.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
eng/SharedFramework.Local.props
View File

@ -22,8 +22,8 @@
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" /> <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Http.Connections.Common" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.Json" /> <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Common" /> <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.SignalR.Common" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Browser" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components" /> <AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components" />
<AspNetCoreAppReferenceAndPackage Include="Microsoft.AspNetCore.Components.Web" />
<!-- These assemblies are only in the shared framework --> <!-- These assemblies are only in the shared framework -->
<AspNetCoreAppReference Include="Microsoft.AspNetCore" /> <AspNetCoreAppReference Include="Microsoft.AspNetCore" />

32
eng/Version.Details.xml
View File

@ -9,9 +9,9 @@
--> -->
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="0.10.0-preview7.19351.1"> <Dependency Name="Microsoft.AspNetCore.Blazor.Mono" Version="0.10.0-preview8.19351.2">
<Uri>https://github.com/aspnet/Blazor</Uri> <Uri>https://github.com/aspnet/Blazor</Uri>
<Sha>10ac2538243650ab287ba9fafe6d05e30c40f9ae</Sha> <Sha>cce6ca292fc3cb1dbbf02e149756318ad40628dc</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview7.19351.2"> <Dependency Name="Microsoft.AspNetCore.Razor.Language" Version="3.0.0-preview7.19351.2">
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri> <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
@ -29,33 +29,33 @@
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri> <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>7c5826c2abfe90e20acc3715cf9e939db1b1a442</Sha> <Sha>7c5826c2abfe90e20acc3715cf9e939db1b1a442</Sha>
</Dependency> </Dependency>
<Dependency Name="dotnet-ef" Version="3.0.0-preview7.19330.4"> <Dependency Name="dotnet-ef" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview7.19330.4"> <Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-preview8.19351.2">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri> <Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>9e3b10d68188c9518cfc5bb3cb0050968adadd99</Sha> <Sha>b3f48c9f95aadabc141ab144ee368eacca814215</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview7.19328.2" CoherentParentDependency="Microsoft.EntityFrameworkCore"> <Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-preview7.19328.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri> <Uri>https://github.com/aspnet/Extensions</Uri>

18
eng/Versions.props
View File

@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>3</AspNetCoreMajorVersion> <AspNetCoreMajorVersion>3</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion> <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion> <AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleasePreviewNumber>7</PreReleasePreviewNumber> <PreReleasePreviewNumber>8</PreReleasePreviewNumber>
<PreReleaseVersionLabel>preview$(PreReleasePreviewNumber)</PreReleaseVersionLabel> <PreReleaseVersionLabel>preview$(PreReleasePreviewNumber)</PreReleaseVersionLabel>
<PreReleaseBrandingLabel>Preview $(PreReleasePreviewNumber)</PreReleaseBrandingLabel> <PreReleaseBrandingLabel>Preview $(PreReleasePreviewNumber)</PreReleaseBrandingLabel>
<AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion> <AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion>
@ -82,7 +82,7 @@
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 --> <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19326.13</MicrosoftNETCorePlatformsPackageVersion> <MicrosoftNETCorePlatformsPackageVersion>3.0.0-preview7.19326.13</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from aspnet/Blazor --> <!-- Packages from aspnet/Blazor -->
<MicrosoftAspNetCoreBlazorMonoPackageVersion>0.10.0-preview7.19351.1</MicrosoftAspNetCoreBlazorMonoPackageVersion> <MicrosoftAspNetCoreBlazorMonoPackageVersion>0.10.0-preview8.19351.2</MicrosoftAspNetCoreBlazorMonoPackageVersion>
<!-- Packages from aspnet/Extensions --> <!-- Packages from aspnet/Extensions -->
<InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview7.19328.2</InternalAspNetCoreAnalyzersPackageVersion> <InternalAspNetCoreAnalyzersPackageVersion>3.0.0-preview7.19328.2</InternalAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview7.19328.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion> <MicrosoftAspNetCoreAnalyzerTestingPackageVersion>3.0.0-preview7.19328.2</MicrosoftAspNetCoreAnalyzerTestingPackageVersion>
@ -146,13 +146,13 @@
<MicrosoftJSInteropPackageVersion>3.0.0-preview7.19328.2</MicrosoftJSInteropPackageVersion> <MicrosoftJSInteropPackageVersion>3.0.0-preview7.19328.2</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>3.0.0-preview7.19328.2</MonoWebAssemblyInteropPackageVersion> <MonoWebAssemblyInteropPackageVersion>3.0.0-preview7.19328.2</MonoWebAssemblyInteropPackageVersion>
<!-- Packages from aspnet/EntityFrameworkCore --> <!-- Packages from aspnet/EntityFrameworkCore -->
<dotnetefPackageVersion>3.0.0-preview7.19330.4</dotnetefPackageVersion> <dotnetefPackageVersion>3.0.0-preview8.19351.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion> <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCoreRelationalPackageVersion> <MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion> <MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion> <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCoreToolsPackageVersion> <MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview7.19330.4</MicrosoftEntityFrameworkCorePackageVersion> <MicrosoftEntityFrameworkCorePackageVersion>3.0.0-preview8.19351.2</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Packages from aspnet/AspNetCore-Tooling --> <!-- Packages from aspnet/AspNetCore-Tooling -->
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview7.19351.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion> <MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-preview7.19351.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview7.19351.2</MicrosoftAspNetCoreRazorLanguagePackageVersion> <MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-preview7.19351.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>

4
eng/scripts/CodeCheck.ps1
View File

@ -166,9 +166,9 @@ try {
& dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/" & dotnet run -p "$repoRoot/eng/tools/BaselineGenerator/"
} }
Write-Host "Re-generating Browser.JS files" Write-Host "Re-generating Web.JS files"
Invoke-Block { Invoke-Block {
& dotnet build "$repoRoot\src\Components\Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.npmproj" & dotnet build "$repoRoot\src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj"
} }
Write-Host "Run git diff to check for pending changes" Write-Host "Run git diff to check for pending changes"

2
src/Analyzers/Analyzers.sln
View File

@ -23,7 +23,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Author
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "..\Components\Components\src\Microsoft.AspNetCore.Components.csproj", "{34522BFF-D1D8-44A3-891E-77C6BE7C81F1}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components", "..\Components\Components\src\Microsoft.AspNetCore.Components.csproj", "{34522BFF-D1D8-44A3-891E-77C6BE7C81F1}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser", "..\Components\Browser\src\Microsoft.AspNetCore.Components.Browser.csproj", "{9C20C5AB-E609-4167-922D-0E7C7C6ED1EC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Web", "..\Components\Web\src\Microsoft.AspNetCore.Components.Web.csproj", "{9C20C5AB-E609-4167-922D-0E7C7C6ED1EC}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{A21D03D7-5D69-47E7-B32C-4D7067D71B0E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Connections.Abstractions", "..\Servers\Connections.Abstractions\src\Microsoft.AspNetCore.Connections.Abstractions.csproj", "{A21D03D7-5D69-47E7-B32C-4D7067D71B0E}"
EndProject EndProject

2
src/Components/Blazor/Blazor/ref/Microsoft.AspNetCore.Blazor.csproj
View File

@ -6,6 +6,6 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.AspNetCore.Blazor.netstandard2.0.cs" /> <Compile Include="Microsoft.AspNetCore.Blazor.netstandard2.0.cs" />
<Reference Include="Mono.WebAssembly.Interop" /> <Reference Include="Mono.WebAssembly.Interop" />
<Reference Include="Microsoft.AspNetCore.Components.Browser" /> <Reference Include="Microsoft.AspNetCore.Components.Web" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -8,7 +8,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="Mono.WebAssembly.Interop" /> <Reference Include="Mono.WebAssembly.Interop" />
<Reference Include="Microsoft.AspNetCore.Components.Browser" /> <Reference Include="Microsoft.AspNetCore.Components.Web" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Components/Blazor/Blazor/src/Rendering/WebAssemblyRenderer.cs
View File

@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Blazor.Services; using Microsoft.AspNetCore.Blazor.Services;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Rendering;
namespace Microsoft.AspNetCore.Blazor.Rendering namespace Microsoft.AspNetCore.Blazor.Rendering

2
src/Components/Blazor/Blazor/src/Services/WebAssemblyNavigationInterception.cs
View File

@ -3,7 +3,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Routing;
using Interop = Microsoft.AspNetCore.Components.Browser.BrowserUriHelperInterop; using Interop = Microsoft.AspNetCore.Components.Web.BrowserUriHelperInterop;
namespace Microsoft.AspNetCore.Blazor.Services namespace Microsoft.AspNetCore.Blazor.Services
{ {

2
src/Components/Blazor/Blazor/src/Services/WebAssemblyUriHelper.cs
View File

@ -4,7 +4,7 @@
using System; using System;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Interop = Microsoft.AspNetCore.Components.Browser.BrowserUriHelperInterop; using Interop = Microsoft.AspNetCore.Components.Web.BrowserUriHelperInterop;
namespace Microsoft.AspNetCore.Blazor.Services namespace Microsoft.AspNetCore.Blazor.Services
{ {

2
src/Components/Blazor/BlazorExtension/src/Microsoft.VisualStudio.BlazorExtension.csproj
View File

@ -52,7 +52,7 @@
<CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory> <CopyOutputSymbolsToOutputDirectory>true</CopyOutputSymbolsToOutputDirectory>
</PropertyGroup> </PropertyGroup>
<Target Name="PreCreateVsixContainer" BeforeTargets="GetVsixSourceItems" Condition="'$(IsPackable)' == 'true'"> <Target Name="PreCreateVsixContainer" BeforeTargets="GetVsixSourceItems" Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">
<ItemGroup> <ItemGroup>
<_TemplatePackage Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.Blazor.Templates.*.nupkg" /> <_TemplatePackage Include="$(ArtifactsShippingPackagesDir)Microsoft.AspNetCore.Blazor.Templates.*.nupkg" />
</ItemGroup> </ItemGroup>

4
src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.csproj
View File

@ -26,7 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Condition="'$(BuildNodeJS)' != 'false'" Include="$(RepoRoot)src\Components\Browser.JS\Microsoft.AspNetCore.Components.Browser.JS.npmproj" ReferenceOutputAssembly="false" /> <ProjectReference Condition="'$(BuildNodeJS)' != 'false'" Include="$(RepoRoot)src\Components\Web.JS\Microsoft.AspNetCore.Components.Web.JS.npmproj" ReferenceOutputAssembly="false" />
<Reference Include="Microsoft.AspNetCore.Components" /> <Reference Include="Microsoft.AspNetCore.Components" />
<Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" /> <Reference Include="Microsoft.Extensions.CommandLineUtils.Sources" />
<Reference Include="Microsoft.Extensions.FileProviders.Composite" /> <Reference Include="Microsoft.Extensions.FileProviders.Composite" />
@ -36,6 +36,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\..\..\Components\src\JsonSerializerOptionsProvider.cs" /> <Compile Include="..\..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Components/Blazor/Build/src/Microsoft.AspNetCore.Blazor.Build.nuspec
View File

@ -11,6 +11,6 @@
<file src="build\**" target="build" /> <file src="build\**" target="build" />
<file src="targets\**" target="targets" /> <file src="targets\**" target="targets" />
<file src="$publishdir$**\*" target="tools/" /> <file src="$publishdir$**\*" target="tools/" />
<file src="..\..\..\Browser.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" /> <file src="..\..\..\Web.JS\dist\$configuration$\blazor.*.js" target="tools/blazor" />
</files> </files>
</package> </package>

2
src/Components/Blazor/Build/src/ReferenceFromSource.props
View File

@ -11,7 +11,7 @@
<PropertyGroup> <PropertyGroup>
<BlazorBuildReferenceFromSource>true</BlazorBuildReferenceFromSource> <BlazorBuildReferenceFromSource>true</BlazorBuildReferenceFromSource>
<BlazorJsPath>$(RepoRoot)src\Components\Browser.JS\dist\$(Configuration)\blazor.*.js.*</BlazorJsPath> <BlazorJsPath>$(RepoRoot)src\Components\Web.JS\dist\$(Configuration)\blazor.*.js.*</BlazorJsPath>
</PropertyGroup> </PropertyGroup>
<Import Project="$(MSBuildThisFileDirectory)targets/All.props" /> <Import Project="$(MSBuildThisFileDirectory)targets/All.props" />

6
src/Components/Blazor/Build/test/RuntimeDependenciesResolverTest.cs
View File

@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
var references = new[] var references = new[]
{ {
"Microsoft.AspNetCore.Blazor.dll", "Microsoft.AspNetCore.Blazor.dll",
"Microsoft.AspNetCore.Components.Browser.dll", "Microsoft.AspNetCore.Components.Web.dll",
"Microsoft.AspNetCore.Components.dll", "Microsoft.AspNetCore.Components.dll",
"Microsoft.Extensions.DependencyInjection.Abstractions.dll", "Microsoft.Extensions.DependencyInjection.Abstractions.dll",
"Microsoft.Extensions.DependencyInjection.dll", "Microsoft.Extensions.DependencyInjection.dll",
@ -59,8 +59,8 @@ namespace Microsoft.AspNetCore.Blazor.Build.Test
*/ */
"Microsoft.AspNetCore.Blazor.dll", "Microsoft.AspNetCore.Blazor.dll",
"Microsoft.AspNetCore.Blazor.pdb", "Microsoft.AspNetCore.Blazor.pdb",
"Microsoft.AspNetCore.Components.Browser.dll", "Microsoft.AspNetCore.Components.Web.dll",
"Microsoft.AspNetCore.Components.Browser.pdb", "Microsoft.AspNetCore.Components.Web.pdb",
"Microsoft.AspNetCore.Components.dll", "Microsoft.AspNetCore.Components.dll",
"Microsoft.AspNetCore.Components.pdb", "Microsoft.AspNetCore.Components.pdb",
"Microsoft.Extensions.DependencyInjection.Abstractions.dll", "Microsoft.Extensions.DependencyInjection.Abstractions.dll",

10
src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.csproj Normal file
View File

@ -0,0 +1,10 @@
<!-- This file is automatically generated. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<Compile Include="Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs" />
<Reference Include="System.Text.Json" />
</ItemGroup>
</Project>

18
src/Components/Blazor/Http/ref/Microsoft.AspNetCore.Blazor.HttpClient.netstandard2.0.cs Normal file
View File

@ -0,0 +1,18 @@
// 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
{
public static partial class HttpClientJsonExtensions
{
[System.Diagnostics.DebuggerStepThroughAttribute]
public static System.Threading.Tasks.Task<T> GetJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri) { throw null; }
public static System.Threading.Tasks.Task PostJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task<T> PostJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task PutJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task<T> PutJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task SendJsonAsync(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; }
[System.Diagnostics.DebuggerStepThroughAttribute]
public static System.Threading.Tasks.Task<T> SendJsonAsync<T>(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; }
}
}

0
src/Components/Components/src/HttpClientJsonExtensions.cs → src/Components/Blazor/Http/src/HttpClientJsonExtensions.cs
View File

17
src/Components/Blazor/Http/src/Microsoft.AspNetCore.Blazor.HttpClient.csproj Normal file
View File

@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Description>Provides experimental support for using System.Text.Json with HttpClient. Intended for use with Blazor running under WebAssembly.</Description>
<IsShippingPackage>true</IsShippingPackage>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System.Text.Json" />
</ItemGroup>
</Project>

0
src/Components/Components/test/HttpClientJsonExtensionsTest.cs → src/Components/Blazor/Http/test/HttpClientJsonExtensionsTest.cs
View File

11
src/Components/Blazor/Http/test/Microsoft.AspNetCore.Blazor.HttpClient.Tests.csproj Normal file
View File

@ -0,0 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Blazor.HttpClient" />
</ItemGroup>
</Project>

1
src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/BlazorHosted-CSharp.Client.csproj
View File

@ -10,6 +10,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="$(TemplateBlazorPackageVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/Components/Blazor/Templates/src/content/BlazorLibrary-CSharp/BlazorLibrary-CSharp.csproj
View File

@ -16,7 +16,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Browser" Version="$(TemplateComponentsPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="$(TemplateComponentsPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/BlazorStandalone-CSharp.csproj
View File

@ -10,6 +10,7 @@
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" /> <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="$(TemplateBlazorPackageVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="$(TemplateBlazorPackageVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="$(TemplateBlazorPackageVersion)" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/Components/Blazor/testassets/StandaloneApp/StandaloneApp.csproj
View File

@ -8,5 +8,6 @@
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.AspNetCore.Blazor" /> <Reference Include="Microsoft.AspNetCore.Blazor" />
<Reference Include="Microsoft.AspNetCore.Blazor.HttpClient" />
</ItemGroup> </ItemGroup>
</Project> </Project>

1
src/Components/Browser.JS/dist/Release/blazor.webassembly.js vendored
View File

File diff suppressed because one or more lines are too long

34
src/Components/Components.sln
View File

@ -39,9 +39,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MonoSanityClient", "Blazor\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "Blazor\testassets\StandaloneApp\StandaloneApp.csproj", "{C0FFB29E-4696-4875-9039-E5FA1AC5A42A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StandaloneApp", "Blazor\testassets\StandaloneApp\StandaloneApp.csproj", "{C0FFB29E-4696-4875-9039-E5FA1AC5A42A}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Browser", "Browser", "{A27FF193-195B-4474-8E6C-840B2E339373}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A27FF193-195B-4474-8E6C-840B2E339373}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Browser", "Browser\src\Microsoft.AspNetCore.Components.Browser.csproj", "{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.Web", "Web\src\Microsoft.AspNetCore.Components.Web.csproj", "{3B1A56F8-B3E0-4F33-A717-50BDD4FBE12E}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{3D9B9B2C-E379-41BD-83D4-2E099FBDA107}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{3D9B9B2C-E379-41BD-83D4-2E099FBDA107}"
EndProject EndProject
@ -222,6 +222,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor", "test\testassets\
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "test\Ignitor.Test\Ignitor.Test.csproj", "{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ignitor.Test", "test\Ignitor.Test\Ignitor.Test.csproj", "{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.HttpClient", "Blazor\Http\src\Microsoft.AspNetCore.Blazor.HttpClient.csproj", "{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Blazor.HttpClient.Tests", "Blazor\Http\test\Microsoft.AspNetCore.Blazor.HttpClient.Tests.csproj", "{E4C01A3F-D3C1-4639-A6A9-930E918843DD}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -1408,6 +1412,30 @@ Global
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x64.Build.0 = Release|Any CPU {FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x64.Build.0 = Release|Any CPU
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.ActiveCfg = Release|Any CPU {FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.ActiveCfg = Release|Any CPU
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.Build.0 = Release|Any CPU {FC2A1EB0-A116-4689-92B7-239B1DCCF4CA}.Release|x86.Build.0 = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|x64.ActiveCfg = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|x64.Build.0 = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|x86.ActiveCfg = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Debug|x86.Build.0 = Debug|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|Any CPU.Build.0 = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|x64.ActiveCfg = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|x64.Build.0 = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|x86.ActiveCfg = Release|Any CPU
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF}.Release|x86.Build.0 = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|x64.ActiveCfg = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|x64.Build.0 = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|x86.ActiveCfg = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Debug|x86.Build.0 = Debug|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|Any CPU.Build.0 = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|x64.ActiveCfg = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|x64.Build.0 = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|x86.ActiveCfg = Release|Any CPU
{E4C01A3F-D3C1-4639-A6A9-930E918843DD}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -1513,6 +1541,8 @@ Global
{F88118E1-6F4A-4F89-B047-5FFD2889B9F0} = {2FC10057-7A0A-4E34-8302-879925BC0102} {F88118E1-6F4A-4F89-B047-5FFD2889B9F0} = {2FC10057-7A0A-4E34-8302-879925BC0102}
{A78CE874-76B7-46FE-8009-1ED5258BA0AA} = {44E0D4F3-4430-4175-B482-0D1AEE4BB699} {A78CE874-76B7-46FE-8009-1ED5258BA0AA} = {44E0D4F3-4430-4175-B482-0D1AEE4BB699}
{FC2A1EB0-A116-4689-92B7-239B1DCCF4CA} = {E9E9CF3C-CE9B-4282-B2BB-97EFC3872798} {FC2A1EB0-A116-4689-92B7-239B1DCCF4CA} = {E9E9CF3C-CE9B-4282-B2BB-97EFC3872798}
{74D21785-2FAB-4266-B7C4-E311EC8EE0DF} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
{E4C01A3F-D3C1-4639-A6A9-930E918843DD} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {CC3C47E1-AD1A-4619-9CD3-E08A0148E5CE} SolutionGuid = {CC3C47E1-AD1A-4619-9CD3-E08A0148E5CE}

46
src/Components/Components/ref/Microsoft.AspNetCore.Components.netstandard2.0.cs
View File

@ -148,23 +148,23 @@ namespace Microsoft.AspNetCore.Components
} }
public static partial class EventCallbackFactoryBinderExtensions public static partial class EventCallbackFactoryBinderExtensions
{ {
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool> setter, bool existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime> setter, System.DateTime existingValue, string format, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal> setter, decimal existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double> setter, double existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int> setter, int existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long> setter, long existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<bool?> setter, bool? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<System.DateTime?> setter, System.DateTime? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<decimal?> setter, decimal? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<double?> setter, double? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<int?> setter, int? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<long?> setter, long? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float?> setter, float? existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<float> setter, float existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<string> setter, string existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue) { throw null; } public static Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.UIChangeEventArgs> CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory factory, object receiver, System.Action<T> setter, T existingValue, System.Globalization.CultureInfo culture = null) { throw null; }
} }
public static partial class EventCallbackFactoryUIEventArgsExtensions public static partial class EventCallbackFactoryUIEventArgsExtensions
{ {
@ -310,18 +310,6 @@ namespace Microsoft.AspNetCore.Components
public static partial class EventHandlers public static partial class EventHandlers
{ {
} }
public static partial class HttpClientJsonExtensions
{
[System.Diagnostics.DebuggerStepThroughAttribute]
public static System.Threading.Tasks.Task<T> GetJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri) { throw null; }
public static System.Threading.Tasks.Task PostJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task<T> PostJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task PutJsonAsync(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task<T> PutJsonAsync<T>(this System.Net.Http.HttpClient httpClient, string requestUri, object content) { throw null; }
public static System.Threading.Tasks.Task SendJsonAsync(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; }
[System.Diagnostics.DebuggerStepThroughAttribute]
public static System.Threading.Tasks.Task<T> SendJsonAsync<T>(this System.Net.Http.HttpClient httpClient, System.Net.Http.HttpMethod method, string requestUri, object content) { throw null; }
}
public partial interface IComponent public partial interface IComponent
{ {
void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle); void Configure(Microsoft.AspNetCore.Components.RenderHandle renderHandle);

175
src/Components/Components/src/EventCallbackFactoryBinderExtensions.cs
View File

@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Components
// For now we're not necessarily handling this correctly since we parse the same way for number and text. // For now we're not necessarily handling this correctly since we parse the same way for number and text.
public static class EventCallbackFactoryBinderExtensions public static class EventCallbackFactoryBinderExtensions
{ {
private delegate bool BindConverter<T>(object obj, out T value); private delegate bool BindConverter<T>(object obj, CultureInfo culture, out T value);
// Perf: conversion delegates are written as static funcs so we can prevent // Perf: conversion delegates are written as static funcs so we can prevent
// allocations for these simple cases. // allocations for these simple cases.
private readonly static BindConverter<string> ConvertToString = ConvertToStringCore; private readonly static BindConverter<string> ConvertToString = ConvertToStringCore;
private static bool ConvertToStringCore(object obj, out string value) private static bool ConvertToStringCore(object obj, CultureInfo culture, out string value)
{ {
// We expect the input to already be a string. // We expect the input to already be a string.
value = (string)obj; value = (string)obj;
@ -41,14 +41,14 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<bool> ConvertToBool = ConvertToBoolCore; private static BindConverter<bool> ConvertToBool = ConvertToBoolCore;
private static BindConverter<bool?> ConvertToNullableBool = ConvertToNullableBoolCore; private static BindConverter<bool?> ConvertToNullableBool = ConvertToNullableBoolCore;
private static bool ConvertToBoolCore(object obj, out bool value) private static bool ConvertToBoolCore(object obj, CultureInfo culture, out bool value)
{ {
// We expect the input to already be a bool. // We expect the input to already be a bool.
value = (bool)obj; value = (bool)obj;
return true; return true;
} }
private static bool ConvertToNullableBoolCore(object obj, out bool? value) private static bool ConvertToNullableBoolCore(object obj, CultureInfo culture, out bool? value)
{ {
// We expect the input to already be a bool. // We expect the input to already be a bool.
value = (bool?)obj; value = (bool?)obj;
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<int> ConvertToInt = ConvertToIntCore; private static BindConverter<int> ConvertToInt = ConvertToIntCore;
private static BindConverter<int?> ConvertToNullableInt = ConvertToNullableIntCore; private static BindConverter<int?> ConvertToNullableInt = ConvertToNullableIntCore;
private static bool ConvertToIntCore(object obj, out int value) private static bool ConvertToIntCore(object obj, CultureInfo culture, out int value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!int.TryParse(text, NumberStyles.Integer, CultureInfo.CurrentCulture, out var converted)) if (!int.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableIntCore(object obj, out int? value) private static bool ConvertToNullableIntCore(object obj, CultureInfo culture, out int? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!int.TryParse(text, NumberStyles.Integer, CultureInfo.CurrentCulture, out var converted)) if (!int.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<long> ConvertToLong = ConvertToLongCore; private static BindConverter<long> ConvertToLong = ConvertToLongCore;
private static BindConverter<long?> ConvertToNullableLong = ConvertToNullableLongCore; private static BindConverter<long?> ConvertToNullableLong = ConvertToNullableLongCore;
private static bool ConvertToLongCore(object obj, out long value) private static bool ConvertToLongCore(object obj, CultureInfo culture, out long value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -108,7 +108,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!long.TryParse(text, NumberStyles.Integer, CultureInfo.CurrentCulture, out var converted)) if (!long.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -118,7 +118,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableLongCore(object obj, out long? value) private static bool ConvertToNullableLongCore(object obj, CultureInfo culture, out long? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -127,7 +127,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!long.TryParse(text, NumberStyles.Integer, CultureInfo.CurrentCulture, out var converted)) if (!long.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -140,7 +140,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<float> ConvertToFloat = ConvertToFloatCore; private static BindConverter<float> ConvertToFloat = ConvertToFloatCore;
private static BindConverter<float?> ConvertToNullableFloat = ConvertToNullableFloatCore; private static BindConverter<float?> ConvertToNullableFloat = ConvertToNullableFloatCore;
private static bool ConvertToFloatCore(object obj, out float value) private static bool ConvertToFloatCore(object obj, CultureInfo culture, out float value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -149,7 +149,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!float.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!float.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -159,7 +159,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableFloatCore(object obj, out float? value) private static bool ConvertToNullableFloatCore(object obj, CultureInfo culture, out float? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -168,7 +168,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!float.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!float.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -181,7 +181,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<double> ConvertToDouble = ConvertToDoubleCore; private static BindConverter<double> ConvertToDouble = ConvertToDoubleCore;
private static BindConverter<double?> ConvertToNullableDouble = ConvertToNullableDoubleCore; private static BindConverter<double?> ConvertToNullableDouble = ConvertToNullableDoubleCore;
private static bool ConvertToDoubleCore(object obj, out double value) private static bool ConvertToDoubleCore(object obj, CultureInfo culture, out double value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -190,7 +190,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!double.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!double.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableDoubleCore(object obj, out double? value) private static bool ConvertToNullableDoubleCore(object obj, CultureInfo culture, out double? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -209,7 +209,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!double.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!double.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -222,7 +222,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<decimal> ConvertToDecimal = ConvertToDecimalCore; private static BindConverter<decimal> ConvertToDecimal = ConvertToDecimalCore;
private static BindConverter<decimal?> ConvertToNullableDecimal = ConvertToNullableDecimalCore; private static BindConverter<decimal?> ConvertToNullableDecimal = ConvertToNullableDecimalCore;
private static bool ConvertToDecimalCore(object obj, out decimal value) private static bool ConvertToDecimalCore(object obj, CultureInfo culture, out decimal value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -231,7 +231,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!decimal.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!decimal.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -241,7 +241,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableDecimalCore(object obj, out decimal? value) private static bool ConvertToNullableDecimalCore(object obj, CultureInfo culture, out decimal? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -250,7 +250,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!decimal.TryParse(text, NumberStyles.Number, CultureInfo.CurrentCulture, out var converted)) if (!decimal.TryParse(text, NumberStyles.Number, culture ?? CultureInfo.CurrentCulture, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -263,7 +263,7 @@ namespace Microsoft.AspNetCore.Components
private static BindConverter<DateTime> ConvertToDateTime = ConvertToDateTimeCore; private static BindConverter<DateTime> ConvertToDateTime = ConvertToDateTimeCore;
private static BindConverter<DateTime?> ConvertToNullableDateTime = ConvertToNullableDateTimeCore; private static BindConverter<DateTime?> ConvertToNullableDateTime = ConvertToNullableDateTimeCore;
private static bool ConvertToDateTimeCore(object obj, out DateTime value) private static bool ConvertToDateTimeCore(object obj, CultureInfo culture, out DateTime value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -272,7 +272,7 @@ namespace Microsoft.AspNetCore.Components
return false; return false;
} }
if (!DateTime.TryParse(text, CultureInfo.CurrentCulture, DateTimeStyles.None, out var converted)) if (!DateTime.TryParse(text, culture ?? CultureInfo.CurrentCulture, DateTimeStyles.None, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -282,7 +282,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableDateTimeCore(object obj, out DateTime? value) private static bool ConvertToNullableDateTimeCore(object obj, CultureInfo culture, out DateTime? value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -291,7 +291,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
if (!DateTime.TryParse(text, CultureInfo.CurrentCulture, DateTimeStyles.None, out var converted)) if (!DateTime.TryParse(text, culture ?? CultureInfo.CurrentCulture, DateTimeStyles.None, out var converted))
{ {
value = default; value = default;
return false; return false;
@ -301,7 +301,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToEnum<T>(object obj, out T value) where T : struct, Enum private static bool ConvertToEnum<T>(object obj, CultureInfo culture, out T value) where T : struct, Enum
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -320,7 +320,7 @@ namespace Microsoft.AspNetCore.Components
return true; return true;
} }
private static bool ConvertToNullableEnum<T>(object obj, out Nullable<T> value) where T : struct, Enum private static bool ConvertToNullableEnum<T>(object obj, CultureInfo culture, out T? value) where T : struct, Enum
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -346,14 +346,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<string> setter, Action<string> setter,
string existingValue) string existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<string>(factory, receiver, setter, ConvertToString); return CreateBinderCore<string>(factory, receiver, setter, culture, ConvertToString);
} }
/// <summary> /// <summary>
@ -363,14 +365,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<bool> setter, Action<bool> setter,
bool existingValue) bool existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<bool>(factory, receiver, setter, ConvertToBool); return CreateBinderCore<bool>(factory, receiver, setter, culture, ConvertToBool);
} }
/// <summary> /// <summary>
@ -380,14 +384,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<bool?> setter, Action<bool?> setter,
bool? existingValue) bool? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<bool?>(factory, receiver, setter, ConvertToNullableBool); return CreateBinderCore<bool?>(factory, receiver, setter, culture, ConvertToNullableBool);
} }
/// <summary> /// <summary>
@ -397,14 +403,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<int> setter, Action<int> setter,
int existingValue) int existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<int>(factory, receiver, setter, ConvertToInt); return CreateBinderCore<int>(factory, receiver, setter, culture, ConvertToInt);
} }
/// <summary> /// <summary>
@ -414,14 +422,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<int?> setter, Action<int?> setter,
int? existingValue) int? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<int?>(factory, receiver, setter, ConvertToNullableInt); return CreateBinderCore<int?>(factory, receiver, setter, culture, ConvertToNullableInt);
} }
/// <summary> /// <summary>
@ -431,14 +441,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<long> setter, Action<long> setter,
long existingValue) long existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<long>(factory, receiver, setter, ConvertToLong); return CreateBinderCore<long>(factory, receiver, setter, culture, ConvertToLong);
} }
/// <summary> /// <summary>
@ -448,14 +460,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<long?> setter, Action<long?> setter,
long? existingValue) long? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<long?>(factory, receiver, setter, ConvertToNullableLong); return CreateBinderCore<long?>(factory, receiver, setter, culture, ConvertToNullableLong);
} }
/// <summary> /// <summary>
@ -465,14 +479,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<float> setter, Action<float> setter,
float existingValue) float existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<float>(factory, receiver, setter, ConvertToFloat); return CreateBinderCore<float>(factory, receiver, setter, culture, ConvertToFloat);
} }
/// <summary> /// <summary>
@ -482,14 +498,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<float?> setter, Action<float?> setter,
float? existingValue) float? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<float?>(factory, receiver, setter, ConvertToNullableFloat); return CreateBinderCore<float?>(factory, receiver, setter, culture, ConvertToNullableFloat);
} }
/// <summary> /// <summary>
@ -499,14 +517,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<double> setter, Action<double> setter,
double existingValue) double existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<double>(factory, receiver, setter, ConvertToDouble); return CreateBinderCore<double>(factory, receiver, setter, culture, ConvertToDouble);
} }
/// <summary> /// <summary>
@ -516,14 +536,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<double?> setter, Action<double?> setter,
double? existingValue) double? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<double?>(factory, receiver, setter, ConvertToNullableDouble); return CreateBinderCore<double?>(factory, receiver, setter, culture, ConvertToNullableDouble);
} }
/// <summary> /// <summary>
@ -533,14 +555,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<decimal> setter, Action<decimal> setter,
decimal existingValue) decimal existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<decimal>(factory, receiver, setter, ConvertToDecimal); return CreateBinderCore<decimal>(factory, receiver, setter, culture, ConvertToDecimal);
} }
/// <summary> /// <summary>
@ -550,14 +574,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<decimal?> setter, Action<decimal?> setter,
decimal? existingValue) decimal? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<decimal?>(factory, receiver, setter, ConvertToNullableDecimal); return CreateBinderCore<decimal?>(factory, receiver, setter, culture, ConvertToNullableDecimal);
} }
/// <summary> /// <summary>
@ -567,14 +593,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<DateTime> setter, Action<DateTime> setter,
DateTime existingValue) DateTime existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<DateTime>(factory, receiver, setter, ConvertToDateTime); return CreateBinderCore<DateTime>(factory, receiver, setter, culture, ConvertToDateTime);
} }
/// <summary> /// <summary>
@ -584,14 +612,16 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<DateTime?> setter, Action<DateTime?> setter,
DateTime? existingValue) DateTime? existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<DateTime?>(factory, receiver, setter, ConvertToNullableDateTime); return CreateBinderCore<DateTime?>(factory, receiver, setter, culture, ConvertToNullableDateTime);
} }
/// <summary> /// <summary>
@ -602,13 +632,15 @@ namespace Microsoft.AspNetCore.Components
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="format"></param> /// <param name="format"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder( public static EventCallback<UIChangeEventArgs> CreateBinder(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<DateTime> setter, Action<DateTime> setter,
DateTime existingValue, DateTime existingValue,
string format) string format,
CultureInfo culture = null)
{ {
// Avoiding CreateBinderCore so we can avoid an extra allocating lambda // Avoiding CreateBinderCore so we can avoid an extra allocating lambda
// when a format is used. // when a format is used.
@ -618,7 +650,7 @@ namespace Microsoft.AspNetCore.Components
var converted = false; var converted = false;
try try
{ {
value = ConvertDateTime(e.Value, format); value = ConvertDateTime(e.Value, culture, format);
converted = true; converted = true;
} }
catch catch
@ -633,20 +665,20 @@ namespace Microsoft.AspNetCore.Components
}; };
return factory.Create<UIChangeEventArgs>(receiver, callback); return factory.Create<UIChangeEventArgs>(receiver, callback);
static DateTime ConvertDateTime(object obj, string format) static DateTime ConvertDateTime(object obj, CultureInfo culture, string format)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
{ {
return default; return default;
} }
else if (format != null && DateTime.TryParseExact(text, format, CultureInfo.InvariantCulture, DateTimeStyles.RoundtripKind, out var value)) else if (format != null && DateTime.TryParseExact(text, format, culture ?? CultureInfo.CurrentCulture, DateTimeStyles.RoundtripKind, out var value))
{ {
return value; return value;
} }
else else
{ {
return DateTime.Parse(text); return DateTime.Parse(text, culture ?? CultureInfo.CurrentCulture, DateTimeStyles.RoundtripKind);
} }
} }
} }
@ -659,20 +691,23 @@ namespace Microsoft.AspNetCore.Components
/// <param name="receiver"></param> /// <param name="receiver"></param>
/// <param name="setter"></param> /// <param name="setter"></param>
/// <param name="existingValue"></param> /// <param name="existingValue"></param>
/// <param name="culture"></param>
/// <returns></returns> /// <returns></returns>
public static EventCallback<UIChangeEventArgs> CreateBinder<T>( public static EventCallback<UIChangeEventArgs> CreateBinder<T>(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<T> setter, Action<T> setter,
T existingValue) T existingValue,
CultureInfo culture = null)
{ {
return CreateBinderCore<T>(factory, receiver, setter, BinderConverterCache.Get<T>()); return CreateBinderCore<T>(factory, receiver, setter, culture, BinderConverterCache.Get<T>());
} }
private static EventCallback<UIChangeEventArgs> CreateBinderCore<T>( private static EventCallback<UIChangeEventArgs> CreateBinderCore<T>(
this EventCallbackFactory factory, this EventCallbackFactory factory,
object receiver, object receiver,
Action<T> setter, Action<T> setter,
CultureInfo culture,
BindConverter<T> converter) BindConverter<T> converter)
{ {
Action<UIChangeEventArgs> callback = e => Action<UIChangeEventArgs> callback = e =>
@ -681,7 +716,7 @@ namespace Microsoft.AspNetCore.Components
var converted = false; var converted = false;
try try
{ {
converted = converter(e.Value, out value); converted = converter(e.Value, culture, out value);
} }
catch catch
{ {
@ -822,7 +857,7 @@ namespace Microsoft.AspNetCore.Components
return ConvertWithTypeConverter; return ConvertWithTypeConverter;
bool ConvertWithTypeConverter(object obj, out T value) bool ConvertWithTypeConverter(object obj, CultureInfo culture, out T value)
{ {
var text = (string)obj; var text = (string)obj;
if (string.IsNullOrEmpty(text)) if (string.IsNullOrEmpty(text))
@ -832,7 +867,7 @@ namespace Microsoft.AspNetCore.Components
} }
// We intentionally close-over the TypeConverter to cache it. The TypeDescriptor infrastructure is slow. // We intentionally close-over the TypeConverter to cache it. The TypeDescriptor infrastructure is slow.
var converted = typeConverter.ConvertFromString(context: null, CultureInfo.CurrentCulture, text); var converted = typeConverter.ConvertFromString(context: null, culture ?? CultureInfo.CurrentCulture, text);
if (converted == null) if (converted == null)
{ {
value = default; value = default;

4
src/Components/Components/src/Microsoft.AspNetCore.Components.csproj
View File

@ -9,6 +9,10 @@
<RazorLangVersion>3.0</RazorLangVersion> <RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Include="..\..\Shared\src\JsonSerializerOptionsProvider.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authorization" /> <Reference Include="Microsoft.AspNetCore.Authorization" />
<Reference Include="Microsoft.JSInterop" /> <Reference Include="Microsoft.JSInterop" />

2
src/Components/Components/src/Properties/AssemblyInfo.cs
View File

@ -2,7 +2,7 @@ using System.Runtime.CompilerServices;
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Blazor.Build.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Browser.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Web.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Performance, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Components.Server.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Ignitor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Ignitor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

40
src/Components/Components/test/EventCallbackFactoryBinderExtensionsTest.cs
View File

@ -5,6 +5,7 @@ using System;
using System.ComponentModel; using System.ComponentModel;
using System.Globalization; using System.Globalization;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Components namespace Microsoft.AspNetCore.Components
@ -515,6 +516,45 @@ namespace Microsoft.AspNetCore.Components
ex.Message); ex.Message);
} }
[Fact]
[ReplaceCulture("fr-FR", "fr-FR")]
public async Task CreateBinder_NumericType_WithCurrentCulture()
{
// Arrange
var value = 17_000;
var component = new EventCountingComponent();
Action<int> setter = (_) => value = _;
var binder = EventCallback.Factory.CreateBinder(component, setter, value, culture: null);
var expectedValue = 42_000;
// Act
await binder.InvokeAsync(new UIChangeEventArgs() { Value = "42 000,00", });
Assert.Equal(expectedValue, value);
Assert.Equal(1, component.Count);
}
[Fact]
public async Task CreateBinder_NumericType_WithInvariantCulture()
{
// Arrange
var value = 17_000;
var component = new EventCountingComponent();
Action<int> setter = (_) => value = _;
var binder = EventCallback.Factory.CreateBinder(component, setter, value, CultureInfo.InvariantCulture);
var expectedValue = 42_000;
// Act
await binder.InvokeAsync(new UIChangeEventArgs() { Value = "42,000.00", });
Assert.Equal(expectedValue, value);
Assert.Equal(1, component.Count);
}
private class EventCountingComponent : IComponent, IHandleEvent private class EventCountingComponent : IComponent, IHandleEvent
{ {
public int Count; public int Count;

2
src/Components/ComponentsNoDeps.slnf
View File

@ -17,7 +17,7 @@
"Blazor\\testassets\\MonoSanityClient\\MonoSanityClient.csproj", "Blazor\\testassets\\MonoSanityClient\\MonoSanityClient.csproj",
"Blazor\\testassets\\MonoSanity\\MonoSanity.csproj", "Blazor\\testassets\\MonoSanity\\MonoSanity.csproj",
"Blazor\\testassets\\StandaloneApp\\StandaloneApp.csproj", "Blazor\\testassets\\StandaloneApp\\StandaloneApp.csproj",
"Browser\\src\\Microsoft.AspNetCore.Components.Browser.csproj", "Web\\src\\Microsoft.AspNetCore.Components.Web.csproj",
"Components\\perf\\Microsoft.AspNetCore.Components.Performance.csproj", "Components\\perf\\Microsoft.AspNetCore.Components.Performance.csproj",
"Components\\src\\Microsoft.AspNetCore.Components.csproj", "Components\\src\\Microsoft.AspNetCore.Components.csproj",
"Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj", "Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj",

2
src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.csproj
View File

@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<Compile Include="Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs" /> <Compile Include="Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs" />
<Reference Include="Microsoft.AspNetCore.Components.Browser" /> <Reference Include="Microsoft.AspNetCore.Components.Web" />
<Reference Include="Microsoft.AspNetCore.DataProtection" /> <Reference Include="Microsoft.AspNetCore.DataProtection" />
<Reference Include="Microsoft.Extensions.Logging" /> <Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.AspNetCore.SignalR" /> <Reference Include="Microsoft.AspNetCore.SignalR" />

14
src/Components/Server/ref/Microsoft.AspNetCore.Components.Server.netcoreapp3.0.cs
View File

@ -21,13 +21,6 @@ namespace Microsoft.AspNetCore.Builder
public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; } public static Microsoft.AspNetCore.Components.Server.ComponentEndpointConventionBuilder MapBlazorHub<TComponent>(this Microsoft.AspNetCore.Routing.IEndpointRouteBuilder endpoints, string selector, string path, System.Action<Microsoft.AspNetCore.Http.Connections.HttpConnectionDispatcherOptions> configureOptions) where TComponent : Microsoft.AspNetCore.Components.IComponent { throw null; }
} }
} }
namespace Microsoft.AspNetCore.Components.Browser.Rendering
{
public partial class RemoteRendererException : System.Exception
{
public RemoteRendererException(string message) { }
}
}
namespace Microsoft.AspNetCore.Components.Server namespace Microsoft.AspNetCore.Components.Server
{ {
public partial class CircuitOptions public partial class CircuitOptions
@ -91,6 +84,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
public static void NotifyLocationChanged(string uriAbsolute, bool isInterceptedLink) { } public static void NotifyLocationChanged(string uriAbsolute, bool isInterceptedLink) { }
} }
} }
namespace Microsoft.AspNetCore.Components.Web.Rendering
{
public partial class RemoteRendererException : System.Exception
{
public RemoteRendererException(string message) { }
}
}
namespace Microsoft.Extensions.DependencyInjection namespace Microsoft.Extensions.DependencyInjection
{ {
public static partial class ComponentServiceCollectionExtensions public static partial class ComponentServiceCollectionExtensions

4
src/Components/Server/src/Circuits/CircuitHost.cs
View File

@ -5,8 +5,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Web.Rendering;
using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Routing;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;

4
src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
View File

@ -5,8 +5,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Web.Rendering;
using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;

2
src/Components/Server/src/Circuits/RemoteNavigationInterception.cs
View File

@ -5,7 +5,7 @@ using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Routing; using Microsoft.AspNetCore.Components.Routing;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Interop = Microsoft.AspNetCore.Components.Browser.BrowserUriHelperInterop; using Interop = Microsoft.AspNetCore.Components.Web.BrowserUriHelperInterop;
namespace Microsoft.AspNetCore.Components.Server.Circuits namespace Microsoft.AspNetCore.Components.Server.Circuits
{ {

2
src/Components/Server/src/Circuits/RemoteRenderer.cs
View File

@ -14,7 +14,7 @@ using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.JSInterop; using Microsoft.JSInterop;
namespace Microsoft.AspNetCore.Components.Browser.Rendering namespace Microsoft.AspNetCore.Components.Web.Rendering
{ {
internal class RemoteRenderer : HtmlRenderer internal class RemoteRenderer : HtmlRenderer
{ {

2
src/Components/Server/src/Circuits/RemoteRendererException.cs
View File

@ -3,7 +3,7 @@
using System; using System;
namespace Microsoft.AspNetCore.Components.Browser.Rendering namespace Microsoft.AspNetCore.Components.Web.Rendering
{ {
/// <summary> /// <summary>
/// Represents an exception related to remote rendering. /// Represents an exception related to remote rendering.

2
src/Components/Server/src/Circuits/RemoteUriHelper.cs
View File

@ -5,7 +5,7 @@ using System;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Interop = Microsoft.AspNetCore.Components.Browser.BrowserUriHelperInterop; using Interop = Microsoft.AspNetCore.Components.Web.BrowserUriHelperInterop;
namespace Microsoft.AspNetCore.Components.Server.Circuits namespace Microsoft.AspNetCore.Components.Server.Circuits
{ {

8
src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj
View File

@ -12,7 +12,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.AspNetCore.Components.Browser" /> <Reference Include="Microsoft.AspNetCore.Components.Web" />
<Reference Include="Microsoft.AspNetCore.DataProtection" /> <Reference Include="Microsoft.AspNetCore.DataProtection" />
<Reference Include="Microsoft.Extensions.Logging" /> <Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.AspNetCore.SignalR" /> <Reference Include="Microsoft.AspNetCore.SignalR" />
@ -53,10 +53,10 @@
<PropertyGroup> <PropertyGroup>
<!-- <!--
We check in the Release / Production build of blazor.*.js, but not the Debug builds. Consequently the former is always available to embed, the latter is only available We check in the Release / Production build of blazor.*.js, but not the Debug builds. Consequently the former is always available to embed, the latter is only available
if Browser.JS was built locally. Use the Debug build when available and building in Debug configuration. if Web.JS was built locally. Use the Debug build when available and building in Debug configuration.
--> -->
<BlazorServerJSFile>..\..\Browser.JS\dist\Release\blazor.server.js</BlazorServerJSFile> <BlazorServerJSFile>..\..\Web.JS\dist\Release\blazor.server.js</BlazorServerJSFile>
<BlazorServerJSFile Condition="'$(Configuration)' == 'Debug' AND Exists('..\..\Browser.JS\dist\Debug\blazor.server.js')">..\..\Browser.JS\dist\Debug\blazor.server.js</BlazorServerJSFile> <BlazorServerJSFile Condition="'$(Configuration)' == 'Debug' AND Exists('..\..\Web.JS\dist\Debug\blazor.server.js')">..\..\Web.JS\dist\Debug\blazor.server.js</BlazorServerJSFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
src/Components/Server/test/Circuits/CircuitHostTest.cs
View File

@ -7,8 +7,8 @@ using System.Linq;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Web.Rendering;
using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;

4
src/Components/Server/test/Circuits/RemoteComponentContextTest.cs
View File

@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Components.Server.Circuits;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Components.Browser.Rendering namespace Microsoft.AspNetCore.Components.Web.Rendering
{ {
public class RemoteComponentContextTest public class RemoteComponentContextTest
{ {
@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Components.Browser.Rendering
private class FakeClientProxy : IClientProxy private class FakeClientProxy : IClientProxy
{ {
public Task SendCoreAsync(string method, object[] args, CancellationToken cancellationToken = default) public Task SendCoreAsync(string method, object[] args, CancellationToken cancellationToken = default)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }
} }

2
src/Components/Server/test/Circuits/RemoteRendererTest.cs
View File

@ -16,7 +16,7 @@ using Microsoft.JSInterop;
using Moq; using Moq;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Components.Browser.Rendering namespace Microsoft.AspNetCore.Components.Web.Rendering
{ {
public class RemoteRendererTest : HtmlRendererTestBase public class RemoteRendererTest : HtmlRendererTestBase
{ {

4
src/Components/Server/test/Circuits/TestCircuitHost.cs
View File

@ -5,8 +5,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.ExceptionServices; using System.Runtime.ExceptionServices;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using Microsoft.AspNetCore.Components.Browser; using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Browser.Rendering; using Microsoft.AspNetCore.Components.Web.Rendering;
using Microsoft.AspNetCore.Components.Rendering; using Microsoft.AspNetCore.Components.Rendering;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;

0
src/Components/Components/src/JsonSerializerOptionsProvider.cs → src/Components/Shared/src/JsonSerializerOptionsProvider.cs
View File

0
src/Components/Browser.JS/.gitignore → src/Components/Web.JS/.gitignore vendored
View File

0
src/Components/Browser.JS/.npmrc → src/Components/Web.JS/.npmrc
View File

0
src/Components/Browser.JS/Microsoft.AspNetCore.Components.Browser.JS.npmproj → src/Components/Web.JS/Microsoft.AspNetCore.Components.Web.JS.npmproj
View File

0
src/Components/Browser.JS/dist/.gitattributes → src/Components/Web.JS/dist/.gitattributes vendored
View File

4
src/Components/Browser.JS/dist/Release/blazor.server.js → src/Components/Web.JS/dist/Release/blazor.server.js generated vendored
View File

File diff suppressed because one or more lines are too long

1
src/Components/Web.JS/dist/Release/blazor.webassembly.js generated vendored Normal file
View File

File diff suppressed because one or more lines are too long

0
src/Components/Browser.JS/jest.config.js → src/Components/Web.JS/jest.config.js
View File

2
src/Components/Browser.JS/package.json → src/Components/Web.JS/package.json
View File

@ -1,5 +1,5 @@
{ {
"name": "microsoft.aspnetcore.components.browser.js", "name": "microsoft.aspnetcore.components.web.js",
"private": true, "private": true,
"version": "0.0.1", "version": "0.0.1",
"description": "", "description": "",

0
src/Components/Browser.JS/src/.eslintrc.js → src/Components/Web.JS/src/.eslintrc.js
View File

0
src/Components/Browser.JS/src/Boot.Server.ts → src/Components/Web.JS/src/Boot.Server.ts
View File

0
src/Components/Browser.JS/src/Boot.WebAssembly.ts → src/Components/Web.JS/src/Boot.WebAssembly.ts
View File

0
src/Components/Browser.JS/src/BootCommon.ts → src/Components/Web.JS/src/BootCommon.ts
View File

0
src/Components/Browser.JS/src/Environment.ts → src/Components/Web.JS/src/Environment.ts
View File

0
src/Components/Browser.JS/src/GlobalExports.ts → src/Components/Web.JS/src/GlobalExports.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/AutoReconnectCircuitHandler.ts → src/Components/Web.JS/src/Platform/Circuits/AutoReconnectCircuitHandler.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/CircuitHandler.ts → src/Components/Web.JS/src/Platform/Circuits/CircuitHandler.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/CircuitManager.ts → src/Components/Web.JS/src/Platform/Circuits/CircuitManager.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/ComponentDescriptor.ts → src/Components/Web.JS/src/Platform/Circuits/ComponentDescriptor.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts → src/Components/Web.JS/src/Platform/Circuits/DefaultReconnectDisplay.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/ReconnectDisplay.ts → src/Components/Web.JS/src/Platform/Circuits/ReconnectDisplay.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/RenderQueue.ts → src/Components/Web.JS/src/Platform/Circuits/RenderQueue.ts
View File

0
src/Components/Browser.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts → src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
View File

0
src/Components/Browser.JS/src/Platform/Logging/ILogger.ts → src/Components/Web.JS/src/Platform/Logging/ILogger.ts
View File

0
src/Components/Browser.JS/src/Platform/Logging/Loggers.ts → src/Components/Web.JS/src/Platform/Logging/Loggers.ts
View File

0
src/Components/Browser.JS/src/Platform/Mono/MonoDebugger.ts → src/Components/Web.JS/src/Platform/Mono/MonoDebugger.ts
View File

0
src/Components/Browser.JS/src/Platform/Mono/MonoPlatform.ts → src/Components/Web.JS/src/Platform/Mono/MonoPlatform.ts
View File

0
src/Components/Browser.JS/src/Platform/Mono/MonoTypes.d.ts → src/Components/Web.JS/src/Platform/Mono/MonoTypes.d.ts vendored
View File

0
src/Components/Browser.JS/src/Platform/Platform.ts → src/Components/Web.JS/src/Platform/Platform.ts
View File

0
src/Components/Browser.JS/src/Platform/Url.ts → src/Components/Web.JS/src/Platform/Url.ts
View File

2
src/Components/Browser.JS/src/Rendering/BrowserRenderer.ts → src/Components/Web.JS/src/Rendering/BrowserRenderer.ts
View File

@ -436,7 +436,7 @@ function raiseEvent(event: Event, browserRendererId: number, eventHandlerId: num
}; };
return DotNet.invokeMethodAsync( return DotNet.invokeMethodAsync(
'Microsoft.AspNetCore.Components.Browser', 'Microsoft.AspNetCore.Components.Web',
'DispatchEvent', 'DispatchEvent',
eventDescriptor, eventDescriptor,
JSON.stringify(eventArgs.data) JSON.stringify(eventArgs.data)

0
src/Components/Browser.JS/src/Rendering/ElementReferenceCapture.ts → src/Components/Web.JS/src/Rendering/ElementReferenceCapture.ts
View File

0
src/Components/Browser.JS/src/Rendering/EventDelegator.ts → src/Components/Web.JS/src/Rendering/EventDelegator.ts
View File

0
src/Components/Browser.JS/src/Rendering/EventFieldInfo.ts → src/Components/Web.JS/src/Rendering/EventFieldInfo.ts
View File

0
src/Components/Browser.JS/src/Rendering/EventForDotNet.ts → src/Components/Web.JS/src/Rendering/EventForDotNet.ts
View File

0
src/Components/Browser.JS/src/Rendering/LogicalElements.ts → src/Components/Web.JS/src/Rendering/LogicalElements.ts
View File

0
src/Components/Browser.JS/src/Rendering/RenderBatch/OutOfProcessRenderBatch.ts → src/Components/Web.JS/src/Rendering/RenderBatch/OutOfProcessRenderBatch.ts
View File

0
src/Components/Browser.JS/src/Rendering/RenderBatch/RenderBatch.ts → src/Components/Web.JS/src/Rendering/RenderBatch/RenderBatch.ts
View File

0
src/Components/Browser.JS/src/Rendering/RenderBatch/SharedMemoryRenderBatch.ts → src/Components/Web.JS/src/Rendering/RenderBatch/SharedMemoryRenderBatch.ts
View File

0
src/Components/Browser.JS/src/Rendering/RenderBatch/Utf8Decoder.ts → src/Components/Web.JS/src/Rendering/RenderBatch/Utf8Decoder.ts
View File

0
src/Components/Browser.JS/src/Rendering/Renderer.ts → src/Components/Web.JS/src/Rendering/Renderer.ts
View File

0
src/Components/Browser.JS/src/Services/Http.ts → src/Components/Web.JS/src/Services/Http.ts
View File

0
src/Components/Browser.JS/src/Services/UriHelper.ts → src/Components/Web.JS/src/Services/UriHelper.ts
View File

0
src/Components/Browser.JS/src/tsconfig.json → src/Components/Web.JS/src/tsconfig.json
View File

0
src/Components/Browser.JS/src/webpack.config.js → src/Components/Web.JS/src/webpack.config.js
View File

0
src/Components/Browser.JS/src/yarn.lock → src/Components/Web.JS/src/yarn.lock
View File

0
src/Components/Browser.JS/tests/AutoReconnectCircuitHandler.test.ts → src/Components/Web.JS/tests/AutoReconnectCircuitHandler.test.ts
View File

0
src/Components/Browser.JS/tests/CircuitManager.test.ts → src/Components/Web.JS/tests/CircuitManager.test.ts
View File

0
src/Components/Browser.JS/tests/DefaultReconnectDisplay.test.ts → src/Components/Web.JS/tests/DefaultReconnectDisplay.test.ts
View File

0
src/Components/Browser.JS/tests/RenderQueue.test.ts → src/Components/Web.JS/tests/RenderQueue.test.ts
View File

0
src/Components/Browser.JS/tests/tsconfig.json → src/Components/Web.JS/tests/tsconfig.json
View File

0
src/Components/Browser.JS/tsconfig.json → src/Components/Web.JS/tsconfig.json
View File

0
src/Components/Browser.JS/yarn.lock → src/Components/Web.JS/yarn.lock
View File

Some files were not shown because too many files have changed in this diff Show More