diff --git a/Directory.Build.targets b/Directory.Build.targets index 9e972f282e..2991ae3052 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,8 @@ - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 - \ No newline at end of file + diff --git a/build/dependencies.props b/build/dependencies.props index dd8b70b64b..9241c0e315 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,67 +4,68 @@ 0.9.9 - 2.2.0-preview1-17051 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 0.6.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-17053 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 0.6.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 2.2.1 2.3.2 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 + 2.2.0-preview1-34203 3.14.2 5.2.0 2.0.0 2.1.0-rc1 - 2.2.0-preview1-34184 + 2.2.0-preview1-26509-06 + 2.2.0-preview1-34203 15.6.1 3.0.1 - 2.2.0-preview1-34184 + 2.2.0-preview1-34203 4.7.49 2.0.3 4.6.0-preview1-26508-04 diff --git a/build/repo.props b/build/repo.props index 78b0ce5879..81d20dd22c 100644 --- a/build/repo.props +++ b/build/repo.props @@ -8,7 +8,6 @@ - - + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 89629b454c..bc0c5bcacc 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17051 -commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b +version:2.2.0-preview1-17053 +commithash:f473643b3b010caad28f015d57d8a9be166743aa diff --git a/samples/ClaimsTransformation/ClaimsTransformation.csproj b/samples/ClaimsTransformation/ClaimsTransformation.csproj index 2b505a6c4c..5d7eeb5ee6 100644 --- a/samples/ClaimsTransformation/ClaimsTransformation.csproj +++ b/samples/ClaimsTransformation/ClaimsTransformation.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.2 diff --git a/samples/Cookies/Cookies.csproj b/samples/Cookies/Cookies.csproj index 2b505a6c4c..5d7eeb5ee6 100644 --- a/samples/Cookies/Cookies.csproj +++ b/samples/Cookies/Cookies.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.2 diff --git a/samples/CustomPolicyProvider/CustomPolicyProvider.csproj b/samples/CustomPolicyProvider/CustomPolicyProvider.csproj index 44d2b45db0..0a0746d605 100644 --- a/samples/CustomPolicyProvider/CustomPolicyProvider.csproj +++ b/samples/CustomPolicyProvider/CustomPolicyProvider.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.2 diff --git a/samples/DynamicSchemes/DynamicSchemes.csproj b/samples/DynamicSchemes/DynamicSchemes.csproj index 0b5ce2d0a2..2c12b7bf16 100644 --- a/samples/DynamicSchemes/DynamicSchemes.csproj +++ b/samples/DynamicSchemes/DynamicSchemes.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.2;net461 diff --git a/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj b/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj index c244d5ea79..6cfa19bd89 100644 --- a/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj +++ b/samples/Identity.ExternalClaims/Identity.ExternalClaims.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.2;net461 aspnet-Identity.ExternalClaims-E95BE154-CB1B-4633-A2E0-B2DF12FE8BD3 diff --git a/samples/PathSchemeSelection/PathSchemeSelection.csproj b/samples/PathSchemeSelection/PathSchemeSelection.csproj index 92a95ea57d..afccf3082c 100644 --- a/samples/PathSchemeSelection/PathSchemeSelection.csproj +++ b/samples/PathSchemeSelection/PathSchemeSelection.csproj @@ -2,7 +2,7 @@ false - netcoreapp2.0 + netcoreapp2.2 diff --git a/samples/StaticFilesAuth/StaticFilesAuth.csproj b/samples/StaticFilesAuth/StaticFilesAuth.csproj index 9259b0c67e..1061605da7 100644 --- a/samples/StaticFilesAuth/StaticFilesAuth.csproj +++ b/samples/StaticFilesAuth/StaticFilesAuth.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;netcoreapp2.0;net461 + netcoreapp2.2;net461 aspnet-StaticFilesAuth-AFE2BD9D-1575-4C3E-BE32-3F15C5BC9947 diff --git a/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj index 4d50d4e6a7..7643b26c78 100644 --- a/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj +++ b/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj @@ -1,7 +1,7 @@  - $(StandardTestTfms) + netcoreapp2.2 diff --git a/test/AuthSamples.FunctionalTests/TestServices.cs b/test/AuthSamples.FunctionalTests/TestServices.cs index 129c218878..f361830e35 100644 --- a/test/AuthSamples.FunctionalTests/TestServices.cs +++ b/test/AuthSamples.FunctionalTests/TestServices.cs @@ -43,14 +43,7 @@ namespace AuthSamples.FunctionalTests Func validator) { var logger = loggerFactory.CreateLogger(siteName); - var targetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : -#if NETCOREAPP2_0 - "netcoreapp2.0"; -#elif NETCOREAPP2_1 - "netcoreapp2.1"; -#else -#error Target frameworks need to be updated. -#endif + var targetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.2"; var deploymentParameters = new DeploymentParameters(GetApplicationDirectory(siteName), serverType, runtimeFlavor, architecture) { diff --git a/test/Directory.Build.props b/test/Directory.Build.props deleted file mode 100644 index 260c5c1249..0000000000 --- a/test/Directory.Build.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - netcoreapp2.1 - $(DeveloperBuildTestTfms) - $(StandardTestTfms);netcoreapp2.0 - -