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

Merge branch 'master' into merge/release/5.0-preview7-to-master

This commit is contained in:
Pranav K 2020-06-26 13:07:19 -07:00 committed by GitHub
parent 0476892ea8 eeaa85b8d0
commit 8e8f0b447b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
187 changed files with 3070 additions and 1392 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
eng/ProjectReferences.props
View File

@ -67,7 +67,6 @@
<ProjectReferenceProvider Include="Microsoft.JSInterop.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\JSInterop\src\Microsoft.JSInterop.WebAssembly.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Server" ProjectPath="$(RepoRoot)src\Components\WebAssembly\Server\src\Microsoft.AspNetCore.Components.WebAssembly.Server.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj" />
<ProjectReferenceProvider Include="System.Net.Http.WebAssemblyHttpHandler" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Components.WebAssembly" ProjectPath="$(RepoRoot)src\Components\WebAssembly\WebAssembly\src\Microsoft.AspNetCore.Components.WebAssembly.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Testing" ProjectPath="$(RepoRoot)src\Testing\src\Microsoft.AspNetCore.Testing.csproj" />
<ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

278
eng/Version.Details.xml
View File

@ -13,288 +13,288 @@
<Uri>https://github.com/dotnet/blazor</Uri>
<Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="5.0.0-preview.7.20322.5">
<Dependency Name="dotnet-ef" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.7.20322.5">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-preview.8.20325.4">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>dbb4ec7b7b94df404b32d592c658bf5df2dbba55</Sha>
<Sha>3e5ee6c5deb9ad147058c5f9fa4c21a638306840</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Drawing.Common" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.IO.Pipelines" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Net.Http.Json" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Net.Http.Json" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Reflection.Metadata" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Security.Permissions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Security.Principal.Windows" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Text.Encodings.Web" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Text.Json" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Threading.Channels" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Threading.Channels" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.7.20326.1">
<Dependency Name="System.Windows.Extensions" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.7.20326.1">
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-preview.8.20325.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b0f97149538e3dabde2267efa326c76a628a30ff</Sha>
<Sha>4a21529178750aab4b194d54918d0676e0e5833a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20316.1">
<Uri>https://github.com/dotnet/arcade</Uri>
@ -313,4 +313,4 @@
<Sha>5911981d56de6afdaa84b26343ab915c5f9aca56</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
</Dependencies>

152
eng/Versions.props
View File

@ -9,7 +9,7 @@
<AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
<AspNetCorePatchVersion>0</AspNetCorePatchVersion>
<PreReleaseVersionIteration>7</PreReleaseVersionIteration>
<PreReleaseVersionIteration>8</PreReleaseVersionIteration>
<!--
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
-->
@ -66,79 +66,79 @@
<!-- Packages from dotnet/roslyn -->
<MicrosoftNetCompilersToolsetPackageVersion>3.7.0-4.20319.6</MicrosoftNetCompilersToolsetPackageVersion>
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.7.20326.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.7.20326.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.7.20326.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.7.20326.1</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingEventLogPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-preview.7.20326.1</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.7.20326.1</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-preview.7.20326.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.7.20326.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0-preview.7.20326.1</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.0-preview.7.20326.1</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>5.0.0-preview.7.20326.1</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.7.20326.1</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.7.20326.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemReflectionMetadataPackageVersion>5.0.0-preview.7.20326.1</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.7.20326.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.7.20326.1</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.7.20326.1</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.7.20326.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.7.20326.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.7.20326.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-preview.7.20326.1</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0-preview.7.20326.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0-preview.7.20326.1</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>5.0.0-preview.7.20326.1</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.7.20326.1</SystemWindowsExtensionsPackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>5.0.0-preview.8.20325.1</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>5.0.0-preview.8.20325.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-preview.8.20325.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftWin32RegistryPackageVersion>5.0.0-preview.8.20325.1</MicrosoftWin32RegistryPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftWin32SystemEventsPackageVersion>
<MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsCachingAbstractionsPackageVersion>
<MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsCachingMemoryPackageVersion>
<MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
<MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationBinderPackageVersion>
<MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
<MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
<MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationIniPackageVersion>
<MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationJsonPackageVersion>
<MicrosoftExtensionsConfigurationPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationPackageVersion>
<MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
<MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsConfigurationXmlPackageVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
<MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsDependencyInjectionPackageVersion>
<MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
<MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsFileProvidersCompositePackageVersion>
<MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
<MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsHostingAbstractionsPackageVersion>
<MicrosoftExtensionsHostingPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsHostingPackageVersion>
<MicrosoftExtensionsHttpPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsHttpPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
<MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingConfigurationPackageVersion>
<MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingConsolePackageVersion>
<MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingDebugPackageVersion>
<MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingEventSourcePackageVersion>
<MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingEventLogPackageVersion>
<MicrosoftExtensionsLoggingPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingPackageVersion>
<MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsOptionsPackageVersion>
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsPrimitivesPackageVersion>
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-preview.8.20325.1</MicrosoftExtensionsInternalTransportPackageVersion>
<SystemComponentModelAnnotationsPackageVersion>5.0.0-preview.8.20325.1</SystemComponentModelAnnotationsPackageVersion>
<SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-preview.8.20325.1</SystemDiagnosticsDiagnosticSourcePackageVersion>
<SystemDiagnosticsEventLogPackageVersion>5.0.0-preview.8.20325.1</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonPackageVersion>5.0.0-preview.8.20325.1</SystemDrawingCommonPackageVersion>
<SystemIOPipelinesPackageVersion>5.0.0-preview.8.20325.1</SystemIOPipelinesPackageVersion>
<SystemNetHttpJsonPackageVersion>5.0.0-preview.8.20325.1</SystemNetHttpJsonPackageVersion>
<SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-preview.8.20325.1</SystemNetHttpWinHttpHandlerPackageVersion>
<SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-preview.8.20325.1</SystemNetWebSocketsWebSocketProtocolPackageVersion>
<SystemReflectionMetadataPackageVersion>5.0.0-preview.8.20325.1</SystemReflectionMetadataPackageVersion>
<SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-preview.8.20325.1</SystemRuntimeCompilerServicesUnsafePackageVersion>
<SystemSecurityCryptographyCngPackageVersion>5.0.0-preview.8.20325.1</SystemSecurityCryptographyCngPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>5.0.0-preview.8.20325.1</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>5.0.0-preview.8.20325.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>5.0.0-preview.8.20325.1</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0-preview.8.20325.1</SystemSecurityPrincipalWindowsPackageVersion>
<SystemServiceProcessServiceControllerPackageVersion>5.0.0-preview.8.20325.1</SystemServiceProcessServiceControllerPackageVersion>
<SystemTextEncodingsWebPackageVersion>5.0.0-preview.8.20325.1</SystemTextEncodingsWebPackageVersion>
<SystemTextJsonPackageVersion>5.0.0-preview.8.20325.1</SystemTextJsonPackageVersion>
<SystemThreadingChannelsPackageVersion>5.0.0-preview.8.20325.1</SystemThreadingChannelsPackageVersion>
<SystemWindowsExtensionsPackageVersion>5.0.0-preview.8.20325.1</SystemWindowsExtensionsPackageVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.7.20326.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>5.0.0-preview.8.20325.1</MicrosoftNETCorePlatformsPackageVersion>
<!-- Packages from dotnet/blazor -->
<MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefPackageVersion>5.0.0-preview.7.20322.5</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.7.20322.5</MicrosoftEntityFrameworkCorePackageVersion>
<dotnetefPackageVersion>5.0.0-preview.8.20325.4</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>5.0.0-preview.8.20325.4</MicrosoftEntityFrameworkCorePackageVersion>
</PropertyGroup>
<!--
@ -189,16 +189,16 @@
<MicrosoftCodeAnalysisCSharpPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpPackageVersion>
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.4.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
<MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
<MicrosoftIdentityModelLoggingPackageVersion>6.6.0</MicrosoftIdentityModelLoggingPackageVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>6.6.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
<MicrosoftIdentityModelProtocolsWsFederationPackageVersion>6.6.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
<MicrosoftIdentityModelLoggingPackageVersion>5.5.0</MicrosoftIdentityModelLoggingPackageVersion>
<MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.5.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
<MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.5.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
<MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>2.2.1</MicrosoftInternalAspNetCoreH2SpecAllPackageVersion>
<MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
<MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
<MicrosoftOwinTestingPackageVersion>3.0.1</MicrosoftOwinTestingPackageVersion>
<MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
<MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>6.6.0</SystemIdentityModelTokensJwtPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>5.5.0</SystemIdentityModelTokensJwtPackageVersion>
<!-- Packages from 2.1/2.2 branches used for site extension build -->
<MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
<MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
@ -221,7 +221,7 @@
<IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0</IdentityServer4EntityFrameworkStoragePackageVersion>
<MessagePackPackageVersion>2.1.90</MessagePackPackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion>
<MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
<MonoCecilPackageVersion>0.11.2</MonoCecilPackageVersion>
<NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
<NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
<!-- Begin: STOP!!! Razor need to reference the version of JSON that our HOSTS support. -->
@ -250,4 +250,4 @@
<DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.blob.core.windows.net/dotnet/</DotNetAssetRootUrl>
<DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
</PropertyGroup>
</Project>
</Project>

15
src/Components/Components.sln
View File

@ -257,8 +257,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Compon
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Authentication", "Authentication", "{81250121-9B43-40B1-BF11-CE4458F2676C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.HttpHandler", "WebAssembly\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj", "{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Client", "WebAssembly\testassets\Wasm.Authentication.Client\Wasm.Authentication.Client.csproj", "{5F12F7B9-70BE-48F6-922A-3A1E87EE6BF0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Authentication.Shared", "WebAssembly\testassets\Wasm.Authentication.Shared\Wasm.Authentication.Shared.csproj", "{630D5388-7A2F-42DD-9154-1F62A18CBB69}"
@ -1523,18 +1521,6 @@ Global
{6B0D6C08-FC30-4822-9464-4D24FF4CDC17}.Release|x64.Build.0 = Release|Any CPU
{6B0D6C08-FC30-4822-9464-4D24FF4CDC17}.Release|x86.ActiveCfg = Release|Any CPU
{6B0D6C08-FC30-4822-9464-4D24FF4CDC17}.Release|x86.Build.0 = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|x64.ActiveCfg = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|x64.Build.0 = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|x86.ActiveCfg = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Debug|x86.Build.0 = Debug|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|Any CPU.Build.0 = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|x64.ActiveCfg = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|x64.Build.0 = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|x86.ActiveCfg = Release|Any CPU
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C}.Release|x86.Build.0 = Release|Any CPU
{5F12F7B9-70BE-48F6-922A-3A1E87EE6BF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F12F7B9-70BE-48F6-922A-3A1E87EE6BF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F12F7B9-70BE-48F6-922A-3A1E87EE6BF0}.Debug|x64.ActiveCfg = Debug|Any CPU
@ -1687,7 +1673,6 @@ Global
{5CD61479-5181-4A5B-B90F-9F34316248B3} = {81250121-9B43-40B1-BF11-CE4458F2676C}
{6B0D6C08-FC30-4822-9464-4D24FF4CDC17} = {81250121-9B43-40B1-BF11-CE4458F2676C}
{81250121-9B43-40B1-BF11-CE4458F2676C} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
{031AD67E-DDDE-4A20-874A-8D0A791C6F4C} = {7260DED9-22A9-4E9D-92F4-5E8A4404DEAF}
{5F12F7B9-70BE-48F6-922A-3A1E87EE6BF0} = {A7ABAC29-F73F-456D-AE54-46842CFC2E10}
{630D5388-7A2F-42DD-9154-1F62A18CBB69} = {A7ABAC29-F73F-456D-AE54-46842CFC2E10}
{A062ACCE-AB0D-4569-9548-4BC0D9A9174B} = {2FC10057-7A0A-4E34-8302-879925BC0102}

7
src/Components/Components/ref/Microsoft.AspNetCore.Components.netcoreapp.cs
View File

@ -125,8 +125,14 @@ namespace Microsoft.AspNetCore.Components
private readonly object _dummy;
private readonly int _dummyPrimitive;
public ElementReference(string id) { throw null; }
public ElementReference(string id, Microsoft.AspNetCore.Components.ElementReferenceContext? context) { throw null; }
public Microsoft.AspNetCore.Components.ElementReferenceContext? Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public abstract partial class ElementReferenceContext
{
protected ElementReferenceContext() { }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct EventCallback
{
@ -468,6 +474,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
{
public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
protected internal Microsoft.AspNetCore.Components.ElementReferenceContext? ElementReferenceContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }

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

@ -125,8 +125,14 @@ namespace Microsoft.AspNetCore.Components
private readonly object _dummy;
private readonly int _dummyPrimitive;
public ElementReference(string id) { throw null; }
public ElementReference(string id, Microsoft.AspNetCore.Components.ElementReferenceContext? context) { throw null; }
public Microsoft.AspNetCore.Components.ElementReferenceContext? Context { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public abstract partial class ElementReferenceContext
{
protected ElementReferenceContext() { }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public readonly partial struct EventCallback
{
@ -467,6 +473,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
{
public Renderer(System.IServiceProvider serviceProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) { }
public abstract Microsoft.AspNetCore.Components.Dispatcher Dispatcher { get; }
protected internal Microsoft.AspNetCore.Components.ElementReferenceContext? ElementReferenceContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public event System.UnhandledExceptionEventHandler UnhandledSynchronizationException { add { } remove { } }
protected internal int AssignRootComponentId(Microsoft.AspNetCore.Components.IComponent component) { throw null; }
public virtual System.Threading.Tasks.Task DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo fieldInfo, System.EventArgs eventArgs) { throw null; }

25
src/Components/Components/src/ElementReference.cs
View File

@ -23,13 +23,32 @@ namespace Microsoft.AspNetCore.Components
/// </remarks>
public string Id { get; }
public ElementReference(string id)
/// <summary>
/// Gets the <see cref="ElementReferenceContext"/> instance.
/// </summary>
public ElementReferenceContext? Context { get; }
/// <summary>
/// Instantiates a new <see cref="ElementReference" />.
/// </summary>
/// <param name="id">A unique identifier for this <see cref="ElementReference"/>.</param>
/// <param name="context">The nullable <see cref="ElementReferenceContext"/> instance.</param>
public ElementReference(string id, ElementReferenceContext? context)
{
Id = id;
Context = context;
}
internal static ElementReference CreateWithUniqueId()
=> new ElementReference(CreateUniqueId());
/// <summary>
/// Instantiates a new <see cref="ElementReference"/>.
/// </summary>
/// <param name="id">A unique identifier for this <see cref="ElementReference"/>.</param>
public ElementReference(string id) : this(id, null)
{
}
internal static ElementReference CreateWithUniqueId(ElementReferenceContext? context)
=> new ElementReference(CreateUniqueId(), context);
private static string CreateUniqueId()
{

12
src/Components/Components/src/ElementReferenceContext.cs Normal file
View File

@ -0,0 +1,12 @@
// 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
{
/// <summary>
/// Context for an <see cref="ElementReference"/>.
/// </summary>
public abstract class ElementReferenceContext
{
}
}

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;$(DefaultNetCoreTargetFramework)</TargetFrameworks>

2
src/Components/Components/src/RenderTree/RenderTreeDiffBuilder.cs
View File

@ -917,7 +917,7 @@ namespace Microsoft.AspNetCore.Components.RenderTree
private static void InitializeNewElementReferenceCaptureFrame(ref DiffContext diffContext, ref RenderTreeFrame newFrame)
{
var newElementReference = ElementReference.CreateWithUniqueId();
var newElementReference = ElementReference.CreateWithUniqueId(diffContext.Renderer.ElementReferenceContext);
newFrame = newFrame.WithElementReferenceCaptureId(newElementReference.Id);
newFrame.ElementReferenceCaptureAction(newElementReference);
}

6
src/Components/Components/src/RenderTree/Renderer.cs
View File

@ -76,6 +76,12 @@ namespace Microsoft.AspNetCore.Components.RenderTree
/// </summary>
public abstract Dispatcher Dispatcher { get; }
/// <summary>
/// Gets or sets the <see cref="Components.ElementReferenceContext"/> associated with this <see cref="Renderer"/>,
/// if it exists.
/// </summary>
protected internal ElementReferenceContext? ElementReferenceContext { get; protected set; }
/// <summary>
/// Constructs a new component of the specified type.
/// </summary>

3
src/Components/Components/test/Rendering/RendererSynchronizationContextTest.cs
View File

@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Components.Rendering
Thread capturedThread = null;
var e = new ManualResetEventSlim();
// Act
context.Post((_) =>
{
@ -766,7 +766,6 @@ namespace Microsoft.AspNetCore.Components.Rendering
}
[Fact]
[QuarantinedTest]
public async Task InvokeAsync_SyncWorkInAsyncTaskIsCompletedFirst()
{
// Simplified version of ServerComponentRenderingTest.CanDispatchAsyncWorkToSyncContext

1
src/Components/ComponentsNoDeps.slnf
View File

@ -24,7 +24,6 @@
"WebAssembly\\Server\\test\\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj",
"WebAssembly\\WebAssembly.Authentication\\src\\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj",
"WebAssembly\\WebAssembly.Authentication\\test\\Microsoft.AspNetCore.Components.WebAssembly.Authentication.Tests.csproj",
"WebAssembly\\WebAssemblyHttpHandler\\src\\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj",
"WebAssembly\\WebAssembly\\src\\Microsoft.AspNetCore.Components.WebAssembly.csproj",
"WebAssembly\\WebAssembly\\test\\Microsoft.AspNetCore.Components.WebAssembly.Tests.csproj",
"WebAssembly\\testassets\\HostedInAspNet.Client\\HostedInAspNet.Client.csproj",

22
src/Components/Directory.Build.targets
View File

@ -21,26 +21,4 @@
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.targets))\Directory.Build.targets" />
<ItemGroup Condition="'$(FixupWebAssemblyHttpHandlerReference)' == 'true'">
<ProjectReference
Include="$(RepoRoot)src\Components\WebAssembly\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj"
CopyLocal="false" />
</ItemGroup>
<Target Name="_FixupReferenceToWebAssemblyHttpHandler"
Condition="'$(FixupWebAssemblyHttpHandlerReference)' == 'true'"
AfterTargets="_ResolveBlazorInputs"
BeforeTargets="_ResolveBlazorOutputs">
<!--
ProjectReference doesn't really play well with IncludeAssets behavior you get when referencing
the package with IncludeAssets="compile".
-->
<ItemGroup>
<_HttpHandlerAssembly Include="@(_BlazorUserRuntimeAssembly)"
Condition="%(_BlazorUserRuntimeAssembly.ProjectReferenceOriginalItemSpec) == '$(RepoRoot)src\Components\WebAssembly\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj'" />
<_BlazorUserRuntimeAssembly Remove="@(_HttpHandlerAssembly)" />
</ItemGroup>
</Target>
</Project>

3
src/Components/Server/src/Circuits/CircuitFactory.cs
View File

@ -64,7 +64,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
_loggerFactory,
_options,
client,
_loggerFactory.CreateLogger<RemoteRenderer>());
_loggerFactory.CreateLogger<RemoteRenderer>(),
jsRuntime.ElementReferenceContext);
var circuitHandlers = scope.ServiceProvider.GetServices<CircuitHandler>()
.OrderBy(h => h.Order)

5
src/Components/Server/src/Circuits/RemoteJSRuntime.cs
View File

@ -17,12 +17,15 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
private readonly ILogger<RemoteJSRuntime> _logger;
private CircuitClientProxy _clientProxy;
public ElementReferenceContext ElementReferenceContext { get; }
public RemoteJSRuntime(IOptions<CircuitOptions> options, ILogger<RemoteJSRuntime> logger)
{
_options = options.Value;
_logger = logger;
DefaultAsyncTimeout = _options.JSInteropDefaultCallTimeout;
JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
ElementReferenceContext = new WebElementReferenceContext(this);
JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter(ElementReferenceContext));
}
internal void Initialize(CircuitClientProxy clientProxy)

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

@ -37,12 +37,15 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
ILoggerFactory loggerFactory,
CircuitOptions options,
CircuitClientProxy client,
ILogger logger)
ILogger logger,
ElementReferenceContext? elementReferenceContext)
: base(serviceProvider, loggerFactory)
{
_client = client;
_options = options;
_logger = logger;
ElementReferenceContext = elementReferenceContext;
}
public override Dispatcher Dispatcher { get; } = Dispatcher.CreateDefault();

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

@ -258,7 +258,13 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
private class TestRemoteRenderer : RemoteRenderer
{
public TestRemoteRenderer(IServiceProvider serviceProvider, IClientProxy client)
: base(serviceProvider, NullLoggerFactory.Instance, new CircuitOptions(), new CircuitClientProxy(client, "connection"), NullLogger.Instance)
: base(
serviceProvider,
NullLoggerFactory.Instance,
new CircuitOptions(),
new CircuitClientProxy(client, "connection"),
NullLogger.Instance,
null)
{
}

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

@ -437,7 +437,7 @@ namespace Microsoft.AspNetCore.Components.Web.Rendering
private class TestRemoteRenderer : RemoteRenderer
{
public TestRemoteRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory, CircuitOptions options, CircuitClientProxy client, ILogger logger)
: base(serviceProvider, loggerFactory, options, client, logger)
: base(serviceProvider, loggerFactory, options, client, logger, null)
{
}

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

@ -38,7 +38,8 @@ namespace Microsoft.AspNetCore.Components.Server.Circuits
NullLoggerFactory.Instance,
new CircuitOptions(),
clientProxy,
NullLogger.Instance);
NullLogger.Instance,
null);
}
handlers = handlers ?? Array.Empty<CircuitHandler>();

17
src/Components/Server/test/ElementReferenceJsonConverterTest.cs
View File

@ -1,22 +1,31 @@
// 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.
using System;
using System.IO;
using System.Text;
using System.Text.Json;
using Moq;
using Xunit;
namespace Microsoft.AspNetCore.Components
{
public class ElementReferenceJsonConverterTest
{
private readonly ElementReferenceJsonConverter Converter = new ElementReferenceJsonConverter();
private readonly ElementReferenceContext ElementReferenceContext;
private readonly ElementReferenceJsonConverter Converter;
public ElementReferenceJsonConverterTest()
{
ElementReferenceContext = Mock.Of<ElementReferenceContext>();
Converter = new ElementReferenceJsonConverter(ElementReferenceContext);
}
[Fact]
public void Serializing_Works()
{
// Arrange
var elementReference = ElementReference.CreateWithUniqueId();
var elementReference = ElementReference.CreateWithUniqueId(ElementReferenceContext);
var expected = $"{{\"__internalId\":\"{elementReference.Id}\"}}";
var memoryStream = new MemoryStream();
var writer = new Utf8JsonWriter(memoryStream);
@ -34,7 +43,7 @@ namespace Microsoft.AspNetCore.Components
public void Deserializing_Works()
{
// Arrange
var id = ElementReference.CreateWithUniqueId().Id;
var id = ElementReference.CreateWithUniqueId(ElementReferenceContext).Id;
var json = $"{{\"__internalId\":\"{id}\"}}";
var bytes = Encoding.UTF8.GetBytes(json);
var reader = new Utf8JsonReader(bytes);
@ -51,7 +60,7 @@ namespace Microsoft.AspNetCore.Components
public void Deserializing_WithFormatting_Works()
{
// Arrange
var id = ElementReference.CreateWithUniqueId().Id;
var id = ElementReference.CreateWithUniqueId(ElementReferenceContext).Id;
var json =
@$"{{
""__internalId"": ""{id}""

9
src/Components/Shared/src/ElementReferenceJsonConverter.cs
View File

@ -11,6 +11,13 @@ namespace Microsoft.AspNetCore.Components
{
private static readonly JsonEncodedText IdProperty = JsonEncodedText.Encode("__internalId");
private readonly ElementReferenceContext _elementReferenceContext;
public ElementReferenceJsonConverter(ElementReferenceContext elementReferenceContext)
{
_elementReferenceContext = elementReferenceContext;
}
public override ElementReference Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
string id = null;
@ -39,7 +46,7 @@ namespace Microsoft.AspNetCore.Components
throw new JsonException("__internalId is required.");
}
return new ElementReference(id);
return new ElementReference(id, _elementReferenceContext);
}
public override void Write(Utf8JsonWriter writer, ElementReference value, JsonSerializerOptions options)

8
src/Components/Web.JS/dist/Release/blazor.server.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
src/Components/Web.JS/dist/Release/blazor.webassembly.js generated vendored
View File

File diff suppressed because one or more lines are too long

13
src/Components/Web.JS/src/DomWrapper.ts Normal file
View File

@ -0,0 +1,13 @@
import '@microsoft/dotnet-js-interop';
export const domFunctions = {
focus,
};
function focus(element: HTMLElement): void {
if (element instanceof HTMLElement) {
element.focus();
} else {
throw new Error('Unable to focus an invalid element.');
}
}

2
src/Components/Web.JS/src/GlobalExports.ts
View File

@ -1,5 +1,6 @@
import { navigateTo, internalFunctions as navigationManagerInternalFunctions } from './Services/NavigationManager';
import { attachRootComponentToElement } from './Rendering/Renderer';
import { domFunctions } from './DomWrapper';
// Make the following APIs available in global scope for invocation from JS
window['Blazor'] = {
@ -8,5 +9,6 @@ window['Blazor'] = {
_internal: {
attachRootComponentToElement,
navigationManager: navigationManagerInternalFunctions,
domWrapper: domFunctions,
},
};

8
src/Components/Web/ref/Microsoft.AspNetCore.Components.Web.netcoreapp.cs
View File

@ -14,6 +14,14 @@ namespace Microsoft.AspNetCore.Components
public string? Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string? ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public static partial class ElementReferenceExtensions
{
public static System.Threading.Tasks.ValueTask FocusAsync(this Microsoft.AspNetCore.Components.ElementReference elementReference) { throw null; }
}
public partial class WebElementReferenceContext : Microsoft.AspNetCore.Components.ElementReferenceContext
{
public WebElementReferenceContext(Microsoft.JSInterop.IJSRuntime jsRuntime) { }
}
}
namespace Microsoft.AspNetCore.Components.Forms
{

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

@ -14,6 +14,14 @@ namespace Microsoft.AspNetCore.Components
public string? Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string? ValueAttribute { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public static partial class ElementReferenceExtensions
{
public static System.Threading.Tasks.ValueTask FocusAsync(this Microsoft.AspNetCore.Components.ElementReference elementReference) { throw null; }
}
public partial class WebElementReferenceContext : Microsoft.AspNetCore.Components.ElementReferenceContext
{
public WebElementReferenceContext(Microsoft.JSInterop.IJSRuntime jsRuntime) { }
}
}
namespace Microsoft.AspNetCore.Components.Forms
{

12
src/Components/Web/src/DomWrapperInterop.cs Normal file
View File

@ -0,0 +1,12 @@
// 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
{
internal static class DomWrapperInterop
{
private const string Prefix = "Blazor._internal.domWrapper.";
public const string Focus = Prefix + "focus";
}
}

39
src/Components/Web/src/ElementReferenceExtensions.cs Normal file
View File

@ -0,0 +1,39 @@
// 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.
using System;
using System.Threading.Tasks;
using Microsoft.JSInterop;
namespace Microsoft.AspNetCore.Components
{
public static class ElementReferenceExtensions
{
/// <summary>
/// Gives focus to an element given its <see cref="ElementReference"/>.
/// </summary>
/// <param name="elementReference">A reference to the element to focus.</param>
/// <returns>The <see cref="ValueTask"/> representing the asynchronous focus operation.</returns>
public static ValueTask FocusAsync(this ElementReference elementReference)
{
var jsRuntime = elementReference.GetJSRuntime();
if (jsRuntime == null)
{
throw new InvalidOperationException("No JavaScript runtime found.");
}
return jsRuntime.InvokeVoidAsync(DomWrapperInterop.Focus, elementReference);
}
internal static IJSRuntime GetJSRuntime(this ElementReference elementReference)
{
if (!(elementReference.Context is WebElementReferenceContext context))
{
throw new InvalidOperationException("ElementReference has not been configured correctly.");
}
return context.JSRuntime;
}
}
}

18
src/Components/Web/src/WebElementReferenceContext.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.
using System;
using Microsoft.JSInterop;
namespace Microsoft.AspNetCore.Components
{
public class WebElementReferenceContext : ElementReferenceContext
{
internal IJSRuntime JSRuntime { get; }
public WebElementReferenceContext(IJSRuntime jsRuntime)
{
JSRuntime = jsRuntime ?? throw new ArgumentNullException(nameof(jsRuntime));
}
}
}

2
src/Components/WebAssembly/WebAssembly.Authentication/test/RemoteAuthenticatorCoreTests.cs
View File

@ -188,7 +188,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication
var parameters = ParameterView.FromDictionary(new Dictionary<string, object>
{
[_action] = RemoteAuthenticationActions.LogInCallback,
[_onLogInSucceded] = new EventCallbackFactory().Create< RemoteAuthenticationState>(
[_onLogInSucceded] = new EventCallbackFactory().Create<RemoteAuthenticationState>(
remoteAuthenticator,
(state) => loggingSucceededCalled = true),
});

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

@ -23,11 +23,6 @@
Private="false"
Condition="'$(BuildNodeJS)' != 'false' and '$(BuildingInsideVisualStudio)' != 'true'" />
<!-- Tracking removing using https://github.com/dotnet/aspnetcore/issues/22283 -->
<ProjectReference
Include="..\..\WebAssemblyHttpHandler\src\Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj"
IncludeAssets="compile" />
<SuppressBaselineReference Include="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" />
</ItemGroup>

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

@ -34,6 +34,8 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Rendering
// The WebAssembly renderer registers and unregisters itself with the static registry
_webAssemblyRendererId = RendererRegistry.Add(this);
_logger = loggerFactory.CreateLogger<WebAssemblyRenderer>();
ElementReferenceContext = DefaultWebAssemblyJSRuntime.Instance.ElementReferenceContext;
}
public override Dispatcher Dispatcher => NullDispatcher.Instance;

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

@ -10,9 +10,12 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Services
{
internal static readonly DefaultWebAssemblyJSRuntime Instance = new DefaultWebAssemblyJSRuntime();
public ElementReferenceContext ElementReferenceContext { get; }
private DefaultWebAssemblyJSRuntime()
{
JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter());
ElementReferenceContext = new WebElementReferenceContext(this);
JsonSerializerOptions.Converters.Add(new ElementReferenceJsonConverter(ElementReferenceContext));
}
#pragma warning disable IDE0051 // Remove unused private members. Invoked via Mono's JS interop mechanism (invoke_method)

5
src/Components/Blazor/Blazor/test/Rendering/RenderRegistryTest.cs → src/Components/WebAssembly/WebAssembly/test/RenderRegistryTest.cs
View File

@ -1,7 +1,10 @@
// 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.
using System;
using Xunit;
namespace Microsoft.AspNetCore.Blazor.Rendering
namespace Microsoft.AspNetCore.Components.WebAssembly.Rendering
{
public class RenderRegistryTest
{

16
src/Components/WebAssembly/WebAssemblyHttpHandler/src/Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.csproj
View File

@ -1,16 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
<TargetFramework>netstandard2.1</TargetFramework>
<PackageId>$(MSBuildProjectName)</PackageId>
<AssemblyName>System.Net.Http.WebAssemblyHttpHandler</AssemblyName>
<AssemblyVersion>0.2.2.0</AssemblyVersion>
<ProduceOnlyReferenceAssembly>true</ProduceOnlyReferenceAssembly>
<StrongNameKeyId>Open</StrongNameKeyId>
</PropertyGroup>
<ItemGroup>
<NuspecProperty Include="OutputPath=$(OutputPath)" />
</ItemGroup>
</Project>

11
src/Components/WebAssembly/WebAssemblyHttpHandler/src/Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.netstandard2.1.cs
View File

@ -1,11 +0,0 @@
using System;
using System.Net.Http;
namespace System.Net.Http
{
public partial class WebAssemblyHttpHandler : System.Net.Http.HttpMessageHandler
{
public WebAssemblyHttpHandler() { }
protected override System.Threading.Tasks.Task<System.Net.Http.HttpResponseMessage> SendAsync(System.Net.Http.HttpRequestMessage request, System.Threading.CancellationToken cancellationToken) { throw null; }
}
}

13
src/Components/WebAssembly/WebAssemblyHttpHandler/src/Microsoft.AspNetCore.Components.WebAssembly.HttpHandler.nuspec
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
$CommonMetadataElements$
<dependencies>
<group targetFramework=".NETStandard2.1" />
</dependencies>
</metadata>
<files>
$CommonFileElements$
<file src="$OutputPath$System.Net.Http.WebAssemblyHttpHandler.dll" target="lib\netstandard2.1\System.Net.Http.WebAssemblyHttpHandler.dll" />
</files>
</package>

2
src/Components/WebAssembly/testassets/HostedInAspNet.Client/HostedInAspNet.Client.csproj
View File

@ -4,8 +4,6 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<UseBlazorWebAssembly>true</UseBlazorWebAssembly>
<FixupWebAssemblyHttpHandlerReference>true</FixupWebAssemblyHttpHandlerReference>
</PropertyGroup>
<ItemGroup>

2
src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Wasm.Authentication.Client.csproj
View File

@ -4,8 +4,6 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<UseBlazorWebAssembly>true</UseBlazorWebAssembly>
<FixupWebAssemblyHttpHandlerReference>true</FixupWebAssemblyHttpHandlerReference>
</PropertyGroup>
<ItemGroup>

122
src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/GridRendering.razor Normal file
View File

@ -0,0 +1,122 @@
@page "/gridrendering"
@inject IJSRuntime JSRuntime
@using Wasm.Performance.TestApp.Shared.FastGrid
<h1>20 x 200 Grid</h1>
<fieldset>
<select id="render-mode" @bind="selectedRenderMode">
<option>@RenderMode.FastGrid</option>
<option>@RenderMode.PlainTable</option>
<option>@RenderMode.ComplexTable</option>
</select>
<button id="show" @onclick="Show">Show</button>
<button id="hide" @onclick="Hide">Hide</button>
@if (forecasts != null)
{
<button id="change-page" @onclick="ChangePage">Switch pages</button>
}
</fieldset>
@if (forecasts == null)
{
<p><em>(No data assigned)</em></p>
}
else if (selectedRenderMode == RenderMode.FastGrid)
{
<p>FastGrid represents a minimal, optimized implementation of a grid.</p>
<Grid Data="@forecasts">
<GridColumn TRowData="WeatherForecast" Title="Date">@context.Date.ToShortDateString()</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureC">@context.TemperatureC</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureF">@context.TemperatureF</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Summary">@context.Summary</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Date">@context.Date.ToShortDateString()</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureC">@context.TemperatureC</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureF">@context.TemperatureF</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Summary">@context.Summary</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Date">@context.Date.ToShortDateString()</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureC">@context.TemperatureC</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureF">@context.TemperatureF</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Summary">@context.Summary</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Date">@context.Date.ToShortDateString()</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureC">@context.TemperatureC</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureF">@context.TemperatureF</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Summary">@context.Summary</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Date">@context.Date.ToShortDateString()</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureC">@context.TemperatureC</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="TemperatureF">@context.TemperatureF</GridColumn>
<GridColumn TRowData="WeatherForecast" Title="Summary">@context.Summary</GridColumn>
</Grid>
}
else if (selectedRenderMode == RenderMode.PlainTable)
{
<p>PlainTable represents a minimal but not optimized implementation of a grid.</p>
<Wasm.Performance.TestApp.Shared.PlainTable.TableComponent Data="@forecasts" Columns="@Columns" />
}
else if (selectedRenderMode == RenderMode.ComplexTable)
{
<p>ComplexTable represents a maximal, not optimized implementation of a grid, using a wide range of Blazor features at once.</p>
<Wasm.Performance.TestApp.Shared.ComplexTable.TableComponent Data="@forecasts" Columns="@Columns" />
}
@code {
enum RenderMode { PlainTable, ComplexTable, FastGrid }
private RenderMode selectedRenderMode = RenderMode.FastGrid;
private WeatherForecast[] forecasts;
public List<string> Columns { get; set; } = new List<string>
{
"Date", "TemperatureC", "TemperatureF", "Summary",
"Date", "TemperatureC", "TemperatureF", "Summary",
"Date", "TemperatureC", "TemperatureF", "Summary",
"Date", "TemperatureC", "TemperatureF", "Summary",
"Date", "TemperatureC", "TemperatureF", "Summary",
};
private static string[] sampleSummaries = new[] { "Balmy", "Chilly", "Freezing", "Bracing" };
private static WeatherForecast[] staticSampleDataPage1 = Enumerable.Range(0, 200).Select(CreateSampleDataItem).ToArray();
private static WeatherForecast[] staticSampleDataPage2 = Enumerable.Range(200, 200).Select(CreateSampleDataItem).ToArray();
private static WeatherForecast CreateSampleDataItem(int index) => new WeatherForecast
{
Date = DateTime.Now.Date.AddDays(index),
Summary = sampleSummaries[index % sampleSummaries.Length],
TemperatureC = index,
};
void Show()
{
forecasts = staticSampleDataPage1;
}
void Hide()
{
forecasts = null;
}
void ChangePage()
{
forecasts = (forecasts == staticSampleDataPage1) ? staticSampleDataPage2 : staticSampleDataPage1;
}
protected override void OnAfterRender(bool firstRender)
{
BenchmarkEvent.Send(JSRuntime, "Finished rendering table");
}
public class WeatherForecast
{
public DateTime Date { get; set; }
public int TemperatureC { get; set; }
public string Summary { get; set; }
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
}
}

59
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/ComplexTable/Cell.razor Normal file
View File

@ -0,0 +1,59 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<td @attributes="@Attributes"
@onclick="@(() => OnClick.Invoke(CellIndex))"
>
@switch (Field)
{
case "Date":
@Item.Date.ToShortDateString()
break;
case "TemperatureC":
@Item.TemperatureC
break;
case "TemperatureF":
@Item.TemperatureF
break;
case "Summary":
@Item.Summary
break;
}
</td>
@code {
[Parameter]
public WeatherForecast Item { get; set; }
[CascadingParameter]
public TableComponent ParentTable { get; set; }
[Parameter]
public string Field { get; set; }
[Parameter]
public int CellIndex { get; set; }
[Parameter]
public int RowIndex { get; set; }
[Parameter]
public bool Selected { get; set; }
[Parameter]
public string FormatString { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
private protected Dictionary<string, object> Attributes
{
get
{
var attributes = new Dictionary<string, object>();
attributes["tabindex"] = CellIndex;
return attributes;
}
}
}

39
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/ComplexTable/Row.razor Normal file
View File

@ -0,0 +1,39 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<tr class="complex-table-row" style="@rowStyle">
@foreach (var item in Columns)
{
<Cell Item="@Item"
Field="@item"
CellIndex="1"
RowIndex="2"
Selected="@isSelected"
FormatString="foo"
OnClick="@OnCellClick">
</Cell>
}
</tr>
@code {
private bool isSelected = false;
private string rowStyle => isSelected ? "background-color: lightblue;" : "";
[Parameter]
public WeatherForecast Item { get; set; }
[Parameter]
public List<string> Columns { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
Task OnCellClick(int args)
{
isSelected = !isSelected;
return OnClick.Invoke(args);
}
}

19
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/ComplexTable/RowCollection.razor Normal file
View File

@ -0,0 +1,19 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
@foreach (var item in Data)
{
<Row Item="@item" Columns="@Columns"
OnClick="@OnClick"></Row>
}
@code {
[Parameter]
public WeatherForecast[] Data { get; set; }
[Parameter]
public List<string> Columns { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
}

46
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/ComplexTable/TableComponent.razor Normal file
View File

@ -0,0 +1,46 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<table class="table">
<thead>
<tr>
@foreach (var item in Columns)
{
<th>@item</th>
}
</tr>
</thead>
<tbody>
<CascadingValue Value="@this">
<RowCollection Data="@Data"
Columns="@Columns"
OnClick="@RefreshComponent"></RowCollection>
</CascadingValue>
</tbody>
</table>
@code {
[Parameter]
public WeatherForecast[] Data { get; set; }
[Parameter]
public List<string> Columns { get; set; }
DateTime t1;
DateTime t2;
Task RefreshComponent(int index)
{
t1 = DateTime.Now;
StateHasChanged();
return Task.CompletedTask;
}
protected override Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
{
t2 = DateTime.Now;
Console.WriteLine("Refresh Time " + (t2 - t1).TotalMilliseconds);
}
return base.OnAfterRenderAsync(firstRender);
}
}

48
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/FastGrid/Grid.razor Normal file
View File

@ -0,0 +1,48 @@
@typeparam TRowData
<CascadingValue IsFixed="true" Value="this">@ChildContent</CascadingValue>
<table @attributes="@Attributes">
<thead>
<tr>
@foreach (var col in columns)
{
col.RenderHeader(__builder);
}
</tr>
</thead>
<tbody>
@foreach (var item in Data)
{
<tr @key="item.GetHashCode()" class="@(RowClass?.Invoke(item))">
@foreach (var col in columns)
{
col.RenderCell(__builder, item);
}
</tr>
}
</tbody>
</table>
@code {
[Parameter(CaptureUnmatchedValues = true)] public Dictionary<string, object> Attributes { get; set; }
[Parameter] public ICollection<TRowData> Data { get; set; }
[Parameter] public RenderFragment ChildContent { get; set; }
[Parameter] public Func<TRowData, string> RowClass { get; set; }
private List<GridColumn<TRowData>> columns = new List<GridColumn<TRowData>>();
internal void AddColumn(GridColumn<TRowData> column)
{
columns.Add(column);
}
protected override void OnAfterRender(bool firstRender)
{
if (firstRender)
{
// On the first render, we collect the list of columns, then we have to render them.
StateHasChanged();
}
}
}

23
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/FastGrid/GridColumn.razor Normal file
View File

@ -0,0 +1,23 @@
@typeparam TRowData
@using Microsoft.AspNetCore.Components.Rendering
@code {
[CascadingParameter] public Grid<TRowData> OwnerGrid { get; set; }
[Parameter] public string Title { get; set; }
[Parameter] public TRowData RowData { get; set; }
[Parameter] public RenderFragment<TRowData> ChildContent { get; set; }
protected override void OnInitialized()
{
OwnerGrid.AddColumn(this);
}
internal void RenderHeader(RenderTreeBuilder __builder)
{
<th>@Title</th>
}
internal void RenderCell(RenderTreeBuilder __builder, TRowData rowData)
{
<td>@ChildContent(rowData)</td>
}
}

3
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/MainLayout.razor
View File

@ -6,7 +6,8 @@
<a href="renderlist">RenderList</a> |
<a href="json">JSON</a> |
<a href="orgchart">OrgChart</a> |
<a href="timer">Timer</a>
<a href="timer">Timer</a> |
<a href="gridrendering">Grid</a>
<hr />

30
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/PlainTable/Cell.razor Normal file
View File

@ -0,0 +1,30 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<td @onclick="@(() => OnClick.Invoke(1))">
@switch (Field)
{
case "Date":
@Item.Date.ToShortDateString()
break;
case "TemperatureC":
@Item.TemperatureC
break;
case "TemperatureF":
@Item.TemperatureF
break;
case "Summary":
@Item.Summary
break;
}
</td>
@code {
[Parameter]
public WeatherForecast Item { get; set; }
[Parameter]
public string Field { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
}

35
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/PlainTable/Row.razor Normal file
View File

@ -0,0 +1,35 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<tr style="@rowStyle">
@foreach (var item in Columns)
{
<Cell Item="@Item"
Field="@item"
OnClick="@OnCellClick">
</Cell>
}
</tr>
@code {
private bool isSelected = false;
private string rowStyle => isSelected ? "background-color: lightblue;" : "";
[Parameter]
public WeatherForecast Item { get; set; }
[Parameter]
public List<string> Columns { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
Task OnCellClick(int args)
{
isSelected = !isSelected;
return OnClick.Invoke(args);
}
}

19
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/PlainTable/RowCollection.razor Normal file
View File

@ -0,0 +1,19 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
@foreach (var item in Data)
{
<Row Item="@item" Columns="@Columns"
OnClick="@OnClick"></Row>
}
@code {
[Parameter]
public WeatherForecast[] Data { get; set; }
[Parameter]
public List<string> Columns { get; set; }
[Parameter]
public Func<int, Task> OnClick { get; set; }
}

44
src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/PlainTable/TableComponent.razor Normal file
View File

@ -0,0 +1,44 @@
@using WeatherForecast = Pages.GridRendering.WeatherForecast
<table class="table">
<thead>
<tr>
@foreach (var item in Columns)
{
<th>@item</th>
}
</tr>
</thead>
<tbody>
<RowCollection Data="@Data"
Columns="@Columns"
OnClick="@RefreshComponent"></RowCollection>
</tbody>
</table>
@code {
[Parameter]
public WeatherForecast[] Data { get; set; }
[Parameter]
public List<string> Columns { get; set; }
DateTime t1;
DateTime t2;
Task RefreshComponent(int index)
{
t1 = DateTime.Now;
StateHasChanged();
return Task.CompletedTask;
}
protected override Task OnAfterRenderAsync(bool firstRender)
{
if (!firstRender)
{
t2 = DateTime.Now;
Console.WriteLine("Refresh Time " + (t2 - t1).TotalMilliseconds);
}
return base.OnAfterRenderAsync(firstRender);
}
}

105
src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/grid.js Normal file
View File

@ -0,0 +1,105 @@
import { group, benchmark, setup, teardown } from './lib/minibench/minibench.js';
import { receiveEvent } from './util/BenchmarkEvents.js';
import { BlazorApp } from './util/BlazorApp.js';
import { setInputValue } from './util/DOM.js';
group('Grid', () => {
let app;
setup(async () => {
app = new BlazorApp();
await app.start();
app.navigateTo('gridrendering');
});
teardown(() => {
app.dispose();
});
benchmark('PlainTable: From blank', () => measureRenderGridFromBlank(app), {
setup: () => prepare(app, 'PlainTable', false),
descriptor: {
name: 'blazorwasm/render-plaintable-from-blank',
description: 'Time to render plain table from blank (ms)'
}
});
benchmark('PlainTable: Switch pages', () => measureRenderGridSwitchPages(app), {
setup: () => prepare(app, 'PlainTable', true),
descriptor: {
name: 'blazorwasm/render-plaintable-switch-pages',
description: 'Time to render plain table change of page (ms)'
}
});
benchmark('ComplexTable: From blank', () => measureRenderGridFromBlank(app), {
setup: () => prepare(app, 'ComplexTable', false),
descriptor: {
name: 'blazorwasm/render-complextable-from-blank',
description: 'Time to render complex table from blank (ms)'
}
});
benchmark('ComplexTable: Switch pages', () => measureRenderGridSwitchPages(app), {
setup: () => prepare(app, 'ComplexTable', true),
descriptor: {
name: 'blazorwasm/render-complextable-switch-pages',
description: 'Time to render complex table change of page (ms)'
}
});
benchmark('FastGrid: From blank', () => measureRenderGridFromBlank(app), {
setup: () => prepare(app, 'FastGrid', false),
descriptor: {
name: 'blazorwasm/render-fastgrid-from-blank',
description: 'Time to render fast grid from blank (ms)'
}
});
benchmark('FastGrid: Switch pages', () => measureRenderGridSwitchPages(app), {
setup: () => prepare(app, 'FastGrid', true),
descriptor: {
name: 'blazorwasm/render-fastgrid-switch-pages',
description: 'Time to render fast grid change of page (ms)'
}
});
});
async function prepare(app, renderMode, populateTable) {
const renderModeSelect = app.window.document.querySelector('#render-mode');
setInputValue(renderModeSelect, renderMode);
if (populateTable) {
let nextRenderCompletion = receiveEvent('Finished rendering table');
app.window.document.querySelector(populateTable ? '#show' : '#hide').click();
await nextRenderCompletion;
}
}
async function measureRenderGridFromBlank(app) {
const appDocument = app.window.document;
let nextRenderCompletion = receiveEvent('Finished rendering table');
appDocument.querySelector('#hide').click();
await nextRenderCompletion;
if (appDocument.querySelectorAll('tbody tr').length !== 0) {
throw new Error('Wrong number of rows rendered');
}
nextRenderCompletion = receiveEvent('Finished rendering table');
appDocument.querySelector('#show').click();
await nextRenderCompletion;
if (appDocument.querySelectorAll('tbody tr').length !== 200) {
throw new Error('Wrong number of rows rendered');
}
}
async function measureRenderGridSwitchPages(app) {
const appDocument = app.window.document;
let nextRenderCompletion = receiveEvent('Finished rendering table');
appDocument.querySelector('#change-page').click();
await nextRenderCompletion;
}

1
src/Components/benchmarkapps/Wasm.Performance/TestApp/wwwroot/benchmarks/index.js
View File

@ -4,6 +4,7 @@ import './appStartup.js';
import './renderList.js';
import './jsonHandling.js';
import './orgChart.js';
import './grid.js';
import { getBlazorDownloadSize } from './blazorDownloadSize.js';
new HtmlUI('E2E Performance', '#display');

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

@ -6,6 +6,7 @@ using BasicTestApp;
using BasicTestApp.HttpClientTest;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
using Microsoft.AspNetCore.E2ETesting;
using Microsoft.AspNetCore.Testing;
using OpenQA.Selenium;
using OpenQA.Selenium.Support.UI;
using TestServer;
@ -44,6 +45,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23366")]
public void CanSendAndReceiveBytes()
{
IssueRequest("/subdir/api/data");

23
src/Components/test/E2ETest/Tests/ComponentRenderingTest.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
[QuarantinedTest]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23366")]
public void CanRenderTextOnlyComponent()
{
var appElement = Browser.MountTestComponent<TextOnlyComponent>();
@ -400,6 +400,26 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
Browser.Equal("Clicks: 2", () => inputElement.GetAttribute("value"));
}
[Fact]
public void CanUseFocusExtensionToFocusElement()
{
var appElement = Browser.MountTestComponent<ElementFocusComponent>();
var buttonElement = appElement.FindElement(By.Id("focus-button"));
// Make sure the input element isn't focused when the test begins; we don't want
// the test to pass just because the input started as the focused element
Browser.NotEqual("focus-input", getFocusedElementId);
// Click the button whose callback focuses the input element
buttonElement.Click();
// Verify that the input element is focused
Browser.Equal("focus-input", getFocusedElementId);
// A local helper that gets the ID of the focused element.
string getFocusedElementId() => Browser.SwitchTo().ActiveElement().GetAttribute("id");
}
[Fact]
public void CanCaptureReferencesToDynamicallyAddedElements()
{
@ -464,6 +484,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
[QuarantinedTest]
public void CanRenderMarkupBlocks()
{
var appElement = Browser.MountTestComponent<MarkupBlockComponent>();

1
src/Components/test/E2ETest/Tests/EventBubblingTest.cs
View File

@ -48,6 +48,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23366")]
public void BubblingStandardEvent_FiredOnElementWithoutHandler()
{
Browser.FindElement(By.Id("button-without-onclick")).Click();

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

@ -6,6 +6,7 @@ using System.Linq;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure;
using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures;
using Microsoft.AspNetCore.E2ETesting;
using Microsoft.AspNetCore.Testing;
using OpenQA.Selenium;
using Xunit;
using Xunit.Abstractions;
@ -35,6 +36,7 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23366")]
public void BenchmarksRunWithoutError()
{
// In CI, we only verify that the benchmarks run without throwing any

2
src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
View File

@ -10,8 +10,6 @@
<!-- Resx generation on Resources.resx only -->
<GenerateResxSource>false</GenerateResxSource>
<FixupWebAssemblyHttpHandlerReference>true</FixupWebAssemblyHttpHandlerReference>
</PropertyGroup>
<ItemGroup>

13
src/Components/test/testassets/BasicTestApp/ElementFocusComponent.razor Normal file
View File

@ -0,0 +1,13 @@
@using Microsoft.JSInterop
<button id="focus-button" @onclick="FocusInput">Click to focus!</button>
<input id="focus-input" @ref="inputReference" />
@code {
private ElementReference inputReference;
private async Task FocusInput()
{
await inputReference.FocusAsync();
}
}

1
src/Components/test/testassets/BasicTestApp/Index.razor
View File

@ -20,6 +20,7 @@
<option value="BasicTestApp.DataDashComponent">data-* attribute rendering</option>
<option value="BasicTestApp.DispatchingComponent">Dispatching to sync context</option>
<option value="BasicTestApp.DuplicateAttributesComponent">Duplicate attributes</option>
<option value="BasicTestApp.ElementFocusComponent">Element focus component</option>
<option value="BasicTestApp.ElementRefComponent">Element ref component</option>
<option value="BasicTestApp.ErrorComponent">Error throwing</option>
<option value="BasicTestApp.EventBubblingComponent">Event bubbling</option>

2
src/Hosting/Hosting/ref/Microsoft.AspNetCore.Hosting.csproj
View File

@ -16,7 +16,7 @@
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Hosting" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />
</ItemGroup>

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

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Description>ASP.NET Core hosting infrastructure and startup logic for web applications.</Description>
@ -26,7 +26,7 @@
<Reference Include="Microsoft.Extensions.DependencyInjection" />
<Reference Include="Microsoft.Extensions.FileProviders.Physical" />
<Reference Include="Microsoft.Extensions.FileProviders.Composite" />
<Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
<Reference Include="Microsoft.Extensions.Hosting" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Options" />

3
src/Identity/Specification.Tests/src/UserManagerSpecificationTests.cs
View File

@ -1450,7 +1450,6 @@ namespace Microsoft.AspNetCore.Identity.Test
/// </summary>
/// <returns>Task</returns>
[Fact]
[QuarantinedTest]
public async Task ChangePhoneNumberFailsWithWrongPhoneNumber()
{
var manager = CreateManager();
@ -1471,7 +1470,6 @@ namespace Microsoft.AspNetCore.Identity.Test
/// </summary>
/// <returns>Task</returns>
[Fact]
[QuarantinedTest]
public async Task CanVerifyPhoneNumber()
{
var manager = CreateManager();
@ -1519,7 +1517,6 @@ namespace Microsoft.AspNetCore.Identity.Test
/// </summary>
/// <returns>Task</returns>
[Fact]
[QuarantinedTest]
public async Task CanChangeEmailOnlyIfEmailSame()
{
var manager = CreateManager();

4
src/JSInterop/Microsoft.JSInterop.JS/src/package.json
View File

@ -18,9 +18,9 @@
"author": "Microsoft",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/dotnet/extensions/issues"
"url": "https://github.com/dotnet/aspnetcore/issues"
},
"homepage": "https://github.com/dotnet/extensions/tree/master/src/JSInterop#readme",
"homepage": "https://github.com/dotnet/aspnetcore/tree/master/src/JSInterop",
"files": [
"dist/**"
],

6
src/Middleware/CORS/src/Infrastructure/CorsPolicy.cs
View File

@ -30,7 +30,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
{
get
{
if (Headers == null || Headers.Count != 1 || Headers.Count == 1 && Headers[0] != "*")
if (Headers == null || Headers.Count != 1 || Headers[0] != "*")
{
return false;
}
@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
{
get
{
if (Methods == null || Methods.Count != 1 || Methods.Count == 1 && Methods[0] != "*")
if (Methods == null || Methods.Count != 1 || Methods[0] != "*")
{
return false;
}
@ -62,7 +62,7 @@ namespace Microsoft.AspNetCore.Cors.Infrastructure
{
get
{
if (Origins == null || Origins.Count != 1 || Origins.Count == 1 && Origins[0] != "*")
if (Origins == null || Origins.Count != 1 || Origins[0] != "*")
{
return false;
}

7
src/Middleware/Localization/src/CookieRequestCultureProvider.cs
View File

@ -4,7 +4,6 @@
using System;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Internal;
namespace Microsoft.AspNetCore.Localization
{
@ -13,7 +12,7 @@ namespace Microsoft.AspNetCore.Localization
/// </summary>
public class CookieRequestCultureProvider : RequestCultureProvider
{
private static readonly char[] _cookieSeparator = new[] { '|' };
private static readonly char _cookieSeparator = '|';
private static readonly string _culturePrefix = "c=";
private static readonly string _uiCulturePrefix = "uic=";
@ -60,9 +59,7 @@ namespace Microsoft.AspNetCore.Localization
throw new ArgumentNullException(nameof(requestCulture));
}
var seperator = _cookieSeparator[0].ToString();
return string.Join(seperator,
return string.Join(_cookieSeparator,
$"{_culturePrefix}{requestCulture.Culture.Name}",
$"{_uiCulturePrefix}{requestCulture.UICulture.Name}");
}

5
src/Middleware/ResponseCaching/src/ResponseCachingPolicyProvider.cs
View File

@ -34,11 +34,12 @@ namespace Microsoft.AspNetCore.ResponseCaching
public virtual bool AllowCacheLookup(ResponseCachingContext context)
{
var requestHeaders = context.HttpContext.Request.Headers;
var cacheControl = requestHeaders[HeaderNames.CacheControl];
// Verify request cache-control parameters
if (!StringValues.IsNullOrEmpty(requestHeaders[HeaderNames.CacheControl]))
if (!StringValues.IsNullOrEmpty(cacheControl))
{
if (HeaderUtilities.ContainsCacheDirective(requestHeaders[HeaderNames.CacheControl], CacheControlHeaderValue.NoCacheString))
if (HeaderUtilities.ContainsCacheDirective(cacheControl, CacheControlHeaderValue.NoCacheString))
{
context.Logger.RequestWithNoCacheNotCacheable();
return false;

6
src/Middleware/SpaServices.Extensions/src/Proxying/SpaProxy.cs
View File

@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
// Don't forward User-Agent/Accept because of https://github.com/aspnet/JavaScriptServices/issues/1469
// Others just aren't applicable in proxy scenarios
private static readonly string[] NotForwardedWebSocketHeaders = new[] { "Accept", "Connection", "Host", "User-Agent", "Upgrade", "Sec-WebSocket-Key", "Sec-WebSocket-Version" };
private static readonly string[] NotForwardedWebSocketHeaders = new[] { "Accept", "Connection", "Host", "User-Agent", "Upgrade", "Sec-WebSocket-Key", "Sec-WebSocket-Protocol", "Sec-WebSocket-Version" };
public static HttpClient CreateHttpClientForProxy(TimeSpan requestTimeout)
{
@ -209,6 +209,10 @@ namespace Microsoft.AspNetCore.SpaServices.Extensions.Proxy
using (var client = new ClientWebSocket())
{
foreach (var protocol in context.WebSockets.WebSocketRequestedProtocols)
{
client.Options.AddSubProtocol(protocol);
}
foreach (var headerEntry in context.Request.Headers)
{
if (!NotForwardedWebSocketHeaders.Contains(headerEntry.Key, StringComparer.OrdinalIgnoreCase))

1
src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.csproj
View File

@ -2,6 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
<Nullable>annotations</Nullable>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
<Compile Include="Microsoft.AspNetCore.Mvc.Abstractions.netcoreapp.cs" />

189
src/Mvc/Mvc.Abstractions/ref/Microsoft.AspNetCore.Mvc.Abstractions.netcoreapp.cs
View File

@ -33,10 +33,10 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
public partial class ActionDescriptor
{
public ActionDescriptor() { }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata> ActionConstraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo AttributeRouteInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraintMetadata>? ActionConstraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo? AttributeRouteInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor> BoundProperties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual string DisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual string? DisplayName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<object> EndpointMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.FilterDescriptor> FilterDescriptors { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Id { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
{
public ActionInvokerProviderContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext) { }
public Microsoft.AspNetCore.Mvc.ActionContext ActionContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.Abstractions.IActionInvoker? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial interface IActionDescriptorProvider
{
@ -143,8 +143,8 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
{
public ApiDescription() { }
public Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor ActionDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string GroupName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string HttpMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? GroupName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? HttpMethod { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterDescription> ParameterDescriptions { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Collections.Generic.IDictionary<object, object> Properties { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string RelativePath { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
@ -160,21 +160,21 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
public partial class ApiParameterDescription
{
public ApiParameterDescription() { }
public Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo BindingInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object DefaultValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo? BindingInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object? DefaultValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public bool IsRequired { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor ParameterDescriptor { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo RouteInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ApiExplorer.ApiParameterRouteInfo? RouteInfo { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource Source { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class ApiParameterRouteInfo
{
public ApiParameterRouteInfo() { }
public System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint> Constraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object DefaultValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Routing.IRouteConstraint>? Constraints { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object? DefaultValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public bool IsOptional { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class ApiRequestFormat
@ -194,9 +194,9 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
public ApiResponseType() { }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ApiExplorer.ApiResponseFormat> ApiResponseFormats { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public bool IsDefaultResponse { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata? ModelMetadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public int StatusCode { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Type Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Type? Type { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial interface IApiDescriptionProvider
{
@ -218,8 +218,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
public ActionExecutedContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters, object controller) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual bool Canceled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual object Controller { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public virtual System.Exception Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo ExceptionDispatchInfo { get { throw null; } set { } }
public virtual System.Exception? Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo? ExceptionDispatchInfo { get { throw null; } set { } }
public virtual bool ExceptionHandled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
@ -228,26 +228,27 @@ namespace Microsoft.AspNetCore.Mvc.Filters
public ActionExecutingContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters, System.Collections.Generic.IDictionary<string, object> actionArguments, object controller) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual System.Collections.Generic.IDictionary<string, object> ActionArguments { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public virtual object Controller { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public delegate System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext> ActionExecutionDelegate();
public partial class AuthorizationFilterContext : Microsoft.AspNetCore.Mvc.Filters.FilterContext
{
public AuthorizationFilterContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class ExceptionContext : Microsoft.AspNetCore.Mvc.Filters.FilterContext
{
public ExceptionContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual System.Exception Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo ExceptionDispatchInfo { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo? ExceptionDispatchInfo { get { throw null; } set { } }
public virtual bool ExceptionHandled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public abstract partial class FilterContext : Microsoft.AspNetCore.Mvc.ActionContext
{
public FilterContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters) { }
public virtual System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> Filters { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
[return: System.Diagnostics.CodeAnalysis.MaybeNullAttribute]
public TMetadata FindEffectivePolicy<TMetadata>() where TMetadata : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata { throw null; }
public bool IsEffectivePolicy<TMetadata>(TMetadata policy) where TMetadata : Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata { throw null; }
}
@ -349,15 +350,15 @@ namespace Microsoft.AspNetCore.Mvc.Filters
{
public ResourceExecutedContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual bool Canceled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual System.Exception Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo ExceptionDispatchInfo { get { throw null; } set { } }
public virtual System.Exception? Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo? ExceptionDispatchInfo { get { throw null; } set { } }
public virtual bool ExceptionHandled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class ResourceExecutingContext : Microsoft.AspNetCore.Mvc.Filters.FilterContext
{
public ResourceExecutingContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory> valueProviderFactories) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult? Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.IValueProviderFactory> ValueProviderFactories { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public delegate System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Filters.ResourceExecutedContext> ResourceExecutionDelegate();
@ -366,8 +367,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
public ResultExecutedContext(Microsoft.AspNetCore.Mvc.ActionContext actionContext, System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata> filters, Microsoft.AspNetCore.Mvc.IActionResult result, object controller) : base (default(Microsoft.AspNetCore.Mvc.ActionContext), default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.Filters.IFilterMetadata>)) { }
public virtual bool Canceled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual object Controller { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public virtual System.Exception Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo ExceptionDispatchInfo { get { throw null; } set { } }
public virtual System.Exception? Exception { get { throw null; } set { } }
public virtual System.Runtime.ExceptionServices.ExceptionDispatchInfo? ExceptionDispatchInfo { get { throw null; } set { } }
public virtual bool ExceptionHandled { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Mvc.IActionResult Result { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
@ -382,7 +383,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
}
namespace Microsoft.AspNetCore.Mvc.Formatters
{
public partial class FormatterCollection<TFormatter> : System.Collections.ObjectModel.Collection<TFormatter>
public partial class FormatterCollection<TFormatter> : System.Collections.ObjectModel.Collection<TFormatter> where TFormatter : notnull
{
public FormatterCollection() { }
public FormatterCollection(System.Collections.Generic.IList<TFormatter> list) { }
@ -426,7 +427,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
internal InputFormatterResult() { }
public bool HasError { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public bool IsModelSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public object? Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult Failure() { throw null; }
public static System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult> FailureAsync() { throw null; }
public static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult NoValue() { throw null; }
@ -445,8 +446,8 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
public virtual Microsoft.Extensions.Primitives.StringSegment ContentType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual bool ContentTypeIsServerDefined { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public virtual Microsoft.AspNetCore.Http.HttpContext HttpContext { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public virtual object Object { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public virtual System.Type ObjectType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public virtual object? Object { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
public virtual System.Type? ObjectType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] protected set { } }
}
public partial class OutputFormatterWriteContext : Microsoft.AspNetCore.Mvc.Formatters.OutputFormatterCanWriteContext
{
@ -460,18 +461,18 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
{
public BindingInfo() { }
public BindingInfo(Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo other) { }
public string BinderModelName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Type BinderType { get { throw null; } set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource BindingSource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? BinderModelName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Type? BinderType { get { throw null; } set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? BindingSource { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.EmptyBodyBehavior EmptyBodyBehavior { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider PropertyFilterProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Func<Microsoft.AspNetCore.Mvc.ActionContext, bool> RequestPredicate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public static Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo GetBindingInfo(System.Collections.Generic.IEnumerable<object> attributes) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo GetBindingInfo(System.Collections.Generic.IEnumerable<object> attributes, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; }
public Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider? PropertyFilterProvider { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public System.Func<Microsoft.AspNetCore.Mvc.ActionContext, bool>? RequestPredicate { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public static Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo? GetBindingInfo(System.Collections.Generic.IEnumerable<object> attributes) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo? GetBindingInfo(System.Collections.Generic.IEnumerable<object> attributes, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; }
public bool TryApplyBindingInfo(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata modelMetadata) { throw null; }
}
[System.Diagnostics.DebuggerDisplayAttribute("Source: {DisplayName}")]
public partial class BindingSource : System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource>
public partial class BindingSource : System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource?>
{
public static readonly Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource Body;
public static readonly Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource Custom;
@ -489,11 +490,11 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public bool IsFromRequest { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public bool IsGreedy { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public virtual bool CanAcceptDataFrom(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource bindingSource) { throw null; }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource other) { throw null; }
public override bool Equals(object obj) { throw null; }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? other) { throw null; }
public override bool Equals(object? obj) { throw null; }
public override int GetHashCode() { throw null; }
public static bool operator ==(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource s1, Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource s2) { throw null; }
public static bool operator !=(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource s1, Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource s2) { throw null; }
public static bool operator ==(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? s1, Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? s2) { throw null; }
public static bool operator !=(Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? s1, Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? s2) { throw null; }
}
public partial class CompositeBindingSource : Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource
{
@ -524,7 +525,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
}
public partial interface IBindingSourceMetadata
{
Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource BindingSource { get; }
Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource? BindingSource { get; }
}
public partial interface IModelBinder
{
@ -607,9 +608,9 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
private readonly object _dummy;
private readonly int _dummyPrimitive;
public bool IsModelSet { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public object Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public object? Model { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult other) { throw null; }
public override bool Equals(object obj) { throw null; }
public override bool Equals(object? obj) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult Failed() { throw null; }
public override int GetHashCode() { throw null; }
public static bool operator ==(Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult x, Microsoft.AspNetCore.Mvc.ModelBinding.ModelBindingResult y) { throw null; }
@ -620,10 +621,10 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public partial class ModelError
{
public ModelError(System.Exception exception) { }
public ModelError(System.Exception exception, string errorMessage) { }
public ModelError(string errorMessage) { }
public ModelError(System.Exception exception, string? errorMessage) { }
public ModelError(string? errorMessage) { }
public string ErrorMessage { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Exception Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Exception? Exception { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
}
public partial class ModelErrorCollection : System.Collections.ObjectModel.Collection<Microsoft.AspNetCore.Mvc.ModelBinding.ModelError>
{
@ -632,7 +633,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public void Add(string errorMessage) { }
}
[System.Diagnostics.DebuggerDisplayAttribute("{DebuggerToString(),nq}")]
public abstract partial class ModelMetadata : Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider, System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>
public abstract partial class ModelMetadata : Microsoft.AspNetCore.Mvc.ModelBinding.IModelMetadataProvider, System.IEquatable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata?>
{
public static readonly int DefaultOrder;
protected ModelMetadata(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity identity) { }
@ -641,15 +642,15 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public abstract System.Type BinderType { get; }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.BindingSource BindingSource { get; }
public virtual Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ContainerMetadata { get { throw null; } }
public System.Type ContainerType { get { throw null; } }
public System.Type? ContainerType { get { throw null; } }
public abstract bool ConvertEmptyStringToNull { get; }
public abstract string DataTypeName { get; }
public abstract string Description { get; }
public abstract string DisplayFormatString { get; }
public abstract string DisplayName { get; }
public abstract string EditFormatString { get; }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata ElementMetadata { get; }
public System.Type ElementType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata? ElementMetadata { get; }
public System.Type? ElementType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public abstract System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<Microsoft.AspNetCore.Mvc.ModelBinding.EnumGroupAndName, string>> EnumGroupedDisplayNamesAndValues { get; }
public abstract System.Collections.Generic.IReadOnlyDictionary<string, string> EnumNamesAndValues { get; }
public abstract bool HasNonDefaultEditFormat { get; }
@ -671,17 +672,17 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataKind MetadataKind { get { throw null; } }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelBindingMessageProvider ModelBindingMessageProvider { get; }
public System.Type ModelType { get { throw null; } }
public string Name { get { throw null; } }
public string? Name { get { throw null; } }
public abstract string NullDisplayText { get; }
public abstract int Order { get; }
public string ParameterName { get { throw null; } }
public string? ParameterName { get { throw null; } }
public abstract string Placeholder { get; }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelPropertyCollection Properties { get; }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.IPropertyFilterProvider PropertyFilterProvider { get; }
public abstract System.Func<object, object> PropertyGetter { get; }
public string PropertyName { get { throw null; } }
public string? PropertyName { get { throw null; } }
public abstract System.Action<object, object> PropertySetter { get; }
public virtual Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter PropertyValidationFilter { get { throw null; } }
public virtual Microsoft.AspNetCore.Mvc.ModelBinding.Validation.IPropertyValidationFilter? PropertyValidationFilter { get { throw null; } }
public abstract bool ShowForDisplay { get; }
public abstract bool ShowForEdit { get; }
public abstract string SimpleDisplayProperty { get; }
@ -689,8 +690,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public System.Type UnderlyingOrModelType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public abstract bool ValidateChildren { get; }
public abstract System.Collections.Generic.IReadOnlyList<object> ValidatorMetadata { get; }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata other) { throw null; }
public override bool Equals(object obj) { throw null; }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata? other) { throw null; }
public override bool Equals(object? obj) { throw null; }
public string GetDisplayName() { throw null; }
public override int GetHashCode() { throw null; }
public virtual System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata> GetMetadataForProperties(System.Type modelType) { throw null; }
@ -708,7 +709,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public partial class ModelPropertyCollection : System.Collections.ObjectModel.ReadOnlyCollection<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>
{
public ModelPropertyCollection(System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata> properties) : base (default(System.Collections.Generic.IList<Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata>)) { }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata this[string propertyName] { get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata? this[string propertyName] { get { throw null; } }
}
public partial class ModelStateDictionary : System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>, System.Collections.Generic.IReadOnlyCollection<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>, System.Collections.Generic.IReadOnlyDictionary<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>, System.Collections.IEnumerable
{
@ -724,8 +725,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary.KeyEnumerable Keys { get { throw null; } }
public int MaxAllowedErrors { get { throw null; } set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry Root { get { throw null; } }
System.Collections.Generic.IEnumerable<string> System.Collections.Generic.IReadOnlyDictionary<System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>.Keys { get { throw null; } }
System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry> System.Collections.Generic.IReadOnlyDictionary<System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>.Values { get { throw null; } }
System.Collections.Generic.IEnumerable<string> System.Collections.Generic.IReadOnlyDictionary<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>.Keys { get { throw null; } }
System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry> System.Collections.Generic.IReadOnlyDictionary<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>.Values { get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState ValidationState { get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary.ValueEnumerable Values { get { throw null; } }
public void AddModelError(string key, System.Exception exception, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata) { }
@ -742,14 +743,14 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public void Merge(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary dictionary) { }
public bool Remove(string key) { throw null; }
public void SetModelValue(string key, Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult valueProviderResult) { }
public void SetModelValue(string key, object rawValue, string attemptedValue) { }
public void SetModelValue(string key, object? rawValue, string attemptedValue) { }
public static bool StartsWithPrefix(string prefix, string key) { throw null; }
System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>.GetEnumerator() { throw null; }
System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>.GetEnumerator() { throw null; }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
public bool TryAddModelError(string key, System.Exception exception, Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata) { throw null; }
public bool TryAddModelError(string key, string errorMessage) { throw null; }
public bool TryAddModelException(string key, System.Exception exception) { throw null; }
public bool TryGetValue(string key, out Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry value) { throw null; }
public bool TryGetValue(string key, [System.Diagnostics.CodeAnalysis.NotNullWhenAttribute(true)] out Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry? value) { throw null; }
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
public partial struct Enumerator : System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>, System.Collections.IEnumerator, System.IDisposable
{
@ -769,7 +770,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
private readonly int _dummyPrimitive;
public KeyEnumerable(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary dictionary) { throw null; }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary.KeyEnumerator GetEnumerator() { throw null; }
System.Collections.Generic.IEnumerator<string> System.Collections.Generic.IEnumerable<System.String>.GetEnumerator() { throw null; }
System.Collections.Generic.IEnumerator<string> System.Collections.Generic.IEnumerable<string>.GetEnumerator() { throw null; }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
@ -791,7 +792,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
private readonly int _dummyPrimitive;
public PrefixEnumerable(Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary dictionary, string prefix) { throw null; }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateDictionary.Enumerator GetEnumerator() { throw null; }
System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<System.String,Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>.GetEnumerator() { throw null; }
System.Collections.Generic.IEnumerator<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>> System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<string, Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>>.GetEnumerator() { throw null; }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
}
[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
@ -820,13 +821,13 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public abstract partial class ModelStateEntry
{
protected ModelStateEntry() { }
public string AttemptedValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public abstract System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry> Children { get; }
public string? AttemptedValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public abstract System.Collections.Generic.IReadOnlyList<Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry>? Children { get; }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelErrorCollection Errors { get { throw null; } }
public abstract bool IsContainerNode { get; }
public object RawValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object? RawValue { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState ValidationState { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry GetModelStateForProperty(string propertyName);
public abstract Microsoft.AspNetCore.Mvc.ModelBinding.ModelStateEntry? GetModelStateForProperty(string propertyName);
}
public enum ModelValidationState
{
@ -859,11 +860,11 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
public ValueProviderResult(Microsoft.Extensions.Primitives.StringValues values) { throw null; }
public ValueProviderResult(Microsoft.Extensions.Primitives.StringValues values, System.Globalization.CultureInfo culture) { throw null; }
public System.Globalization.CultureInfo Culture { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string FirstValue { get { throw null; } }
public string? FirstValue { get { throw null; } }
public int Length { get { throw null; } }
public Microsoft.Extensions.Primitives.StringValues Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult other) { throw null; }
public override bool Equals(object obj) { throw null; }
public override bool Equals(object? obj) { throw null; }
public System.Collections.Generic.IEnumerator<string> GetEnumerator() { throw null; }
public override int GetHashCode() { throw null; }
public static bool operator ==(Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult x, Microsoft.AspNetCore.Mvc.ModelBinding.ValueProviderResult y) { throw null; }
@ -896,14 +897,14 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Metadata
{
private readonly object _dummy;
private readonly int _dummyPrimitive;
public System.Type ContainerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Type? ContainerType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataKind MetadataKind { get { throw null; } }
public System.Type ModelType { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public string Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Reflection.ParameterInfo ParameterInfo { get { throw null; } }
public System.Reflection.PropertyInfo PropertyInfo { get { throw null; } }
public string? Name { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public System.Reflection.ParameterInfo? ParameterInfo { get { throw null; } }
public System.Reflection.PropertyInfo? PropertyInfo { get { throw null; } }
public bool Equals(Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity other) { throw null; }
public override bool Equals(object obj) { throw null; }
public override bool Equals(object? obj) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity ForParameter(System.Reflection.ParameterInfo parameter) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity ForParameter(System.Reflection.ParameterInfo parameter, System.Type modelType) { throw null; }
public static Microsoft.AspNetCore.Mvc.ModelBinding.Metadata.ModelMetadataIdentity ForProperty(System.Reflection.PropertyInfo propertyInfo, System.Type modelType, System.Type containerType) { throw null; }
@ -1000,17 +1001,19 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
public ValidationEntry(Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata metadata, string key, object model) { throw null; }
public string Key { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata Metadata { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } }
public object Model { get { throw null; } }
public object? Model { get { throw null; } }
}
public partial class ValidationStateDictionary : System.Collections.Generic.ICollection<System.Collections.Generic.KeyValuePair<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>, System.Collections.Generic.IDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>, System.Collections.Generic.IEnumerable<System.Collections.Generic.KeyValuePair<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>, System.Collections.Generic.IReadOnlyCollection<System.Collections.Generic.KeyValuePair<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>>, System.Collections.Generic.IReadOnlyDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>, System.Collections.IEnumerable
{
public ValidationStateDictionary() { }
public int Count { get { throw null; } }
public bool IsReadOnly { get { throw null; } }
public Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry this[object key] { get { throw null; } set { } }
public Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry? this[object key] { get { throw null; } set { } }
public System.Collections.Generic.ICollection<object> Keys { get { throw null; } }
System.Collections.Generic.IEnumerable<object> System.Collections.Generic.IReadOnlyDictionary<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.Keys { get { throw null; } }
System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry> System.Collections.Generic.IReadOnlyDictionary<System.Object,Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.Values { get { throw null; } }
Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry System.Collections.Generic.IDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.this[object key] { get { throw null; } set { } }
Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry System.Collections.Generic.IReadOnlyDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.this[object key] { get { throw null; } }
System.Collections.Generic.IEnumerable<object> System.Collections.Generic.IReadOnlyDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.Keys { get { throw null; } }
System.Collections.Generic.IEnumerable<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry> System.Collections.Generic.IReadOnlyDictionary<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry>.Values { get { throw null; } }
public System.Collections.Generic.ICollection<Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry> Values { get { throw null; } }
public void Add(System.Collections.Generic.KeyValuePair<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry> item) { }
public void Add(object key, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry value) { }
@ -1022,7 +1025,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Validation
public bool Remove(System.Collections.Generic.KeyValuePair<object, Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry> item) { throw null; }
public bool Remove(object key) { throw null; }
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
public bool TryGetValue(object key, out Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry value) { throw null; }
public bool TryGetValue(object key, [System.Diagnostics.CodeAnalysis.MaybeNullWhenAttribute(false)] out Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ValidationStateEntry value) { throw null; }
}
public partial class ValidationStateEntry
{
@ -1050,25 +1053,25 @@ namespace Microsoft.AspNetCore.Mvc.Routing
public int Order { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public bool SuppressLinkGeneration { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public bool SuppressPathMatching { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Template { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class UrlActionContext
{
public UrlActionContext() { }
public string Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Controller { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Fragment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Action { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Controller { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Fragment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object? Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
public partial class UrlRouteContext
{
public UrlRouteContext() { }
public string Fragment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string RouteName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Fragment { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Host { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? Protocol { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public string? RouteName { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
public object? Values { [System.Runtime.CompilerServices.CompilerGeneratedAttribute] get { throw null; } [System.Runtime.CompilerServices.CompilerGeneratedAttribute] set { } }
}
}

16
src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptor.cs
View File

@ -38,42 +38,42 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
/// <summary>
/// Gets or sets the <see cref="Routing.AttributeRouteInfo"/>.
/// </summary>
public AttributeRouteInfo AttributeRouteInfo { get; set; }
public AttributeRouteInfo? AttributeRouteInfo { get; set; }
/// <summary>
/// The set of constraints for this action. Must all be satisfied for the action to be selected.
/// </summary>
public IList<IActionConstraintMetadata> ActionConstraints { get; set; }
public IList<IActionConstraintMetadata>? ActionConstraints { get; set; }
/// <summary>
/// Gets or sets the endpoint metadata for this action.
/// This API is meant for infrastructure and should not be used by application code.
/// </summary>
public IList<object> EndpointMetadata { get; set; }
public IList<object> EndpointMetadata { get; set; } = Array.Empty<ParameterDescriptor>();
/// <summary>
/// The set of parameters associated with this action.
/// </summary>
public IList<ParameterDescriptor> Parameters { get; set; }
public IList<ParameterDescriptor> Parameters { get; set; } = Array.Empty<ParameterDescriptor>();
/// <summary>
/// The set of properties which are model bound.
/// </summary>
public IList<ParameterDescriptor> BoundProperties { get; set; }
public IList<ParameterDescriptor> BoundProperties { get; set; } = Array.Empty<ParameterDescriptor>();
/// <summary>
/// The set of filters associated with this action.
/// </summary>
public IList<FilterDescriptor> FilterDescriptors { get; set; }
public IList<FilterDescriptor> FilterDescriptors { get; set; } = Array.Empty<FilterDescriptor>();
/// <summary>
/// A friendly name for this action.
/// </summary>
public virtual string DisplayName { get; set; }
public virtual string? DisplayName { get; set; }
/// <summary>
/// Stores arbitrary metadata properties associated with the <see cref="ActionDescriptor"/>.
/// </summary>
public IDictionary<object, object> Properties { get; set; }
public IDictionary<object, object> Properties { get; set; } = default!;
}
}

5
src/Mvc/Mvc.Abstractions/src/Abstractions/ActionDescriptorExtensions.cs
View File

@ -24,14 +24,13 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
throw new ArgumentNullException(nameof(actionDescriptor));
}
object value;
if (actionDescriptor.Properties.TryGetValue(typeof(T), out value))
if (actionDescriptor.Properties.TryGetValue(typeof(T), out var value))
{
return (T)value;
}
else
{
return default(T);
return default!;
}
}

2
src/Mvc/Mvc.Abstractions/src/Abstractions/ActionInvokerProviderContext.cs
View File

@ -32,6 +32,6 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
/// <summary>
/// Gets or sets the <see cref="IActionInvoker"/> that will be used to invoke <see cref="ActionContext" />
/// </summary>
public IActionInvoker Result { get; set; }
public IActionInvoker? Result { get; set; }
}
}

6
src/Mvc/Mvc.Abstractions/src/Abstractions/ParameterDescriptor.cs
View File

@ -14,16 +14,16 @@ namespace Microsoft.AspNetCore.Mvc.Abstractions
/// <summary>
/// Gets or sets the parameter name.
/// </summary>
public string Name { get; set; }
public string Name { get; set; } = default!;
/// <summary>
/// Gets or sets the type of the parameter.
/// </summary>
public Type ParameterType { get; set; }
public Type ParameterType { get; set; } = default!;
/// <summary>
/// Gets or sets the <see cref="ModelBinding.BindingInfo"/> for the parameter.
/// </summary>
public BindingInfo BindingInfo { get; set; }
public BindingInfo BindingInfo { get; set; } = default!;
}
}

7
src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintContext.cs
View File

@ -1,6 +1,7 @@
// 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.
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Routing;
@ -15,16 +16,16 @@ namespace Microsoft.AspNetCore.Mvc.ActionConstraints
/// The list of <see cref="ActionSelectorCandidate"/>. This includes all actions that are valid for the current
/// request, as well as their constraints.
/// </summary>
public IReadOnlyList<ActionSelectorCandidate> Candidates { get; set; }
public IReadOnlyList<ActionSelectorCandidate> Candidates { get; set; } = Array.Empty<ActionSelectorCandidate>();
/// <summary>
/// The current <see cref="ActionSelectorCandidate"/>.
/// </summary>
public ActionSelectorCandidate CurrentCandidate { get; set; }
public ActionSelectorCandidate CurrentCandidate { get; set; } = default!;
/// <summary>
/// The <see cref="RouteContext"/>.
/// </summary>
public RouteContext RouteContext { get; set; }
public RouteContext RouteContext { get; set; } = default!;
}
}

2
src/Mvc/Mvc.Abstractions/src/ActionConstraints/ActionConstraintItem.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore.Mvc.ActionConstraints
/// <summary>
/// The <see cref="IActionConstraint"/> associated with <see cref="Metadata"/>.
/// </summary>
public IActionConstraint Constraint { get; set; }
public IActionConstraint Constraint { get; set; } = default!;
/// <summary>
/// The <see cref="IActionConstraintMetadata"/> instance.

28
src/Mvc/Mvc.Abstractions/src/ActionContext.cs
View File

@ -31,10 +31,10 @@ namespace Microsoft.AspNetCore.Mvc
/// <param name="actionContext">The <see cref="ActionContext"/> to copy.</param>
public ActionContext(ActionContext actionContext)
: this(
actionContext?.HttpContext,
actionContext?.RouteData,
actionContext?.ActionDescriptor,
actionContext?.ModelState)
actionContext.HttpContext,
actionContext.RouteData,
actionContext.ActionDescriptor,
actionContext.ModelState)
{
}
@ -97,10 +97,7 @@ namespace Microsoft.AspNetCore.Mvc
/// <remarks>
/// The property setter is provided for unit test purposes only.
/// </remarks>
public ActionDescriptor ActionDescriptor
{
get; set;
}
public ActionDescriptor ActionDescriptor { get; set; } = default!;
/// <summary>
/// Gets or sets the <see cref="Http.HttpContext"/> for the current request.
@ -108,18 +105,12 @@ namespace Microsoft.AspNetCore.Mvc
/// <remarks>
/// The property setter is provided for unit test purposes only.
/// </remarks>
public HttpContext HttpContext
{
get; set;
}
public HttpContext HttpContext { get; set; } = default!;
/// <summary>
/// Gets the <see cref="ModelStateDictionary"/>.
/// </summary>
public ModelStateDictionary ModelState
{
get;
}
public ModelStateDictionary ModelState { get; } = default!;
/// <summary>
/// Gets or sets the <see cref="AspNetCore.Routing.RouteData"/> for the current request.
@ -127,9 +118,6 @@ namespace Microsoft.AspNetCore.Mvc
/// <remarks>
/// The property setter is provided for unit test purposes only.
/// </remarks>
public RouteData RouteData
{
get; set;
}
public RouteData RouteData { get; set; } = default!;
}
}

8
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiDescription.cs
View File

@ -16,17 +16,17 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// Gets or sets <see cref="ActionDescriptor"/> for this api.
/// </summary>
public ActionDescriptor ActionDescriptor { get; set; }
public ActionDescriptor ActionDescriptor { get; set; } = default!;
/// <summary>
/// Gets or sets group name for this api.
/// </summary>
public string GroupName { get; set; }
public string? GroupName { get; set; }
/// <summary>
/// Gets or sets the supported HTTP method for this api, or null if all HTTP methods are supported.
/// </summary>
public string HttpMethod { get; set; }
public string? HttpMethod { get; set; }
/// <summary>
/// Gets a list of <see cref="ApiParameterDescription"/> for this api.
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// Gets or sets relative url path template (relative to application root) for this api.
/// </summary>
public string RelativePath { get; set; }
public string RelativePath { get; set; } = default!;
/// <summary>
/// Gets the list of possible formats for a request.

16
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterDescription.cs
View File

@ -15,37 +15,37 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// Gets or sets the <see cref="ModelMetadata"/>.
/// </summary>
public ModelMetadata ModelMetadata { get; set; }
public ModelMetadata ModelMetadata { get; set; } = default!;
/// <summary>
/// Gets or sets the name.
/// </summary>
public string Name { get; set; }
public string Name { get; set; } = default!;
/// <summary>
/// Gets or sets the <see cref="ApiParameterRouteInfo"/>.
/// </summary>
public ApiParameterRouteInfo RouteInfo { get; set; }
public ApiParameterRouteInfo? RouteInfo { get; set; }
/// <summary>
/// Gets or sets the <see cref="BindingSource"/>.
/// </summary>
public BindingSource Source { get; set; }
public BindingSource Source { get; set; } = default!;
/// <summary>
/// Gets or sets the <see cref="BindingInfo"/>.
/// </summary>
public BindingInfo BindingInfo { get; set; }
public BindingInfo? BindingInfo { get; set; }
/// <summary>
/// Gets or sets the parameter type.
/// </summary>
public Type Type { get; set; }
public Type Type { get; set; } = default!;
/// <summary>
/// Gets or sets the parameter descriptor.
/// </summary>
public ParameterDescriptor ParameterDescriptor { get; set; }
public ParameterDescriptor ParameterDescriptor { get; set; } = default!;
/// <summary>
/// Gets or sets a value that determines if the parameter is required.
@ -63,6 +63,6 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// Gets or sets the default value for a parameter.
/// </summary>
public object DefaultValue { get; set; }
public object? DefaultValue { get; set; }
}
}

4
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiParameterRouteInfo.cs
View File

@ -18,12 +18,12 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// Route constraints are only applied when a value is bound from a URL's path. See
/// <see cref="ApiParameterDescription.Source"/> for the data source considered.
/// </remarks>
public IEnumerable<IRouteConstraint> Constraints { get; set; }
public IEnumerable<IRouteConstraint>? Constraints { get; set; }
/// <summary>
/// Gets or sets the default value for the parameter.
/// </summary>
public object DefaultValue { get; set; }
public object? DefaultValue { get; set; }
/// <summary>
/// Gets a value indicating whether not a parameter is considered optional by routing.

4
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiRequestFormat.cs
View File

@ -13,11 +13,11 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// The formatter used to read this request.
/// </summary>
public IInputFormatter Formatter { get; set; }
public IInputFormatter Formatter { get; set; } = default!;
/// <summary>
/// The media type of the request.
/// </summary>
public string MediaType { get; set; }
public string MediaType { get; set; } = default!;
}
}

4
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseFormat.cs
View File

@ -13,11 +13,11 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <summary>
/// Gets or sets the formatter used to output this response.
/// </summary>
public IOutputFormatter Formatter { get; set; }
public IOutputFormatter Formatter { get; set; } = default!;
/// <summary>
/// Gets or sets the media type of the response.
/// </summary>
public string MediaType { get; set; }
public string MediaType { get; set; } = default!;
}
}

4
src/Mvc/Mvc.Abstractions/src/ApiExplorer/ApiResponseType.cs
View File

@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <remarks>
/// Will be null if <see cref="Type"/> is null or void.
/// </remarks>
public ModelMetadata ModelMetadata { get; set; }
public ModelMetadata? ModelMetadata { get; set; }
/// <summary>
/// Gets or sets the CLR data type of the response or null.
@ -33,7 +33,7 @@ namespace Microsoft.AspNetCore.Mvc.ApiExplorer
/// <c>Microsoft.AspNetCore.Mvc.ProducesAttribute</c> or <c>Microsoft.AspNetCore.Mvc.ProducesResponseTypeAttribute</c> on an action method
/// to specify a response type.
/// </remarks>
public Type Type { get; set; }
public Type? Type { get; set; }
/// <summary>
/// Gets or sets the HTTP response status code.

10
src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutedContext.cs
View File

@ -12,8 +12,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// </summary>
public class ActionExecutedContext : FilterContext
{
private Exception _exception;
private ExceptionDispatchInfo _exceptionDispatchInfo;
private Exception? _exception;
private ExceptionDispatchInfo? _exceptionDispatchInfo;
/// <summary>
/// Instantiates a new <see cref="ActionExecutingContext"/> instance.
@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="System.Exception"/> caught while executing the action or action filters, if
/// any.
/// </summary>
public virtual Exception Exception
public virtual Exception? Exception
{
get
{
@ -69,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
/// <see cref="Exception"/>, if an <see cref="System.Exception"/> was caught and this information captured.
/// </summary>
public virtual ExceptionDispatchInfo ExceptionDispatchInfo
public virtual ExceptionDispatchInfo? ExceptionDispatchInfo
{
get
{
@ -91,6 +91,6 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// <summary>
/// Gets or sets the <see cref="IActionResult"/>.
/// </summary>
public virtual IActionResult Result { get; set; }
public virtual IActionResult Result { get; set; } = default!;
}
}

2
src/Mvc/Mvc.Abstractions/src/Filters/ActionExecutingContext.cs
View File

@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="IActionResult"/> to execute. Setting <see cref="Result"/> to a non-<c>null</c>
/// value inside an action filter will short-circuit the action and any remaining action filters.
/// </summary>
public virtual IActionResult Result { get; set; }
public virtual IActionResult? Result { get; set; }
/// <summary>
/// Gets the arguments to pass when invoking the action. Keys are parameter names.

2
src/Mvc/Mvc.Abstractions/src/Filters/AuthorizationFilterContext.cs
View File

@ -27,6 +27,6 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the result of the request. Setting <see cref="Result"/> to a non-<c>null</c> value inside
/// an authorization filter will short-circuit the remainder of the filter pipeline.
/// </summary>
public virtual IActionResult Result { get; set; }
public virtual IActionResult? Result { get; set; }
}
}

10
src/Mvc/Mvc.Abstractions/src/Filters/ExceptionContext.cs
View File

@ -13,8 +13,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// </summary>
public class ExceptionContext : FilterContext
{
private Exception _exception;
private ExceptionDispatchInfo _exceptionDispatchInfo;
private Exception? _exception;
private ExceptionDispatchInfo? _exceptionDispatchInfo;
/// <summary>
/// Instantiates a new <see cref="ExceptionContext"/> instance.
@ -39,7 +39,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
}
else
{
return _exception;
return _exception!;
}
}
@ -54,7 +54,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
/// <see cref="Exception"/>, if this information was captured.
/// </summary>
public virtual ExceptionDispatchInfo ExceptionDispatchInfo
public virtual ExceptionDispatchInfo? ExceptionDispatchInfo
{
get
{
@ -76,6 +76,6 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// <summary>
/// Gets or sets the <see cref="IActionResult"/>.
/// </summary>
public virtual IActionResult Result { get; set; }
public virtual IActionResult? Result { get; set; }
}
}

4
src/Mvc/Mvc.Abstractions/src/Filters/FilterContext.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
namespace Microsoft.AspNetCore.Mvc.Filters
{
@ -81,6 +82,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// <returns>The implementation of <typeparamref name="TMetadata"/> applied to the action associated with
/// the <see cref="FilterContext"/>
/// </returns>
[return: MaybeNull]
public TMetadata FindEffectivePolicy<TMetadata>() where TMetadata : IFilterMetadata
{
// The most specific policy is the one closest to the action (nearest the end of the list).
@ -93,7 +95,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
}
}
return default(TMetadata);
return default;
}
}
}

4
src/Mvc/Mvc.Abstractions/src/Filters/FilterItem.cs
View File

@ -48,12 +48,12 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// <summary>
/// Gets the <see cref="FilterDescriptor"/> containing the filter metadata.
/// </summary>
public FilterDescriptor Descriptor { get; }
public FilterDescriptor Descriptor { get; } = default!;
/// <summary>
/// Gets or sets the executable <see cref="IFilterMetadata"/> associated with <see cref="Descriptor"/>.
/// </summary>
public IFilterMetadata Filter { get; set; }
public IFilterMetadata Filter { get; set; } = default!;
/// <summary>
/// Gets or sets a value indicating whether or not <see cref="Filter"/> can be reused across requests.

10
src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutedContext.cs
View File

@ -12,8 +12,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// </summary>
public class ResourceExecutedContext : FilterContext
{
private Exception _exception;
private ExceptionDispatchInfo _exceptionDispatchInfo;
private Exception? _exception;
private ExceptionDispatchInfo? _exceptionDispatchInfo;
/// <summary>
/// Creates a new <see cref="ResourceExecutedContext"/>.
@ -44,7 +44,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Setting <see cref="ExceptionHandled"/> to <c>true</c> will also mark the exception as handled.
/// </para>
/// </remarks>
public virtual Exception Exception
public virtual Exception? Exception
{
get
{
@ -77,7 +77,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Setting <see cref="ExceptionHandled"/> to <c>true</c> will also mark the exception as handled.
/// </para>
/// </remarks>
public virtual ExceptionDispatchInfo ExceptionDispatchInfo
public virtual ExceptionDispatchInfo? ExceptionDispatchInfo
{
get
{
@ -115,6 +115,6 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// to resource filters.
/// </para>
/// </remarks>
public virtual IActionResult Result { get; set; }
public virtual IActionResult? Result { get; set; }
}
}

2
src/Mvc/Mvc.Abstractions/src/Filters/ResourceExecutingContext.cs
View File

@ -40,7 +40,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Setting <see cref="Result"/> to a non-<c>null</c> value inside a resource filter will
/// short-circuit execution of additional resource filters and the action itself.
/// </remarks>
public virtual IActionResult Result { get; set; }
public virtual IActionResult? Result { get; set; }
/// <summary>
/// Gets the list of <see cref="IValueProviderFactory"/> instances used by model binding.

8
src/Mvc/Mvc.Abstractions/src/Filters/ResultExecutedContext.cs
View File

@ -12,8 +12,8 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// </summary>
public class ResultExecutedContext : FilterContext
{
private Exception _exception;
private ExceptionDispatchInfo _exceptionDispatchInfo;
private Exception? _exception;
private ExceptionDispatchInfo? _exceptionDispatchInfo;
/// <summary>
/// Instantiates a new <see cref="ResultExecutedContext"/> instance.
@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="System.Exception"/> caught while executing the result or result filters, if
/// any.
/// </summary>
public virtual Exception Exception
public virtual Exception? Exception
{
get
{
@ -80,7 +80,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters
/// Gets or sets the <see cref="System.Runtime.ExceptionServices.ExceptionDispatchInfo"/> for the
/// <see cref="Exception"/>, if an <see cref="System.Exception"/> was caught and this information captured.
/// </summary>
public virtual ExceptionDispatchInfo ExceptionDispatchInfo
public virtual ExceptionDispatchInfo? ExceptionDispatchInfo
{
get
{

2
src/Mvc/Mvc.Abstractions/src/Formatters/FormatterCollection.cs
View File

@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
/// Represents a collection of formatters.
/// </summary>
/// <typeparam name="TFormatter">The type of formatters in the collection.</typeparam>
public class FormatterCollection<TFormatter> : Collection<TFormatter>
public class FormatterCollection<TFormatter> : Collection<TFormatter> where TFormatter : notnull
{
/// <summary>
/// Initializes a new instance of the <see cref="FormatterCollection{TFormatter}"/> class that is empty.

2
src/Mvc/Mvc.Abstractions/src/Formatters/InputFormatterResult.cs
View File

@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
/// <value>
/// <c>null</c> if <see cref="HasError"/> is <c>true</c>.
/// </value>
public object Model { get; }
public object? Model { get; }
/// <summary>
/// Returns an <see cref="InputFormatterResult"/> indicating the <see cref="IInputFormatter.ReadAsync"/>

4
src/Mvc/Mvc.Abstractions/src/Formatters/OutputFormatterCanWriteContext.cs
View File

@ -53,11 +53,11 @@ namespace Microsoft.AspNetCore.Mvc.Formatters
/// <summary>
/// Gets or sets the object to write to the response.
/// </summary>
public virtual object Object { get; protected set; }
public virtual object? Object { get; protected set; }
/// <summary>
/// Gets or sets the <see cref="Type"/> of the object to write to the response.
/// </summary>
public virtual Type ObjectType { get; protected set; }
public virtual Type? ObjectType { get; protected set; }
}
}

5
src/Mvc/Mvc.Abstractions/src/Microsoft.AspNetCore.Mvc.Abstractions.csproj
View File

@ -9,6 +9,7 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
@ -20,8 +21,4 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
<Reference Include="Microsoft.Net.Http.Headers" />
</ItemGroup>
<ItemGroup Label="Shared Source">
<Compile Include="$(SharedSourceRoot)HashCodeCombiner\*.cs" />
</ItemGroup>
</Project>

16
src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingInfo.cs
View File

@ -13,7 +13,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// </summary>
public class BindingInfo
{
private Type _binderType;
private Type? _binderType;
/// <summary>
/// Creates a new <see cref="BindingInfo"/>.
@ -44,12 +44,12 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// <summary>
/// Gets or sets the <see cref="ModelBinding.BindingSource"/>.
/// </summary>
public BindingSource BindingSource { get; set; }
public BindingSource? BindingSource { get; set; }
/// <summary>
/// Gets or sets the binder model name.
/// </summary>
public string BinderModelName { get; set; }
public string? BinderModelName { get; set; }
/// <summary>
/// Gets or sets the <see cref="Type"/> of the <see cref="IModelBinder"/> implementation used to bind the
@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// Also set <see cref="BindingSource"/> if the specified <see cref="IModelBinder"/> implementation does not
/// use values from form data, route values or the query string.
/// </remarks>
public Type BinderType
public Type? BinderType
{
get => _binderType;
set
@ -80,13 +80,13 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// <summary>
/// Gets or sets the <see cref="ModelBinding.IPropertyFilterProvider"/>.
/// </summary>
public IPropertyFilterProvider PropertyFilterProvider { get; set; }
public IPropertyFilterProvider? PropertyFilterProvider { get; set; }
/// <summary>
/// Gets or sets a predicate which determines whether or not the model should be bound based on state
/// from the current request.
/// </summary>
public Func<ActionContext, bool> RequestPredicate { get; set; }
public Func<ActionContext, bool>? RequestPredicate { get; set; }
/// <summary>
/// Gets or sets the value which decides if empty bodies are treated as valid inputs.
@ -104,7 +104,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// <param name="attributes">A collection of attributes which are used to construct <see cref="BindingInfo"/>
/// </param>
/// <returns>A new instance of <see cref="BindingInfo"/>.</returns>
public static BindingInfo GetBindingInfo(IEnumerable<object> attributes)
public static BindingInfo? GetBindingInfo(IEnumerable<object> attributes)
{
var bindingInfo = new BindingInfo();
var isBindingInfoPresent = false;
@ -182,7 +182,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// <param name="attributes">A collection of attributes which are used to construct <see cref="BindingInfo"/>.</param>
/// <param name="modelMetadata">The <see cref="ModelMetadata"/>.</param>
/// <returns>A new instance of <see cref="BindingInfo"/> if any binding metadata was discovered; otherwise or <see langword="null"/>.</returns>
public static BindingInfo GetBindingInfo(IEnumerable<object> attributes, ModelMetadata modelMetadata)
public static BindingInfo? GetBindingInfo(IEnumerable<object> attributes, ModelMetadata modelMetadata)
{
if (attributes == null)
{

10
src/Mvc/Mvc.Abstractions/src/ModelBinding/BindingSource.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
/// A metadata object representing a source of data for model binding.
/// </summary>
[DebuggerDisplay("Source: {DisplayName}")]
public class BindingSource : IEquatable<BindingSource>
public class BindingSource : IEquatable<BindingSource?>
{
/// <summary>
/// A <see cref="BindingSource"/> for the request body.
@ -210,13 +210,13 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
}
/// <inheritdoc />
public bool Equals(BindingSource other)
public bool Equals(BindingSource? other)
{
return string.Equals(other?.Id, Id, StringComparison.Ordinal);
}
/// <inheritdoc />
public override bool Equals(object obj)
public override bool Equals(object? obj)
{
return Equals(obj as BindingSource);
}
@ -228,7 +228,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
}
/// <inheritdoc />
public static bool operator ==(BindingSource s1, BindingSource s2)
public static bool operator ==(BindingSource? s1, BindingSource? s2)
{
if (s1 is null)
{
@ -239,7 +239,7 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding
}
/// <inheritdoc />
public static bool operator !=(BindingSource s1, BindingSource s2)
public static bool operator !=(BindingSource? s1, BindingSource? s2)
{
return !(s1 == s2);
}

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