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

Merge branch 'release/3.0' => 'release/3.1' (#13670)

This commit is contained in:
Doug Bunting 2019-09-04 23:13:19 -07:00 committed by GitHub
parent 3368ea6f9c 7349b19e1e
commit 5f6c0d3fe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eng/Version.Details.xml
View File

@ -29,33 +29,33 @@
<Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
<Sha>3187623392c21b80c33e3f4df1d135aaae66d530</Sha>
</Dependency>
<Dependency Name="dotnet-ef" Version="3.0.0-rc1.19452.2">
<Dependency Name="dotnet-ef" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-rc1.19452.2">
<Dependency Name="Microsoft.EntityFrameworkCore" Version="3.0.0-rc1.19453.10">
<Uri>https://github.com/aspnet/EntityFrameworkCore</Uri>
<Sha>1fb2df37e48893435d3c7ab40e7060ec3bc08f8f</Sha>
<Sha>b9f518ead6bf4c4b03037413a541adf91e740f4c</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzer.Testing" Version="3.0.0-rc1.19452.2" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://github.com/aspnet/Extensions</Uri>

14
eng/Versions.props
View File

@ -151,13 +151,13 @@
<MicrosoftJSInteropPackageVersion>3.0.0-rc1.19452.2</MicrosoftJSInteropPackageVersion>
<MonoWebAssemblyInteropPackageVersion>3.0.0-rc1.19452.2</MonoWebAssemblyInteropPackageVersion>
<!-- Packages from aspnet/EntityFrameworkCore -->
<dotnetefPackageVersion>3.0.0-rc1.19452.2</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>3.0.0-rc1.19452.2</MicrosoftEntityFrameworkCorePackageVersion>
<dotnetefPackageVersion>3.0.0-rc1.19453.10</dotnetefPackageVersion>
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
<MicrosoftEntityFrameworkCoreRelationalPackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
<MicrosoftEntityFrameworkCoreSqlitePackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
<MicrosoftEntityFrameworkCoreSqlServerPackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<MicrosoftEntityFrameworkCoreToolsPackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCoreToolsPackageVersion>
<MicrosoftEntityFrameworkCorePackageVersion>3.0.0-rc1.19453.10</MicrosoftEntityFrameworkCorePackageVersion>
<!-- Packages from aspnet/AspNetCore-Tooling -->
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>3.0.0-rc1.19452.2</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
<MicrosoftAspNetCoreRazorLanguagePackageVersion>3.0.0-rc1.19452.2</MicrosoftAspNetCoreRazorLanguagePackageVersion>

2
src/Analyzers/Analyzers/src/StartupAnalyzer.Diagnostics.cs
View File

@ -37,7 +37,7 @@ namespace Microsoft.AspNetCore.Analyzers
internal readonly static DiagnosticDescriptor UnsupportedUseMvcWithEndpointRouting = new DiagnosticDescriptor(
"MVC1005",
"Cannot use UseMvc with Endpoint Routing.",
"Using '{0}' to configure MVC is not supported while using Endpoint Routing. To continue using '{0}', please set 'MvcOptions.EnableEndpointRounting = false' inside '{1}'.",
"Using '{0}' to configure MVC is not supported while using Endpoint Routing. To continue using '{0}', please set 'MvcOptions.EnableEndpointRouting = false' inside '{1}'.",
"Usage",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,

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

File diff suppressed because one or more lines are too long

8
src/Components/Web.JS/src/Platform/Circuits/UserSpecifiedDisplay.ts
View File

@ -6,7 +6,7 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
static readonly FailedClassName = 'components-reconnect-failed';
static readonly RefusedClassName = 'components-reconnect-refused';
static readonly RejectedClassName = 'components-reconnect-rejected';
constructor(private dialog: HTMLElement) {
}
@ -25,13 +25,13 @@ export class UserSpecifiedDisplay implements ReconnectDisplay {
this.removeClasses();
this.dialog.classList.add(UserSpecifiedDisplay.FailedClassName);
}
rejected(): void {
this.removeClasses();
this.dialog.classList.add(UserSpecifiedDisplay.RefusedClassName);
this.dialog.classList.add(UserSpecifiedDisplay.RejectedClassName);
}
private removeClasses() {
this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.HideClassName, UserSpecifiedDisplay.FailedClassName, UserSpecifiedDisplay.RefusedClassName);
this.dialog.classList.remove(UserSpecifiedDisplay.ShowClassName, UserSpecifiedDisplay.HideClassName, UserSpecifiedDisplay.FailedClassName, UserSpecifiedDisplay.RejectedClassName);
}
}

3
src/Framework/test/TargetingPackTests.cs
View File

@ -34,9 +34,6 @@ namespace Microsoft.AspNetCore
IEnumerable<string> dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories);
Assert.NotEmpty(dlls);
// Workaround https://github.com/aspnet/AspNetCore/issues/11206
dlls = dlls.Where(d => !d.Contains("System.IO.Pipelines"));
Assert.All(dlls, path =>
{
var assemblyName = AssemblyName.GetAssemblyName(path);