| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553 |
- commit e0538784647990905f9c5fdc5bc2f0e5c7388909
- Author: Nate McMaster <[email protected]>
- Date: Mon Nov 19 09:47:07 2018 -0800
- Upgrade packages and projects to target netcoreapp3.0 (aspnet/Security#1916)
-
- Changes:
-
- * Upgrade dependencies and build tools
- * Change TFM on Microsoft.AspNetCore.* packages to netcoreapp3.0
- * Remove .NET Framework tests
- * Disable Owin interop tests. They need to be completely refactored
- diff --git a/Directory.Build.targets b/Directory.Build.targets
- index 78626b773ea..7e3f8df92e4 100644
- --- a/Directory.Build.targets
- +++ b/Directory.Build.targets
- @@ -1,10 +1,6 @@
- <Project>
- <PropertyGroup>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">$(MicrosoftNETCoreApp20PackageVersion)</RuntimeFrameworkVersion>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">$(MicrosoftNETCoreApp21PackageVersion)</RuntimeFrameworkVersion>
- - <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp2.2' ">$(MicrosoftNETCoreApp22PackageVersion)</RuntimeFrameworkVersion>
- + <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.0' ">$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion>
- <NETStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NETStandardLibrary20PackageVersion)</NETStandardImplicitPackageVersion>
- - <!-- aspnet/BuildTools#662 Don't police what version of NetCoreApp we use -->
- - <NETCoreAppMaximumVersion>99.9</NETCoreAppMaximumVersion>
- </PropertyGroup>
- </Project>
- diff --git a/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
- index 7226b64be51..2f16dd66999 100644
- --- a/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
- +++ b/benchmarks/Microsoft.AspNetCore.Security.Performance/Microsoft.AspNetCore.Security.Performance.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFramework>netcoreapp2.2</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <OutputType>Exe</OutputType>
- <ServerGarbageCollection>true</ServerGarbageCollection>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- diff --git a/build/dependencies.props b/build/dependencies.props
- index 230a942c0cc..163a3d40047 100644
- --- a/build/dependencies.props
- +++ b/build/dependencies.props
- @@ -4,42 +4,40 @@
- </PropertyGroup>
- <PropertyGroup Label="Package Versions">
- <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
- - <InternalAspNetCoreSdkPackageVersion>3.0.0-alpha1-20181004.7</InternalAspNetCoreSdkPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- - <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-alpha1-10657</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
- - <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
- - <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDataProtectionPackageVersion>
- - <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- - <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHostingPackageVersion>
- - <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-a-alpha1-endpoint-extensions-namespace-16778</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
- - <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- - <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreHttpPackageVersion>
- - <MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreRoutingPackageVersion>
- - <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
- - <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreServerKestrelPackageVersion>
- - <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreStaticFilesPackageVersion>
- - <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10706</MicrosoftAspNetCoreTestHostPackageVersion>
- - <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181105-05</MicrosoftAspNetCoreTestingPackageVersion>
- - <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsCachingMemoryPackageVersion>
- - <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- - <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- - <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsDependencyInjectionPackageVersion>
- - <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
- - <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- - <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingConsolePackageVersion>
- - <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingDebugPackageVersion>
- - <MicrosoftExtensionsLoggingPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsLoggingPackageVersion>
- - <MicrosoftExtensionsOptionsPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsOptionsPackageVersion>
- - <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181105-05</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
- - <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-alpha1-10706</MicrosoftExtensionsWebEncodersPackageVersion>
- + <InternalAspNetCoreSdkPackageVersion>3.0.0-build-20181114.5</InternalAspNetCoreSdkPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreAuthenticationCorePackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreAuthenticationCorePackageVersion>
- + <MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreBenchmarkRunnerSourcesPackageVersion>
- + <MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionExtensionsPackageVersion>
- + <MicrosoftAspNetCoreDataProtectionPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDataProtectionPackageVersion>
- + <MicrosoftAspNetCoreDiagnosticsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreDiagnosticsPackageVersion>
- + <MicrosoftAspNetCoreHostingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHostingPackageVersion>
- + <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpAbstractionsPackageVersion>
- + <MicrosoftAspNetCoreHttpExtensionsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpExtensionsPackageVersion>
- + <MicrosoftAspNetCoreHttpPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreHttpPackageVersion>
- + <MicrosoftAspNetCoreRoutingPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreRoutingPackageVersion>
- + <MicrosoftAspNetCoreServerIISIntegrationPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerIISIntegrationPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelHttpsPackageVersion>
- + <MicrosoftAspNetCoreServerKestrelPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreServerKestrelPackageVersion>
- + <MicrosoftAspNetCoreStaticFilesPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreStaticFilesPackageVersion>
- + <MicrosoftAspNetCoreTestHostPackageVersion>3.0.0-alpha1-10742</MicrosoftAspNetCoreTestHostPackageVersion>
- + <MicrosoftAspNetCoreTestingPackageVersion>3.0.0-preview-181113-11</MicrosoftAspNetCoreTestingPackageVersion>
- + <MicrosoftExtensionsCachingMemoryPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsCachingMemoryPackageVersion>
- + <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
- + <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
- + <MicrosoftExtensionsDependencyInjectionPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsDependencyInjectionPackageVersion>
- + <MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsFileProvidersEmbeddedPackageVersion>
- + <MicrosoftExtensionsLoggingAbstractionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
- + <MicrosoftExtensionsLoggingConsolePackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingConsolePackageVersion>
- + <MicrosoftExtensionsLoggingDebugPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingDebugPackageVersion>
- + <MicrosoftExtensionsLoggingPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsLoggingPackageVersion>
- + <MicrosoftExtensionsOptionsPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsOptionsPackageVersion>
- + <MicrosoftExtensionsSecurityHelperSourcesPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsSecurityHelperSourcesPackageVersion>
- + <MicrosoftExtensionsWebEncodersPackageVersion>3.0.0-preview-181113-11</MicrosoftExtensionsWebEncodersPackageVersion>
- <MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>3.19.8</MicrosoftIdentityModelClientsActiveDirectoryPackageVersion>
- <MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion>
- <MicrosoftIdentityModelProtocolsWsFederationPackageVersion>5.3.0</MicrosoftIdentityModelProtocolsWsFederationPackageVersion>
- - <MicrosoftNETCoreApp20PackageVersion>2.0.9</MicrosoftNETCoreApp20PackageVersion>
- - <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
- - <MicrosoftNETCoreApp22PackageVersion>2.2.0-rtm-27105-02</MicrosoftNETCoreApp22PackageVersion>
- + <MicrosoftNETCoreAppPackageVersion>3.0.0-preview1-26907-05</MicrosoftNETCoreAppPackageVersion>
- <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>
- <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
- <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
- diff --git a/build/repo.props b/build/repo.props
- index 6fc6af601d0..4402da1d0d7 100644
- --- a/build/repo.props
- +++ b/build/repo.props
- @@ -1,9 +1,6 @@
- <Project>
- <Import Project="dependencies.props" />
-
- - <ItemGroup>
- - <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.Owin.Security.Interop.Test\*.csproj" Condition="'$(OS)' != 'Windows_NT'" />
- - </ItemGroup>
- <PropertyGroup>
- <!-- These properties are use by the automation that updates dependencies.props -->
- <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
- @@ -11,8 +8,6 @@
- </PropertyGroup>
-
- <ItemGroup>
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)" />
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp21PackageVersion)" />
- - <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp22PackageVersion)" />
- + <DotNetCoreRuntime Include="$(MicrosoftNETCoreAppPackageVersion)" />
- </ItemGroup>
- </Project>
- diff --git a/korebuild-lock.txt b/korebuild-lock.txt
- index 591cfd52ffb..73613543d0a 100644
- --- a/korebuild-lock.txt
- +++ b/korebuild-lock.txt
- @@ -1,2 +1,2 @@
- -version:3.0.0-alpha1-20181004.7
- -commithash:27fabdaf2b1d4753c3d2749581694ca65d78f7f2
- +version:3.0.0-build-20181114.5
- +commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
- diff --git a/samples/CookiePolicySample/CookiePolicySample.csproj b/samples/CookiePolicySample/CookiePolicySample.csproj
- index 48227eb07cf..010edb018e3 100644
- --- a/samples/CookiePolicySample/CookiePolicySample.csproj
- +++ b/samples/CookiePolicySample/CookiePolicySample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/samples/CookieSample/CookieSample.csproj b/samples/CookieSample/CookieSample.csproj
- index 1029f18193d..bc92d68a211 100644
- --- a/samples/CookieSample/CookieSample.csproj
- +++ b/samples/CookieSample/CookieSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/samples/CookieSessionSample/CookieSessionSample.csproj b/samples/CookieSessionSample/CookieSessionSample.csproj
- index 19bd0437469..6230c98a537 100644
- --- a/samples/CookieSessionSample/CookieSessionSample.csproj
- +++ b/samples/CookieSessionSample/CookieSessionSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/samples/JwtBearerSample/JwtBearerSample.csproj b/samples/JwtBearerSample/JwtBearerSample.csproj
- index 3e0192a2335..58bf5e2d977 100644
- --- a/samples/JwtBearerSample/JwtBearerSample.csproj
- +++ b/samples/JwtBearerSample/JwtBearerSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <UserSecretsId>aspnet5-JwtBearerSample-20151210102827</UserSecretsId>
- </PropertyGroup>
-
- diff --git a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
- index 2abd57cd896..61754b60bf8 100644
- --- a/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
- +++ b/samples/OpenIdConnect.AzureAdSample/OpenIdConnect.AzureAdSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
- </PropertyGroup>
-
- diff --git a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
- index bb02ef15951..137ee47ba26 100644
- --- a/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
- +++ b/samples/OpenIdConnectSample/OpenIdConnectSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <UserSecretsId>aspnet5-OpenIdConnectSample-20151210110318</UserSecretsId>
- </PropertyGroup>
-
- diff --git a/samples/SocialSample/SocialSample.csproj b/samples/SocialSample/SocialSample.csproj
- index a08b9799d14..e1e2262b0d8 100644
- --- a/samples/SocialSample/SocialSample.csproj
- +++ b/samples/SocialSample/SocialSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461;netcoreapp2.2</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <UserSecretsId>aspnet5-SocialSample-20151210111056</UserSecretsId>
- </PropertyGroup>
-
- diff --git a/samples/WsFedSample/WsFedSample.csproj b/samples/WsFedSample/WsFedSample.csproj
- index 4fb38fa3e35..e1191ac811b 100644
- --- a/samples/WsFedSample/WsFedSample.csproj
- +++ b/samples/WsFedSample/WsFedSample.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk.Web">
-
- <PropertyGroup>
- - <TargetFrameworks>net461</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
- index b188a58e085..093f60a3dea 100644
- --- a/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.Cookies/Microsoft.AspNetCore.Authentication.Cookies.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to use cookie based authentication.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <DefineConstants>$(DefineConstants);SECURITY</DefineConstants>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- diff --git a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
- index 62aee1367fe..f57fe26e0c8 100644
- --- a/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.Facebook/Microsoft.AspNetCore.Authentication.Facebook.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support Facebook's OAuth 2.0 authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
- index de8867f91ad..eba5b98adfe 100644
- --- a/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.Google/Microsoft.AspNetCore.Authentication.Google.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core contains middleware to support Google's OpenId and OAuth 2.0 authentication workflows.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
- index e5bae5a3da2..8a26c58f34d 100644
- --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.JwtBearer/Microsoft.AspNetCore.Authentication.JwtBearer.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to receive an OpenID Connect bearer token.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
- index 0eddc6f7644..1841157c94f 100644
- --- a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/Microsoft.AspNetCore.Authentication.MicrosoftAccount.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support the Microsoft Account authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
- index 5c8a5e3a960..97d4a970364 100644
- --- a/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.OAuth/Microsoft.AspNetCore.Authentication.OAuth.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support any standard OAuth 2.0 authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
- index b7f4c1704a9..65ca6b84292 100644
- --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/Microsoft.AspNetCore.Authentication.OpenIdConnect.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support the OpenID Connect authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
- index f720d08f042..4f2aae61687 100644
- --- a/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.Twitter/Microsoft.AspNetCore.Authentication.Twitter.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support Twitter's OAuth 1.0 authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj b/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
- index 4edb55cb356..ae4d52aff41 100644
- --- a/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication.WsFederation/Microsoft.AspNetCore.Authentication.WsFederation.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core middleware that enables an application to support the WsFederation authentication workflow.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- </PropertyGroup>
- diff --git a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
- index 7e3ce4eb39e..9ae0a7bccc4 100644
- --- a/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
- +++ b/src/Microsoft.AspNetCore.Authentication/Microsoft.AspNetCore.Authentication.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core common types used by the various authentication middleware components.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authentication;security</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj b/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
- index aba88dd50c2..d3ad99a5111 100644
- --- a/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
- +++ b/src/Microsoft.AspNetCore.Authorization.Policy/Microsoft.AspNetCore.Authorization.Policy.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core authorization policy helper classes.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591;NU1605</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authorization</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
- index ac4aa6c320a..9192ac8cfa4 100644
- --- a/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
- +++ b/src/Microsoft.AspNetCore.Authorization/Microsoft.AspNetCore.Authorization.csproj
- @@ -5,7 +5,7 @@
- Commonly used types:
- Microsoft.AspNetCore.Authorization.AllowAnonymousAttribute
- Microsoft.AspNetCore.Authorization.AuthorizeAttribute</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore;authorization</PackageTags>
- diff --git a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
- index 40f97633aed..81760d50ab0 100644
- --- a/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
- +++ b/src/Microsoft.AspNetCore.CookiePolicy/Microsoft.AspNetCore.CookiePolicy.csproj
- @@ -2,7 +2,7 @@
-
- <PropertyGroup>
- <Description>ASP.NET Core cookie policy classes to control the behavior of cookies.</Description>
- - <TargetFramework>netstandard2.0</TargetFramework>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);CS1591</NoWarn>
- <GenerateDocumentationFile>true</GenerateDocumentationFile>
- <PackageTags>aspnetcore</PackageTags>
- diff --git a/test/Directory.Build.props b/test/Directory.Build.props
- index e3d2d9f1434..c42d54465fa 100644
- --- a/test/Directory.Build.props
- +++ b/test/Directory.Build.props
- @@ -1,13 +1,6 @@
- <Project>
- <Import Project="..\Directory.Build.props" />
-
- - <PropertyGroup>
- - <DeveloperBuildTestTfms>netcoreapp2.2</DeveloperBuildTestTfms>
- - <StandardTestTfms>$(DeveloperBuildTestTfms)</StandardTestTfms>
- - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' ">$(StandardTestTfms)</StandardTestTfms>
- - <StandardTestTfms Condition=" '$(DeveloperBuild)' != 'true' AND '$(OS)' == 'Windows_NT' ">$(StandardTestTfms);net461</StandardTestTfms>
- - </PropertyGroup>
- -
- <ItemGroup>
- <PackageReference Include="Internal.AspNetCore.Sdk" PrivateAssets="All" Version="$(InternalAspNetCoreSdkPackageVersion)" />
- <PackageReference Include="Microsoft.AspNetCore.Testing" Version="$(MicrosoftAspNetCoreTestingPackageVersion)" />
- diff --git a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
- index 6c8d518ffa9..c7a38086824 100644
- --- a/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
- +++ b/test/Microsoft.AspNetCore.Authentication.Test/Microsoft.AspNetCore.Authentication.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
- index 40a8fff1283..9ff42a070c5 100644
- --- a/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
- +++ b/test/Microsoft.AspNetCore.Authorization.Test/Microsoft.AspNetCore.Authorization.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- <NoWarn>$(NoWarn);NU1605</NoWarn>
- </PropertyGroup>
-
- diff --git a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
- index 20cd400ce78..2f38abff904 100644
- --- a/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
- +++ b/test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test/Microsoft.AspNetCore.ChunkingCookieManager.Sources.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
- index d7a42f3efb6..3dc3df2e227 100644
- --- a/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
- +++ b/test/Microsoft.AspNetCore.CookiePolicy.Test/Microsoft.AspNetCore.CookiePolicy.Test.csproj
- @@ -1,7 +1,7 @@
- <Project Sdk="Microsoft.NET.Sdk">
-
- <PropertyGroup>
- - <TargetFrameworks>$(StandardTestTfms)</TargetFrameworks>
- + <TargetFramework>netcoreapp3.0</TargetFramework>
- </PropertyGroup>
-
- <ItemGroup>
- diff --git a/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs b/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
- index e2e4fd7d078..24bf09722c4 100644
- --- a/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
- +++ b/test/Microsoft.Owin.Security.Interop.Test/CookieInteropTests.cs
- @@ -1,6 +1,10 @@
- // Copyright (c) .NET Foundation. All rights reserved.
- // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
- +/* See https://github.com/aspnet/AspNetCore/issues/4074.
- +
- +This test is was disabled as a part of changing frameworks. This test will need to be re-written using separate .NET Core and .NET Framework processes.
- +
- using System.Collections.Generic;
- using System.IO;
- using System.Linq;
- @@ -330,3 +334,4 @@ namespace Microsoft.Owin.Security.Interop
- }
- }
-
- +*/
- diff --git a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
- index f369f1f01ad..57b224ef68e 100644
- --- a/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
- +++ b/test/Microsoft.Owin.Security.Interop.Test/Microsoft.Owin.Security.Interop.Test.csproj
- @@ -2,10 +2,11 @@
-
- <PropertyGroup>
- <TargetFramework>net461</TargetFramework>
- + <!-- Temporarily disables tests for this project. They need to be refactored now that aspnetcore only supports netcoreapp3.0. -->
- + <IsTestProject>false</IsTestProject>
- </PropertyGroup>
-
- <ItemGroup>
- - <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Authentication.Cookies\Microsoft.AspNetCore.Authentication.Cookies.csproj" />
- <ProjectReference Include="..\..\src\Microsoft.Owin.Security.Interop\Microsoft.Owin.Security.Interop.csproj" />
- </ItemGroup>
-
- diff --git a/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs b/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
- index 769adc015b3..ccff1e9367f 100644
- --- a/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
- +++ b/test/Microsoft.Owin.Security.Interop.Test/TicketInteropTests.cs
- @@ -1,6 +1,8 @@
- // Copyright (c) .NET Foundation. All rights reserved.
- // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
- +/*
- +
- using System;
- using System.Linq;
- using System.Security.Claims;
- @@ -87,5 +89,6 @@ namespace Microsoft.Owin.Security.Interop.Test
- }
- }
- }
- +*/
-
-
|