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

Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
John Luo 2017-05-04 11:17:24 -07:00
parent bd805ef50d 2fb5649b04
commit bed3bf2b4e
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,6 +26,7 @@ nuget.exe
*.sln.ide
project.lock.json
.vs
.vscode/
.build/
.testPublish/
global.json

5
src/Microsoft.AspNetCore/CertificateLoader.cs
View File

@ -179,10 +179,7 @@ namespace Microsoft.AspNetCore
{
var certificate = TryLoad(X509KeyStorageFlags.DefaultKeySet, out var error)
?? TryLoad(X509KeyStorageFlags.UserKeySet, out error)
#if NETCOREAPP2_0
?? TryLoad(X509KeyStorageFlags.EphemeralKeySet, out error)
#endif
;
?? TryLoad(X509KeyStorageFlags.EphemeralKeySet, out error);
if (error != null)
{

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

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netstandard1.3;netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
<PackageTags>aspnetcore</PackageTags>
<Description>Microsoft.AspNetCore</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

2
src/Microsoft.DotNet.Archive/Microsoft.DotNet.Archive.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFramework>netstandard1.3</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<EnableApiCheck>false</EnableApiCheck>
</PropertyGroup>

2
test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
View File

@ -3,7 +3,7 @@
<Import Project="..\..\build\common.props" />
<PropertyGroup>
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>