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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-09-28 11:44:54 -07:00
parent e01fbe420f ef21286792
commit 9f6fd02bba
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
6 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Directory.Build.props
View File

@ -14,9 +14,6 @@
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot> <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly> <SignAssembly>true</SignAssembly>
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
<PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<UseRoutingFromFeatureBranch>true</UseRoutingFromFeatureBranch> <UseRoutingFromFeatureBranch>true</UseRoutingFromFeatureBranch>
</PropertyGroup> </PropertyGroup>

2
src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
View File

@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SignedPackageFile Include="analyzers/dotnet/cs/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" /> <SignedPackageFile Include="$(TargetPath)" PackagePath="analyzers/dotnet/cs/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build"> <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">

2
src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
View File

@ -20,7 +20,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SignedPackageFile Include="analyzers/dotnet/cs/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" /> <SignedPackageFile Include="$(TargetPath)" PackagePath="analyzers/dotnet/cs/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build"> <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="Build">

7
src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs
View File

@ -43,6 +43,13 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
return; return;
} }
// We do not have an upper bound on the allowed status code. This allows this filter to be used
// for 5xx and later status codes.
if (clientError.StatusCode < 400)
{
return;
}
var result = _clientErrorFactory.GetClientError(context, clientError); var result = _clientErrorFactory.GetClientError(context, clientError);
if (result == null) if (result == null)
{ {

2
src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
View File

@ -22,7 +22,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<SignedPackageFile Include="lib/$(TargetFramework)/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" /> <SignedPackageFile Include="$(TargetPath)" PackagePath="lib/$(TargetFramework)/$(TargetFileName)" Certificate="$(AssemblySigningCertName)" />
</ItemGroup> </ItemGroup>
<Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;DocumentationProjectOutputGroup"> <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec" DependsOnTargets="BuiltProjectOutputGroup;DebugSymbolsProjectOutputGroup;DocumentationProjectOutputGroup">

36
test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs
View File

@ -68,6 +68,42 @@ namespace Microsoft.AspNetCore.Mvc.Infrastructure
Assert.Same(Result, context.Result); Assert.Same(Result, context.Result);
} }
[Theory]
[InlineData(400)]
[InlineData(409)]
[InlineData(503)]
public void OnResultExecuting_Transforms4XXStatusCodeResult(int statusCode)
{
// Arrange
var actionResult = new StatusCodeResult(statusCode);
var context = GetContext(actionResult);
var filter = GetFilter();
// Act
filter.OnResultExecuting(context);
// Assert
Assert.Same(Result, context.Result);
}
[Theory]
[InlineData(201)]
[InlineData(302)]
[InlineData(399)]
public void OnResultExecuting_DoesNotTransformStatusCodesLessThan400(int statusCode)
{
// Arrange
var actionResult = new StatusCodeResult(statusCode);
var context = GetContext(actionResult);
var filter = GetFilter();
// Act
filter.OnResultExecuting(context);
// Assert
Assert.Same(actionResult, context.Result);
}
private static ClientErrorResultFilter GetFilter() private static ClientErrorResultFilter GetFilter()
{ {
var factory = Mock.Of<IClientErrorFactory>( var factory = Mock.Of<IClientErrorFactory>(