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

Merge branch 'release/2.1' into dev

This commit is contained in:
Javier Calvarro Nelson 2018-01-26 16:03:24 -08:00
parent c7536a2c39 f319632c1f
commit a08fae1a28
3 changed files with 2 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationTestFixture.cs
View File

@ -57,7 +57,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your /// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your
/// application. The folder of the first .sln file found traversing up the folder hierarchy from the test execution /// application. The folder of the first .sln file found traversing up the folder hierarchy from the test execution
/// folder is considered as the base path.</param> /// folder is considered as the base path.</param>
public WebApplicationTestFixture(string solutionRelativePath) protected WebApplicationTestFixture(string solutionRelativePath)
: this("*.sln", solutionRelativePath) : this("*.sln", solutionRelativePath)
{ {
} }
@ -83,7 +83,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
/// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your /// <param name="solutionRelativePath">The path to the project folder relative to the solution file of your
/// application. The folder of the first sln file that matches the <paramref name="solutionSearchPattern"/> /// application. The folder of the first sln file that matches the <paramref name="solutionSearchPattern"/>
/// found traversing up the folder hierarchy from the test execution folder is considered as the base path.</param> /// found traversing up the folder hierarchy from the test execution folder is considered as the base path.</param>
public WebApplicationTestFixture(string solutionSearchPattern, string solutionRelativePath) protected WebApplicationTestFixture(string solutionSearchPattern, string solutionRelativePath)
{ {
EnsureDepsFile(); EnsureDepsFile();

138
src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
View File

@ -1,140 +1,2 @@
{ {
"AssemblyIdentity": "Microsoft.AspNetCore.Mvc.Testing, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60",
"Types": [
{
"Name": "Microsoft.AspNetCore.Mvc.Testing.WebApplicationTestFixture<T0>",
"Visibility": "Public",
"Kind": "Class",
"ImplementedInterfaces": [
"System.IDisposable"
],
"Members": [
{
"Kind": "Method",
"Name": "CreateWebHostBuilder",
"Parameters": [],
"ReturnType": "Microsoft.AspNetCore.Hosting.IWebHostBuilder",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateServer",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
}
],
"ReturnType": "Microsoft.AspNetCore.TestHost.TestServer",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "ConfigureWebHost",
"Parameters": [
{
"Name": "builder",
"Type": "Microsoft.AspNetCore.Hosting.IWebHostBuilder"
}
],
"ReturnType": "System.Void",
"Virtual": true,
"Visibility": "Protected",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "get_Client",
"Parameters": [],
"ReturnType": "System.Net.Http.HttpClient",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateClient",
"Parameters": [],
"ReturnType": "System.Net.Http.HttpClient",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "CreateClient",
"Parameters": [
{
"Name": "baseAddress",
"Type": "System.Uri"
},
{
"Name": "handlers",
"Type": "System.Net.Http.DelegatingHandler[]",
"IsParams": true
}
],
"ReturnType": "System.Net.Http.HttpClient",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Method",
"Name": "Dispose",
"Parameters": [],
"ReturnType": "System.Void",
"Sealed": true,
"Virtual": true,
"ImplementedInterface": "System.IDisposable",
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "solutionRelativePath",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
},
{
"Kind": "Constructor",
"Name": ".ctor",
"Parameters": [
{
"Name": "solutionSearchPattern",
"Type": "System.String"
},
{
"Name": "solutionRelativePath",
"Type": "System.String"
}
],
"Visibility": "Public",
"GenericParameter": []
}
],
"GenericParameters": [
{
"ParameterName": "TStartup",
"ParameterPosition": 0,
"Class": true,
"BaseTypeOrInterfaces": []
}
]
}
]
} }

12
src/Microsoft.AspNetCore.Mvc.Testing/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Testing.targets
View File

@ -15,18 +15,6 @@
<PreserveCompilationContext>true</PreserveCompilationContext> <PreserveCompilationContext>true</PreserveCompilationContext>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' != 'netcoreapp2.0' ">
<!-- Work around https://github.com/dotnet/sdk/issues/926. Align with bitness of the web site projects. -->
<PlatformTarget>x86</PlatformTarget>
<!--
Work around https://github.com/Microsoft/vstest/issues/428 aka https://github.com/aspnet/Mvc/issues/5873.
Create the appropriate binding redirects.
-->
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<Target Name="CopyAditionalFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''"> <Target Name="CopyAditionalFiles" AfterTargets="Build" Condition="'$(TargetFramework)'!=''">
<ItemGroup> <ItemGroup>
<DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" /> <DepsFilePaths Include="$([System.IO.Path]::ChangeExtension('%(_ResolvedProjectReferencePaths.FullPath)', '.deps.json'))" />