diff --git a/Directory.Build.targets b/Directory.Build.targets
index 78626b773e..4bcc9df925 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,8 +1,6 @@
- $(MicrosoftNETCoreApp20PackageVersion)
- $(MicrosoftNETCoreApp21PackageVersion)
- $(MicrosoftNETCoreApp22PackageVersion)
+ $(MicrosoftNETCoreApp30PackageVersion)
$(NETStandardLibrary20PackageVersion)
99.9
diff --git a/build/dependencies.props b/build/dependencies.props
index 6760d57118..81232e2f67 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -21,9 +21,7 @@
3.0.0-alpha1-10400
3.0.0-alpha1-10400
3.14.2
- 2.0.9
- 2.1.3
- 2.2.0-preview2-26905-02
+ 3.0.0-preview1-26905-03
15.6.1
4.6.0-preview1-26831-06
4.9.0
diff --git a/build/repo.props b/build/repo.props
index 17a98ac7e7..693905497a 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -8,8 +8,6 @@
-
-
-
+
diff --git a/samples/AzureBlob/AzureBlob.csproj b/samples/AzureBlob/AzureBlob.csproj
index 07c7a23911..72bce10880 100644
--- a/samples/AzureBlob/AzureBlob.csproj
+++ b/samples/AzureBlob/AzureBlob.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
exe
diff --git a/samples/AzureKeyVault/AzureKeyVault.csproj b/samples/AzureKeyVault/AzureKeyVault.csproj
index 99f91f6158..faa7d75be0 100644
--- a/samples/AzureKeyVault/AzureKeyVault.csproj
+++ b/samples/AzureKeyVault/AzureKeyVault.csproj
@@ -1,7 +1,7 @@
- netcoreapp2.2
+ netcoreapp3.0
exe
diff --git a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
index f2a6779bc4..f55e580fed 100644
--- a/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
+++ b/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.2
+ net461;netcoreapp3.0
exe
diff --git a/samples/KeyManagementSample/KeyManagementSample.csproj b/samples/KeyManagementSample/KeyManagementSample.csproj
index 981c40bd47..d97d58f988 100644
--- a/samples/KeyManagementSample/KeyManagementSample.csproj
+++ b/samples/KeyManagementSample/KeyManagementSample.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.2
+ net461;netcoreapp3.0
exe
diff --git a/samples/NonDISample/NonDISample.csproj b/samples/NonDISample/NonDISample.csproj
index 35d64cfd3f..6371351b01 100644
--- a/samples/NonDISample/NonDISample.csproj
+++ b/samples/NonDISample/NonDISample.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.2
+ net461;netcoreapp3.0
exe
diff --git a/samples/Redis/Redis.csproj b/samples/Redis/Redis.csproj
index 072dc402a4..dc19edf45b 100644
--- a/samples/Redis/Redis.csproj
+++ b/samples/Redis/Redis.csproj
@@ -1,7 +1,7 @@
- net461;netcoreapp2.2
+ net461;netcoreapp3.0
exe
diff --git a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
index 70205f1754..04dec66482 100644
--- a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
+++ b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
@@ -2,7 +2,7 @@
ASP.NET Core utilities for key derivation.
- netstandard2.0;netcoreapp2.0
+ netstandard2.0;netcoreapp3.0
true
true
aspnetcore;dataprotection
diff --git a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs
index 2aaf445dda..a8ce1772eb 100644
--- a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs
+++ b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs
@@ -1,7 +1,7 @@
// 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.
-#if NETCOREAPP2_0
+#if NETCOREAPP3_0
// Rfc2898DeriveBytes in .NET Standard 2.0 only supports SHA1
using System;
diff --git a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs
index f7c99c4bcb..d8139c92f7 100644
--- a/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs
+++ b/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Cryptography.KeyDerivation.PBKDF2
// acceptable implementation
return new Win7Pbkdf2Provider();
}
-#if NETCOREAPP2_0
+#if NETCOREAPP3_0
else
{
// fastest implementation on .NET Core for Linux/macOS.
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 2b83ffeac1..f4a350c9a4 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -2,7 +2,7 @@
- netcoreapp2.2
+ netcoreapp3.0
$(DeveloperBuildTestTfms)
$(StandardTestTfms);net461
diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs
index 5b66a93510..a45f5e24ce 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_2
+#elif NETCOREAPP3_0
// 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 046fbcc24a..e142b698e7 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_2
+#elif NETCOREAPP3_0
#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 b6ef8e9928..c9a68ff746 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_2
+#elif NETCOREAPP3_0
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 d12faeb148..7274d846ad 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_2
+#elif NETCOREAPP3_0
#else
#error Target framework needs to be updated
#endif