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

Merge remote-tracking branch 'origin/rel/2.0.0-preview1' into dev

This commit is contained in:
Mike Harder 2017-05-05 09:38:50 -07:00
parent c1b04b8a3c 5f8417779d
commit bf62fa71ab
9 changed files with 10 additions and 1135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AspNetCoreVersion>2.0.0-*</AspNetCoreVersion> <AspNetCoreVersion>2.0.0-*</AspNetCoreVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<InternalAspNetCoreSdkVersion>2.0.0-*</InternalAspNetCoreSdkVersion> <InternalAspNetCoreSdkVersion>2.1.0-*</InternalAspNetCoreSdkVersion>
<MoqVersion>4.7.1</MoqVersion> <MoqVersion>4.7.1</MoqVersion>
<NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion> <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
<TestSdkVersion>15.0.0</TestSdkVersion> <TestSdkVersion>15.0.0</TestSdkVersion>

2
samples/SampleDestination/Program.cs
View File

@ -3,6 +3,7 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
namespace SampleDestination namespace SampleDestination
{ {
@ -14,6 +15,7 @@ namespace SampleDestination
.UseKestrel() .UseKestrel()
.UseUrls("http://*:5000") .UseUrls("http://*:5000")
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.ConfigureLogging(factory => factory.AddConsole())
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

4
samples/SampleDestination/Startup.cs
View File

@ -16,10 +16,8 @@ namespace SampleDestination
services.AddCors(); services.AddCors();
} }
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app, IHostingEnvironment env)
{ {
loggerFactory.AddConsole();
app.UseCors(policy => policy app.UseCors(policy => policy
.WithOrigins("http://origin.example.com:5001") .WithOrigins("http://origin.example.com:5001")
.WithMethods("PUT") .WithMethods("PUT")

2
samples/SampleOrigin/Program.cs
View File

@ -3,6 +3,7 @@
using System.IO; using System.IO;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Logging;
namespace SampleOrigin namespace SampleOrigin
{ {
@ -14,6 +15,7 @@ namespace SampleOrigin
.UseKestrel() .UseKestrel()
.UseUrls("http://*:5001") .UseUrls("http://*:5001")
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.ConfigureLogging(factory => factory.AddConsole())
.UseStartup<Startup>() .UseStartup<Startup>()
.Build(); .Build();

3
samples/SampleOrigin/Startup.cs
View File

@ -15,9 +15,8 @@ namespace SampleOrigin
{ {
} }
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app, IHostingEnvironment env)
{ {
loggerFactory.AddConsole();
app.Run(context => app.Run(context =>
{ {
var fileInfoProvider = env.WebRootFileProvider; var fileInfoProvider = env.WebRootFileProvider;

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

@ -7,7 +7,7 @@
Commonly used types: Commonly used types:
Microsoft.AspNetCore.Cors.DisableCorsAttribute Microsoft.AspNetCore.Cors.DisableCorsAttribute
Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description> Microsoft.AspNetCore.Cors.EnableCorsAttribute</Description>
<TargetFramework>netstandard1.3</TargetFramework> <TargetFramework>netcoreapp2.0</TargetFramework>
<NoWarn>$(NoWarn);CS1591</NoWarn> <NoWarn>$(NoWarn);CS1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>aspnetcore;cors</PackageTags> <PackageTags>aspnetcore;cors</PackageTags>

1124
src/Microsoft.AspNetCore.Cors/baseline.net45.json
View File

File diff suppressed because it is too large Load Diff

3
test/Microsoft.AspNetCore.Cors.Test/Microsoft.AspNetCore.Cors.Test.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\build\common.props" /> <Import Project="..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks> <TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType> <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
</PropertyGroup> </PropertyGroup>

3
test/WebSites/CorsMiddlewareWebSite/CorsMiddlewareWebSite.csproj
View File

@ -3,8 +3,7 @@
<Import Project="..\..\..\build\common.props" /> <Import Project="..\..\..\build\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks> <TargetFramework>netcoreapp2.0</TargetFramework>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>