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-03 18:12:26 -07:00
parent 9bc9ed9812 102daa6832
commit bd805ef50d
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

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

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

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

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

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

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

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

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