From 15ff22bc5c5cc30c5be956258d3adde8d0c115d6 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 May 2018 15:09:53 -0700 Subject: [PATCH] Upgrade to netcoreapp22 --- Directory.Build.targets | 5 +++- build/dependencies.props | 29 ++++++++++--------- build/repo.props | 3 +- korebuild-lock.txt | 4 +-- samples/AzureBlob/AzureBlob.csproj | 4 +-- samples/AzureKeyVault/AzureKeyVault.csproj | 2 +- .../CustomEncryptorSample.csproj | 4 +-- .../KeyManagementSample.csproj | 4 +-- samples/NonDISample/NonDISample.csproj | 4 +-- samples/Redis/Redis.csproj | 4 +-- test/Directory.Build.props | 4 +-- .../Pbkdf2Tests.cs | 2 +- .../AnonymousImpersonation.cs | 2 +- .../TypeForwardingActivatorTests.cs | 2 +- .../XmlEncryption/DpapiXmlEncryptionTests.cs | 2 +- 15 files changed, 40 insertions(+), 35 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e1da..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index 5619a809b0..7fe4eab12b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,25 +1,26 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17048 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 2.3.2 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 3.14.2 2.0.0 2.2.0-preview1-26424-04 + 2.2.0-preview1-26502-01 15.6.1 4.5.0-preview3-26423-04 4.7.49 diff --git a/build/repo.props b/build/repo.props index 78b0ce5879..17a98ac7e7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -10,5 +10,6 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 18df6940ae..da5dcd1202 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17048 +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 diff --git a/samples/AzureBlob/AzureBlob.csproj b/samples/AzureBlob/AzureBlob.csproj index 8ba3d51f0f..07c7a23911 100644 --- a/samples/AzureBlob/AzureBlob.csproj +++ b/samples/AzureBlob/AzureBlob.csproj @@ -1,7 +1,7 @@ - + - netcoreapp2.1 + netcoreapp2.2 exe diff --git a/samples/AzureKeyVault/AzureKeyVault.csproj b/samples/AzureKeyVault/AzureKeyVault.csproj index ce4ae01408..99f91f6158 100644 --- a/samples/AzureKeyVault/AzureKeyVault.csproj +++ b/samples/AzureKeyVault/AzureKeyVault.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1 + netcoreapp2.2 exe diff --git a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj index 1cfe237b50..f2a6779bc4 100644 --- a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj +++ b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj @@ -1,7 +1,7 @@ - + - net461;netcoreapp2.1 + net461;netcoreapp2.2 exe diff --git a/samples/KeyManagementSample/KeyManagementSample.csproj b/samples/KeyManagementSample/KeyManagementSample.csproj index e240e30b6d..981c40bd47 100644 --- a/samples/KeyManagementSample/KeyManagementSample.csproj +++ b/samples/KeyManagementSample/KeyManagementSample.csproj @@ -1,7 +1,7 @@ - + - net461;netcoreapp2.1 + net461;netcoreapp2.2 exe diff --git a/samples/NonDISample/NonDISample.csproj b/samples/NonDISample/NonDISample.csproj index 168e26a249..35d64cfd3f 100644 --- a/samples/NonDISample/NonDISample.csproj +++ b/samples/NonDISample/NonDISample.csproj @@ -1,7 +1,7 @@ - + - net461;netcoreapp2.1 + net461;netcoreapp2.2 exe diff --git a/samples/Redis/Redis.csproj b/samples/Redis/Redis.csproj index dc79399c6c..072dc402a4 100644 --- a/samples/Redis/Redis.csproj +++ b/samples/Redis/Redis.csproj @@ -1,7 +1,7 @@ - + - net461;netcoreapp2.1 + net461;netcoreapp2.2 exe diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 9d4d4a902c..2b83ffeac1 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -2,9 +2,9 @@ - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 + $(StandardTestTfms);net461 diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs index 6c78225a92..5b66a93510 100644 --- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs +++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs @@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation { #if NET461 -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_2 // The 'numBytesRequested' parameters below are chosen to exercise code paths where // this value straddles the digest length of the PRF. We only use 5 iterations so // that our unit tests are fast. diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs b/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs index b8ecc36c26..046fbcc24a 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs @@ -86,7 +86,7 @@ namespace Microsoft.AspNetCore.DataProtection } } } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_2 #else #error Target framework needs to be updated #endif diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs b/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs index 2b8931c98e..b6ef8e9928 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs @@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.DataProtection var domain = AppDomain.CreateDomain("TestDomain", null, setupInfo); var wrappedTestClass = (TypeForwardingActivatorTests)domain.CreateInstanceAndUnwrap(GetType().Assembly.FullName, typeof(TypeForwardingActivatorTests).FullName); wrappedTestClass.CreateInstance_ForwardsAcrossVersionChangesImpl(version); -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_2 CreateInstance_ForwardsAcrossVersionChangesImpl(version); #else #error Target framework should be updated diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs index 79dcff64af..d12faeb148 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs +++ b/test/Microsoft.AspNetCore.DataProtection.Test/XmlEncryption/DpapiXmlEncryptionTests.cs @@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.DataProtection.XmlEncryption ExceptionAssert2.ThrowsCryptographicException(() => AnonymousImpersonation.Run(() => decryptor.Decrypt(encryptedXmlInfo.EncryptedElement))); } -#elif NETCOREAPP2_0 || NETCOREAPP2_1 +#elif NETCOREAPP2_2 #else #error Target framework needs to be updated #endif