Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Commit 6ffac0c

Browse files
committed
Merge branch 'rel/2.0.0-preview1' into dev
2 parents 404f518 + 9168442 commit 6ffac0c

File tree

34 files changed

+20
-15939
lines changed

34 files changed

+20
-15939
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ project.lock.json
2828
.build/
2929
.testPublish/
3030
/.vs/
31+
.vscode/
3132
global.json

samples/SampleApp/SampleApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<Import Project="..\..\build\dependencies.props" />
4-
4+
55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
77
<OutputType>Exe</OutputType>
88
</PropertyGroup>
99

src/Microsoft.AspNetCore.Authentication.Abstractions/Microsoft.AspNetCore.Authentication.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\common.props" />
33
<PropertyGroup>
44
<Description>ASP.NET Core common types used by the various authentication components.</Description>
5-
<TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
5+
<TargetFramework>netcoreapp2.0</TargetFramework>
66
<NoWarn>$(NoWarn);CS1591</NoWarn>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>
88
<PackageTags>aspnetcore;authentication;security</PackageTags>

src/Microsoft.AspNetCore.Authentication.Core/Microsoft.AspNetCore.Authentication.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<PropertyGroup>
66
<Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
7-
<TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
7+
<TargetFramework>netcoreapp2.0</TargetFramework>
88
<NoWarn>$(NoWarn);CS1591</NoWarn>
99
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1010
<PackageTags>aspnetcore;authentication;security</PackageTags>

src/Microsoft.AspNetCore.Http.Abstractions/Microsoft.AspNetCore.Http.Abstractions.csproj

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Microsoft.AspNetCore.Builder.IApplicationBuilder
1010
Microsoft.AspNetCore.Http.HttpContext
1111
Microsoft.AspNetCore.Http.HttpRequest
1212
Microsoft.AspNetCore.Http.HttpResponse</Description>
13-
<TargetFramework>netstandard1.3</TargetFramework>
13+
<TargetFramework>netcoreapp2.0</TargetFramework>
1414
<GenerateDocumentationFile>true</GenerateDocumentationFile>
1515
<PackageTags>aspnetcore</PackageTags>
1616
<NoWarn>$(NoWarn);CS1591</NoWarn>
@@ -26,9 +26,4 @@ Microsoft.AspNetCore.Http.HttpResponse</Description>
2626
<PackageReference Include="System.Text.Encodings.Web" Version="$(CoreFxVersion)" />
2727
</ItemGroup>
2828

29-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
30-
<PackageReference Include="System.Globalization.Extensions" Version="$(CoreFxVersion)" />
31-
<PackageReference Include="System.Reflection.TypeExtensions" Version="$(CoreFxVersion)" />
32-
</ItemGroup>
33-
3429
</Project>

0 commit comments

Comments
 (0)