diff --git a/Directory.Build.props b/Directory.Build.props
index 7cfecbbe60..bdb885cd9f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,19 @@
$(ArtifactsDir)obj\
$(ArtifactsDir)$(Configuration)\
$(ArtifactsConfigurationDir)bin\
- $(ArtifactsConfigurationDir)packages\
+ $(ArtifactsDir)build\
+
+ $([MSBuild]::MakeRelative($(RepositoryRoot), $(MSBuildProjectDirectory)))
+
+ true
+ true
+ true
+ true
+
+ false
+ true
+
+ true
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 755d556547..30ce3e3322 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,13 @@
+
+
+ true
+
+ $(IsImplementationProject)
+ true
+ false
+
$(MicrosoftNETCoreApp20PackageVersion)
$(MicrosoftNETCoreApp21PackageVersion)
$(NETStandardLibrary20PackageVersion)
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/CryptoUtil.cs b/src/DataProtection/Abstractions/src/CryptoUtil.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/CryptoUtil.cs
rename to src/DataProtection/Abstractions/src/CryptoUtil.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/DataProtectionCommonExtensions.cs b/src/DataProtection/Abstractions/src/DataProtectionCommonExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/DataProtectionCommonExtensions.cs
rename to src/DataProtection/Abstractions/src/DataProtectionCommonExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Error.cs b/src/DataProtection/Abstractions/src/Error.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Error.cs
rename to src/DataProtection/Abstractions/src/Error.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/IDataProtectionProvider.cs b/src/DataProtection/Abstractions/src/IDataProtectionProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/IDataProtectionProvider.cs
rename to src/DataProtection/Abstractions/src/IDataProtectionProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/IDataProtector.cs b/src/DataProtection/Abstractions/src/IDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/IDataProtector.cs
rename to src/DataProtection/Abstractions/src/IDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Infrastructure/IApplicationDiscriminator.cs b/src/DataProtection/Abstractions/src/Infrastructure/IApplicationDiscriminator.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Infrastructure/IApplicationDiscriminator.cs
rename to src/DataProtection/Abstractions/src/Infrastructure/IApplicationDiscriminator.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
similarity index 93%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
rename to src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
index 24bd9f5fb6..94dc1366dd 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
+++ b/src/DataProtection/Abstractions/src/Microsoft.AspNetCore.DataProtection.Abstractions.csproj
@@ -11,7 +11,7 @@ Microsoft.AspNetCore.DataProtection.IDataProtector
-
+
diff --git a/src/DataProtection/Abstractions/src/Properties/AssemblyInfo.cs b/src/DataProtection/Abstractions/src/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..f826749dff
--- /dev/null
+++ b/src/DataProtection/Abstractions/src/Properties/AssemblyInfo.cs
@@ -0,0 +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.
+
+using System.Runtime.CompilerServices;
+
+// for unit testing
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Properties/Resources.Designer.cs b/src/DataProtection/Abstractions/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Properties/Resources.Designer.cs
rename to src/DataProtection/Abstractions/src/Properties/Resources.Designer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Resources.resx b/src/DataProtection/Abstractions/src/Resources.resx
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Resources.resx
rename to src/DataProtection/Abstractions/src/Resources.resx
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/baseline.netcore.json b/src/DataProtection/Abstractions/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/baseline.netcore.json
rename to src/DataProtection/Abstractions/src/baseline.netcore.json
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/DataProtectionCommonExtensionsTests.cs b/src/DataProtection/Abstractions/test/DataProtectionCommonExtensionsTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/DataProtectionCommonExtensionsTests.cs
rename to src/DataProtection/Abstractions/test/DataProtectionCommonExtensionsTests.cs
diff --git a/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj b/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj
new file mode 100644
index 0000000000..94ea16f046
--- /dev/null
+++ b/src/DataProtection/Abstractions/test/Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj
@@ -0,0 +1,12 @@
+
+
+
+ netcoreapp2.1;netcoreapp2.0;net461
+
+
+
+
+
+
+
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureDataProtectionBuilderExtensions.cs b/src/DataProtection/AzureKeyVault/src/AzureDataProtectionBuilderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureDataProtectionBuilderExtensions.cs
rename to src/DataProtection/AzureKeyVault/src/AzureDataProtectionBuilderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureKeyVaultXmlDecryptor.cs b/src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureKeyVaultXmlDecryptor.cs
rename to src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureKeyVaultXmlEncryptor.cs b/src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/AzureKeyVaultXmlEncryptor.cs
rename to src/DataProtection/AzureKeyVault/src/AzureKeyVaultXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/IKeyVaultWrappingClient.cs b/src/DataProtection/AzureKeyVault/src/IKeyVaultWrappingClient.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/IKeyVaultWrappingClient.cs
rename to src/DataProtection/AzureKeyVault/src/IKeyVaultWrappingClient.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/KeyVaultClientWrapper.cs b/src/DataProtection/AzureKeyVault/src/KeyVaultClientWrapper.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/KeyVaultClientWrapper.cs
rename to src/DataProtection/AzureKeyVault/src/KeyVaultClientWrapper.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
similarity index 86%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
rename to src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
index 0c7b084a2a..86b9195c60 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
+++ b/src/DataProtection/AzureKeyVault/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Properties/AssemblyInfo.cs b/src/DataProtection/AzureKeyVault/src/Properties/AssemblyInfo.cs
similarity index 66%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Properties/AssemblyInfo.cs
rename to src/DataProtection/AzureKeyVault/src/Properties/AssemblyInfo.cs
index c23a3410b7..2b54a5854a 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureKeyVault/Properties/AssemblyInfo.cs
+++ b/src/DataProtection/AzureKeyVault/src/Properties/AssemblyInfo.cs
@@ -5,5 +5,5 @@ using System.Reflection;
using System.Resources;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test/AzureKeyVaultXmlEncryptorTests.cs b/src/DataProtection/AzureKeyVault/test/AzureKeyVaultXmlEncryptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test/AzureKeyVaultXmlEncryptorTests.cs
rename to src/DataProtection/AzureKeyVault/test/AzureKeyVaultXmlEncryptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj
similarity index 50%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj
rename to src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj
index 8644347572..8a3e7b2de7 100644
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj
+++ b/src/DataProtection/AzureKeyVault/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj
@@ -1,13 +1,13 @@
- $(StandardTestTfms)
+ netcoreapp2.1;netcoreapp2.0;net461
true
-
-
+
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureBlobXmlRepository.cs b/src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureBlobXmlRepository.cs
rename to src/DataProtection/AzureStorage/src/AzureBlobXmlRepository.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureDataProtectionBuilderExtensions.cs b/src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/AzureDataProtectionBuilderExtensions.cs
rename to src/DataProtection/AzureStorage/src/AzureDataProtectionBuilderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
similarity index 82%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
rename to src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
index ceb83f3925..368e6a9934 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
+++ b/src/DataProtection/AzureStorage/src/Microsoft.AspNetCore.DataProtection.AzureStorage.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/baseline.netcore.json b/src/DataProtection/AzureStorage/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.AzureStorage/baseline.netcore.json
rename to src/DataProtection/AzureStorage/src/baseline.netcore.json
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureBlobXmlRepositoryTests.cs b/src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureBlobXmlRepositoryTests.cs
rename to src/DataProtection/AzureStorage/test/AzureBlobXmlRepositoryTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureDataProtectionBuilderExtensionsTest.cs b/src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Test/AzureDataProtectionBuilderExtensionsTest.cs
rename to src/DataProtection/AzureStorage/test/AzureDataProtectionBuilderExtensionsTest.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test.csproj b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj
similarity index 50%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test.csproj
rename to src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj
index c5ffd2f4e3..be4ade7f7a 100644
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test/Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test.csproj
+++ b/src/DataProtection/AzureStorage/test/Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj
@@ -1,13 +1,13 @@
- $(StandardTestTfms)
+ netcoreapp2.1;netcoreapp2.0;net461
true
-
-
+
+
diff --git a/src/DataProtection/test/CreateTestCert.ps1 b/src/DataProtection/CreateTestCert.ps1
similarity index 100%
rename from src/DataProtection/test/CreateTestCert.ps1
rename to src/DataProtection/CreateTestCert.ps1
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCRYPT_KEY_LENGTHS_STRUCT.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCRYPT_KEY_LENGTHS_STRUCT.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCRYPT_KEY_LENGTHS_STRUCT.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCRYPT_KEY_LENGTHS_STRUCT.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptBuffer.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptBuffer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptBuffer.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptBuffer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptBufferDesc.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptBufferDesc.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptBufferDesc.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptBufferDesc.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptEncryptFlags.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptEncryptFlags.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptEncryptFlags.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptEncryptFlags.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptGenRandomFlags.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptGenRandomFlags.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptGenRandomFlags.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptGenRandomFlags.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptKeyDerivationBufferType.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptKeyDerivationBufferType.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptKeyDerivationBufferType.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptKeyDerivationBufferType.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptUtil.cs b/src/DataProtection/Cryptography.Internal/src/Cng/BCryptUtil.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/BCryptUtil.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/BCryptUtil.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/CachedAlgorithmHandles.cs b/src/DataProtection/Cryptography.Internal/src/Cng/CachedAlgorithmHandles.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/CachedAlgorithmHandles.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/CachedAlgorithmHandles.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/NCryptEncryptFlags.cs b/src/DataProtection/Cryptography.Internal/src/Cng/NCryptEncryptFlags.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/NCryptEncryptFlags.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/NCryptEncryptFlags.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/OSVersionUtil.cs b/src/DataProtection/Cryptography.Internal/src/Cng/OSVersionUtil.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Cng/OSVersionUtil.cs
rename to src/DataProtection/Cryptography.Internal/src/Cng/OSVersionUtil.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Constants.cs b/src/DataProtection/Cryptography.Internal/src/Constants.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Constants.cs
rename to src/DataProtection/Cryptography.Internal/src/Constants.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/CryptoUtil.cs b/src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/CryptoUtil.cs
rename to src/DataProtection/Cryptography.Internal/src/CryptoUtil.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/DATA_BLOB.cs b/src/DataProtection/Cryptography.Internal/src/DATA_BLOB.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/DATA_BLOB.cs
rename to src/DataProtection/Cryptography.Internal/src/DATA_BLOB.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Microsoft.AspNetCore.Cryptography.Internal.csproj b/src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Microsoft.AspNetCore.Cryptography.Internal.csproj
rename to src/DataProtection/Cryptography.Internal/src/Microsoft.AspNetCore.Cryptography.Internal.csproj
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Properties/AssemblyInfo.cs b/src/DataProtection/Cryptography.Internal/src/Properties/AssemblyInfo.cs
similarity index 64%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Properties/AssemblyInfo.cs
rename to src/DataProtection/Cryptography.Internal/src/Properties/AssemblyInfo.cs
index 62865ae945..825defe511 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Properties/AssemblyInfo.cs
+++ b/src/DataProtection/Cryptography.Internal/src/Properties/AssemblyInfo.cs
@@ -7,10 +7,10 @@ using System.Runtime.InteropServices;
// we only ever p/invoke into DLLs known to be in the System32 folder
[assembly: DefaultDllImportSearchPaths(DllImportSearchPath.System32)]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.Internal.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.Internal.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Properties/Resources.Designer.cs b/src/DataProtection/Cryptography.Internal/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Properties/Resources.Designer.cs
rename to src/DataProtection/Cryptography.Internal/src/Properties/Resources.Designer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Resources.resx b/src/DataProtection/Cryptography.Internal/src/Resources.resx
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/Resources.resx
rename to src/DataProtection/Cryptography.Internal/src/Resources.resx
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptAlgorithmHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptAlgorithmHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptAlgorithmHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptHashHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptHashHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptHashHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptKeyHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/BCryptKeyHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/BCryptKeyHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/LocalAllocHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/LocalAllocHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/LocalAllocHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/NCryptDescriptorHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/NCryptDescriptorHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/NCryptDescriptorHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/SafeLibraryHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/SafeLibraryHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/SafeLibraryHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/SecureLocalAllocHandle.cs b/src/DataProtection/Cryptography.Internal/src/SafeHandles/SecureLocalAllocHandle.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/SafeHandles/SecureLocalAllocHandle.cs
rename to src/DataProtection/Cryptography.Internal/src/SafeHandles/SecureLocalAllocHandle.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/UnsafeBufferUtil.cs b/src/DataProtection/Cryptography.Internal/src/UnsafeBufferUtil.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/UnsafeBufferUtil.cs
rename to src/DataProtection/Cryptography.Internal/src/UnsafeBufferUtil.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/UnsafeNativeMethods.cs b/src/DataProtection/Cryptography.Internal/src/UnsafeNativeMethods.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/UnsafeNativeMethods.cs
rename to src/DataProtection/Cryptography.Internal/src/UnsafeNativeMethods.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/WeakReferenceHelpers.cs b/src/DataProtection/Cryptography.Internal/src/WeakReferenceHelpers.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/WeakReferenceHelpers.cs
rename to src/DataProtection/Cryptography.Internal/src/WeakReferenceHelpers.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/baseline.netcore.json b/src/DataProtection/Cryptography.Internal/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.Internal/baseline.netcore.json
rename to src/DataProtection/Cryptography.Internal/src/baseline.netcore.json
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_Tests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_Tests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_Tests.cs
rename to src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_Tests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs
rename to src/DataProtection/Cryptography.Internal/test/Cng/BCRYPT_KEY_LENGTHS_STRUCT_Tests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCryptUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/BCryptUtilTests.cs
rename to src/DataProtection/Cryptography.Internal/test/Cng/BCryptUtilTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/CachedAlgorithmHandlesTests.cs b/src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Cng/CachedAlgorithmHandlesTests.cs
rename to src/DataProtection/Cryptography.Internal/test/Cng/CachedAlgorithmHandlesTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/CryptoUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/CryptoUtilTests.cs
rename to src/DataProtection/Cryptography.Internal/test/CryptoUtilTests.cs
diff --git a/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj b/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj
new file mode 100644
index 0000000000..2a67e3345b
--- /dev/null
+++ b/src/DataProtection/Cryptography.Internal/test/Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj
@@ -0,0 +1,16 @@
+
+
+
+ netcoreapp2.1;netcoreapp2.0;net461
+ true
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Properties/AssemblyInfo.cs b/src/DataProtection/Cryptography.Internal/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Properties/AssemblyInfo.cs
rename to src/DataProtection/Cryptography.Internal/test/Properties/AssemblyInfo.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/SafeHandles/SecureLocalAllocHandleTests.cs b/src/DataProtection/Cryptography.Internal/test/SafeHandles/SecureLocalAllocHandleTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/SafeHandles/SecureLocalAllocHandleTests.cs
rename to src/DataProtection/Cryptography.Internal/test/SafeHandles/SecureLocalAllocHandleTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/UnsafeBufferUtilTests.cs b/src/DataProtection/Cryptography.Internal/test/UnsafeBufferUtilTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/UnsafeBufferUtilTests.cs
rename to src/DataProtection/Cryptography.Internal/test/UnsafeBufferUtilTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/WeakReferenceHelpersTests.cs b/src/DataProtection/Cryptography.Internal/test/WeakReferenceHelpersTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/WeakReferenceHelpersTests.cs
rename to src/DataProtection/Cryptography.Internal/test/WeakReferenceHelpersTests.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/KeyDerivation.cs b/src/DataProtection/Cryptography.KeyDerivation/src/KeyDerivation.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/KeyDerivation.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/KeyDerivation.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/KeyDerivationPrf.cs b/src/DataProtection/Cryptography.KeyDerivation/src/KeyDerivationPrf.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/KeyDerivationPrf.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/KeyDerivationPrf.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
similarity index 76%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
rename to src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
index 70205f1754..ac98d14665 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
+++ b/src/DataProtection/Cryptography.KeyDerivation/src/Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/IPbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/IPbkdf2Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/IPbkdf2Provider.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/IPbkdf2Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/ManagedPbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/ManagedPbkdf2Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/ManagedPbkdf2Provider.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/ManagedPbkdf2Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/NetCorePbkdf2Provider.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/NetCorePbkdf2Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Pbkdf2Util.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Pbkdf2Util.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Win7Pbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Win7Pbkdf2Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Win7Pbkdf2Provider.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Win7Pbkdf2Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Win8Pbkdf2Provider.cs b/src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Win8Pbkdf2Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/PBKDF2/Win8Pbkdf2Provider.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/PBKDF2/Win8Pbkdf2Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Properties/AssemblyInfo.cs b/src/DataProtection/Cryptography.KeyDerivation/src/Properties/AssemblyInfo.cs
similarity index 77%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Properties/AssemblyInfo.cs
rename to src/DataProtection/Cryptography.KeyDerivation/src/Properties/AssemblyInfo.cs
index 838462a81d..3c31a0762e 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Abstractions/Properties/AssemblyInfo.cs
+++ b/src/DataProtection/Cryptography.KeyDerivation/src/Properties/AssemblyInfo.cs
@@ -3,5 +3,4 @@
using System.Runtime.CompilerServices;
-// for unit testing
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Abstractions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/baseline.netcore.json b/src/DataProtection/Cryptography.KeyDerivation/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/baseline.netcore.json
rename to src/DataProtection/Cryptography.KeyDerivation/src/baseline.netcore.json
diff --git a/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj b/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj
new file mode 100644
index 0000000000..3f6b273467
--- /dev/null
+++ b/src/DataProtection/Cryptography.KeyDerivation/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj
@@ -0,0 +1,17 @@
+
+
+
+ netcoreapp2.1;netcoreapp2.0;net461
+ true
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs b/src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Pbkdf2Tests.cs
rename to src/DataProtection/Cryptography.KeyDerivation/test/Pbkdf2Tests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Properties/AssemblyInfo.cs b/src/DataProtection/Cryptography.KeyDerivation/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Properties/AssemblyInfo.cs
rename to src/DataProtection/Cryptography.KeyDerivation/test/Properties/AssemblyInfo.cs
diff --git a/src/DataProtection/DataProtection.sln b/src/DataProtection/DataProtection.sln
index c08ab6a1ce..83b5219faf 100644
--- a/src/DataProtection/DataProtection.sln
+++ b/src/DataProtection/DataProtection.sln
@@ -1,300 +1,387 @@
+
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
-VisualStudioVersion = 15.0.26814.1
-MinimumVisualStudioVersion = 15.0.26730.03
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}"
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abstractions", "Abstractions", "{ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{60336AB3-948D-4D15-A5FB-F32A2B91E814}"
- ProjectSection(SolutionItems) = preProject
- test\CreateTestCert.ps1 = test\CreateTestCert.ps1
- test\Directory.Build.props = test\Directory.Build.props
- EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "Abstractions\src\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{18BE6FD1-1EB1-44AD-A3AE-398C990060F5}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{5A3A5DE3-49AD-431C-971D-B01B62D94AE2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Abstractions.Tests", "Abstractions\test\Microsoft.AspNetCore.DataProtection.Abstractions.Tests.csproj", "{CEDC6CD0-0276-4C45-9B57-C222516840B9}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E1D86B1B-41D8-43C9-97FD-C2BF65C414E2}"
- ProjectSection(SolutionItems) = preProject
- .appveyor.yml = .appveyor.yml
- .gitattributes = .gitattributes
- .gitignore = .gitignore
- .travis.yml = .travis.yml
- CONTRIBUTING.md = CONTRIBUTING.md
- build\dependencies.props = build\dependencies.props
- Directory.Build.props = Directory.Build.props
- Directory.Build.targets = Directory.Build.targets
- korebuild.json = korebuild.json
- LICENSE.txt = LICENSE.txt
- NuGet.config = NuGet.config
- NuGetPackageVerifier.json = NuGetPackageVerifier.json
- Provision-AutoGenKeys.ps1 = Provision-AutoGenKeys.ps1
- README.md = README.md
- version.props = version.props
- EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureKeyVault", "AzureKeyVault", "{695602EE-F2FD-4B9B-AF84-9208AE552B9E}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection", "src\Microsoft.AspNetCore.DataProtection\Microsoft.AspNetCore.DataProtection.csproj", "{1E570CD4-6F12-44F4-961E-005EE2002BC2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.AzureKeyVault", "AzureKeyVault\src\Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj", "{DDA72406-95B8-4A67-A994-F1E5F2506126}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Test", "test\Microsoft.AspNetCore.DataProtection.Test\Microsoft.AspNetCore.DataProtection.Test.csproj", "{7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests", "AzureKeyVault\test\Microsoft.AspNetCore.DataProtection.AzureKeyVault.Tests.csproj", "{0C2EE847-D78B-46FD-AB73-EAB8200C9138}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal", "src\Microsoft.AspNetCore.Cryptography.Internal\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{E2779976-A28C-4365-A4BB-4AD854FAF23E}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AzureStorage", "AzureStorage", "{5CD76E65-363F-4CD5-B01D-2DF5DC16CB64}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation", "src\Microsoft.AspNetCore.Cryptography.KeyDerivation\Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj", "{421F0383-34B1-402D-807B-A94542513ABA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.AzureStorage", "AzureStorage\src\Microsoft.AspNetCore.DataProtection.AzureStorage.csproj", "{22860B07-A42B-4757-9208-7D6BDB2B48F3}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation.Test", "test\Microsoft.AspNetCore.Cryptography.KeyDerivation.Test\Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj", "{42C97F52-8D56-46BD-A712-4F22BED157A7}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.AzureStorage.Tests", "AzureStorage\test\Microsoft.AspNetCore.DataProtection.AzureStorage.Tests.csproj", "{C36DAB08-F641-4C5A-86C0-3CC39FC779D9}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cryptography.Internal.Test", "test\Microsoft.AspNetCore.Cryptography.Internal.Test\Microsoft.AspNetCore.Cryptography.Internal.Test.csproj", "{37053D5F-5B61-47CE-8B72-298CE007FFB0}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cryptography.Internal", "Cryptography.Internal", "{A5DE8834-6C9B-47A6-9CDC-AAB83C776F19}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions", "src\Microsoft.AspNetCore.DataProtection.Abstractions\Microsoft.AspNetCore.DataProtection.Abstractions.csproj", "{4B115BDE-B253-46A6-97BF-A8B37B344FF2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Cryptography.Internal", "Cryptography.Internal\src\Microsoft.AspNetCore.Cryptography.Internal.csproj", "{93B3396D-0234-4D4E-A85B-4A391E0C6FE0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Abstractions.Test", "test\Microsoft.AspNetCore.DataProtection.Abstractions.Test\Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj", "{FF650A69-DEE4-4B36-9E30-264EE7CFB478}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Cryptography.Internal.Tests", "Cryptography.Internal\test\Microsoft.AspNetCore.Cryptography.Internal.Tests.csproj", "{14FD172E-4134-4712-AE77-524208FFEA1C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.SystemWeb", "src\Microsoft.AspNetCore.DataProtection.SystemWeb\Microsoft.AspNetCore.DataProtection.SystemWeb.csproj", "{E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Cryptography.KeyDerivation", "Cryptography.KeyDerivation", "{EFADD18C-A0D7-4F51-AEAB-9E3346A208BF}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions.Test", "test\Microsoft.AspNetCore.DataProtection.Extensions.Test\Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj", "{04AA8E60-A053-4D50-89FE-E76C3DF45200}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation", "Cryptography.KeyDerivation\src\Microsoft.AspNetCore.Cryptography.KeyDerivation.csproj", "{A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Extensions", "src\Microsoft.AspNetCore.DataProtection.Extensions\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{BF8681DB-C28B-441F-BD92-0DCFE9537A9F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests", "Cryptography.KeyDerivation\test\Microsoft.AspNetCore.Cryptography.KeyDerivation.Tests.csproj", "{3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Redis", "src\Microsoft.AspNetCore.DataProtection.Redis\Microsoft.AspNetCore.DataProtection.Redis.csproj", "{0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataProtection", "DataProtection", "{78481E7D-CD56-4700-A2FD-C8EAE9F0B51B}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureStorage", "src\Microsoft.AspNetCore.DataProtection.AzureStorage\Microsoft.AspNetCore.DataProtection.AzureStorage.csproj", "{CC799B57-81E2-4F45-8A32-0D5F49753C3F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection", "DataProtection\src\Microsoft.AspNetCore.DataProtection.csproj", "{B590E838-37CE-4651-835B-7F83A6C987CE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureBlob", "samples\AzureBlob\AzureBlob.csproj", "{B07435B3-CD81-4E3B-88A5-6384821E1C01}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Tests", "DataProtection\test\Microsoft.AspNetCore.DataProtection.Tests.csproj", "{4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.Redis.Test", "test\Microsoft.AspNetCore.DataProtection.Redis.Test\Microsoft.AspNetCore.DataProtection.Redis.Test.csproj", "{ABCF00E5-5B2F-469C-90DC-908C5A04C08D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{361B9ACA-DCA4-4C1B-A071-906348E849C0}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureStorage.Test", "test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test\Microsoft.AspNetCore.DataProtection.AzureStorage.Test.csproj", "{8C41240E-48F8-402F-9388-74CFE27F4D76}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Extensions", "Extensions\src\Microsoft.AspNetCore.DataProtection.Extensions.csproj", "{7A64B793-719C-4EEE-A8FA-87AAABCC29AC}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Redis", "samples\Redis\Redis.csproj", "{24AAEC96-DF46-4F61-B2FF-3D5E056685D9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Extensions.Tests", "Extensions\test\Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj", "{DC6D371D-200A-40D9-B4BE-C9202C27A863}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NonDISample", "samples\NonDISample\NonDISample.csproj", "{32CF970B-E2F1-4CD9-8DB3-F5715475373A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Redis", "Redis", "{1A2E71DA-8DFE-4DDA-B713-14B5F2B8EBAE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyManagementSample", "samples\KeyManagementSample\KeyManagementSample.csproj", "{6E066F8D-2910-404F-8949-F58125E28495}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Redis", "Redis\src\Microsoft.AspNetCore.DataProtection.Redis.csproj", "{0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CustomEncryptorSample", "samples\CustomEncryptorSample\CustomEncryptorSample.csproj", "{F4D59BBD-6145-4EE0-BA6E-AD03605BF151}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.Redis.Tests", "Redis\test\Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj", "{8A71D3B4-D617-4960-8616-A196FBF351FE}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureKeyVault", "src\Microsoft.AspNetCore.DataProtection.AzureKeyVault\Microsoft.AspNetCore.DataProtection.AzureKeyVault.csproj", "{4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{9DF098B3-C8ED-471C-AE03-52E3196C1811}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureKeyVault", "samples\AzureKeyVault\AzureKeyVault.csproj", "{295E8539-5450-4764-B3F5-51F968628022}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureBlob", "samples\AzureBlob\AzureBlob.csproj", "{BB197CC9-04B8-4BC7-BB2E-703798B82FD4}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test", "test\Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test\Microsoft.AspNetCore.DataProtection.AzureKeyVault.Test.csproj", "{C85ED942-8121-453F-8308-9DB730843B63}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureKeyVault", "samples\AzureKeyVault\AzureKeyVault.csproj", "{D8E4ED57-3D14-4453-A2FE-D36C97AE4273}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomEncryptorSample", "samples\CustomEncryptorSample\CustomEncryptorSample.csproj", "{9824655A-4BBF-418E-A7D9-3DA52D98D16D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeyManagementSample", "samples\KeyManagementSample\KeyManagementSample.csproj", "{03406538-75CB-4655-B210-643FE11A2B00}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NonDISample", "samples\NonDISample\NonDISample.csproj", "{C5C425C8-5626-409B-9A81-4DC496CE41F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Redis", "samples\Redis\Redis.csproj", "{E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SystemWeb", "SystemWeb", "{AA4BAE43-BD74-4292-8468-46F4DF60F9C7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.DataProtection.SystemWeb", "SystemWeb\src\Microsoft.AspNetCore.DataProtection.SystemWeb.csproj", "{A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
+ Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
+ Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Release|Any CPU.Build.0 = Release|Any CPU
- {1E570CD4-6F12-44F4-961E-005EE2002BC2}.Release|x86.ActiveCfg = Release|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Release|Any CPU.Build.0 = Release|Any CPU
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF}.Release|x86.ActiveCfg = Release|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Debug|x86.Build.0 = Debug|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Release|Any CPU.Build.0 = Release|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Release|x86.ActiveCfg = Release|Any CPU
- {E2779976-A28C-4365-A4BB-4AD854FAF23E}.Release|x86.Build.0 = Release|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Debug|x86.ActiveCfg = Debug|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Debug|x86.Build.0 = Debug|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Release|Any CPU.Build.0 = Release|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Release|x86.ActiveCfg = Release|Any CPU
- {421F0383-34B1-402D-807B-A94542513ABA}.Release|x86.Build.0 = Release|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Debug|x86.Build.0 = Debug|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Release|Any CPU.Build.0 = Release|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Release|x86.ActiveCfg = Release|Any CPU
- {42C97F52-8D56-46BD-A712-4F22BED157A7}.Release|x86.Build.0 = Release|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Debug|x86.ActiveCfg = Debug|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Debug|x86.Build.0 = Debug|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Release|Any CPU.Build.0 = Release|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Release|x86.ActiveCfg = Release|Any CPU
- {37053D5F-5B61-47CE-8B72-298CE007FFB0}.Release|x86.Build.0 = Release|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Debug|x86.Build.0 = Debug|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Release|Any CPU.Build.0 = Release|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Release|x86.ActiveCfg = Release|Any CPU
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2}.Release|x86.Build.0 = Release|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Debug|x86.ActiveCfg = Debug|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Debug|x86.Build.0 = Debug|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|Any CPU.Build.0 = Release|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|x86.ActiveCfg = Release|Any CPU
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478}.Release|x86.Build.0 = Release|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Debug|x86.Build.0 = Debug|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Release|Any CPU.Build.0 = Release|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Release|x86.ActiveCfg = Release|Any CPU
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6}.Release|x86.Build.0 = Release|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Debug|x86.ActiveCfg = Debug|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Debug|x86.Build.0 = Debug|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Release|Any CPU.Build.0 = Release|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Release|x86.ActiveCfg = Release|Any CPU
- {04AA8E60-A053-4D50-89FE-E76C3DF45200}.Release|x86.Build.0 = Release|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Debug|x86.Build.0 = Debug|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|Any CPU.Build.0 = Release|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|x86.ActiveCfg = Release|Any CPU
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F}.Release|x86.Build.0 = Release|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Debug|x86.Build.0 = Debug|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|Any CPU.Build.0 = Release|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|x86.ActiveCfg = Release|Any CPU
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9}.Release|x86.Build.0 = Release|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|x86.ActiveCfg = Debug|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Debug|x86.Build.0 = Debug|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Release|Any CPU.Build.0 = Release|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Release|x86.ActiveCfg = Release|Any CPU
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F}.Release|x86.Build.0 = Release|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Debug|x86.ActiveCfg = Debug|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Debug|x86.Build.0 = Debug|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|Any CPU.Build.0 = Release|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|x86.ActiveCfg = Release|Any CPU
- {B07435B3-CD81-4E3B-88A5-6384821E1C01}.Release|x86.Build.0 = Release|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|x86.ActiveCfg = Debug|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Debug|x86.Build.0 = Debug|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|Any CPU.Build.0 = Release|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|x86.ActiveCfg = Release|Any CPU
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D}.Release|x86.Build.0 = Release|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|x86.ActiveCfg = Debug|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Debug|x86.Build.0 = Debug|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Release|Any CPU.Build.0 = Release|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Release|x86.ActiveCfg = Release|Any CPU
- {8C41240E-48F8-402F-9388-74CFE27F4D76}.Release|x86.Build.0 = Release|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Debug|x86.Build.0 = Debug|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Release|Any CPU.Build.0 = Release|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Release|x86.ActiveCfg = Release|Any CPU
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9}.Release|x86.Build.0 = Release|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Debug|x86.ActiveCfg = Debug|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Debug|x86.Build.0 = Debug|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Release|Any CPU.Build.0 = Release|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Release|x86.ActiveCfg = Release|Any CPU
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A}.Release|x86.Build.0 = Release|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Debug|x86.ActiveCfg = Debug|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Debug|x86.Build.0 = Debug|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Release|Any CPU.Build.0 = Release|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Release|x86.ActiveCfg = Release|Any CPU
- {6E066F8D-2910-404F-8949-F58125E28495}.Release|x86.Build.0 = Release|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Debug|x86.ActiveCfg = Debug|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Debug|x86.Build.0 = Debug|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Release|Any CPU.Build.0 = Release|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Release|x86.ActiveCfg = Release|Any CPU
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151}.Release|x86.Build.0 = Release|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Debug|x86.Build.0 = Debug|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Release|Any CPU.Build.0 = Release|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Release|x86.ActiveCfg = Release|Any CPU
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9}.Release|x86.Build.0 = Release|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Debug|x86.ActiveCfg = Debug|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Debug|x86.Build.0 = Debug|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Release|Any CPU.Build.0 = Release|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Release|x86.ActiveCfg = Release|Any CPU
- {295E8539-5450-4764-B3F5-51F968628022}.Release|x86.Build.0 = Release|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Debug|x86.ActiveCfg = Debug|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Debug|x86.Build.0 = Debug|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Release|Any CPU.Build.0 = Release|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Release|x86.ActiveCfg = Release|Any CPU
- {C85ED942-8121-453F-8308-9DB730843B63}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {1E570CD4-6F12-44F4-961E-005EE2002BC2} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {7A637185-2BA1-437D-9D4C-7CC4F94CF7BF} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {E2779976-A28C-4365-A4BB-4AD854FAF23E} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {421F0383-34B1-402D-807B-A94542513ABA} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {42C97F52-8D56-46BD-A712-4F22BED157A7} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {37053D5F-5B61-47CE-8B72-298CE007FFB0} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {4B115BDE-B253-46A6-97BF-A8B37B344FF2} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {FF650A69-DEE4-4B36-9E30-264EE7CFB478} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {E3552DEB-4173-43AE-BF69-3C10DFF3BAB6} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {04AA8E60-A053-4D50-89FE-E76C3DF45200} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {BF8681DB-C28B-441F-BD92-0DCFE9537A9F} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {0508ADB0-9D2E-4506-9AA3-C15D7BEAE7C9} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {CC799B57-81E2-4F45-8A32-0D5F49753C3F} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {B07435B3-CD81-4E3B-88A5-6384821E1C01} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {ABCF00E5-5B2F-469C-90DC-908C5A04C08D} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {8C41240E-48F8-402F-9388-74CFE27F4D76} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
- {24AAEC96-DF46-4F61-B2FF-3D5E056685D9} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {32CF970B-E2F1-4CD9-8DB3-F5715475373A} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {6E066F8D-2910-404F-8949-F58125E28495} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {F4D59BBD-6145-4EE0-BA6E-AD03605BF151} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {4E76B2A8-9DC3-46E6-B5FC-097A1D1DFBE9} = {5FCB2DA3-5395-47F5-BCEE-E0EA319448EA}
- {295E8539-5450-4764-B3F5-51F968628022} = {5A3A5DE3-49AD-431C-971D-B01B62D94AE2}
- {C85ED942-8121-453F-8308-9DB730843B63} = {60336AB3-948D-4D15-A5FB-F32A2B91E814}
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|x64.Build.0 = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Debug|x86.Build.0 = Debug|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|x64.ActiveCfg = Release|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|x64.Build.0 = Release|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|x86.ActiveCfg = Release|Any CPU
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5}.Release|x86.Build.0 = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|x64.Build.0 = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Debug|x86.Build.0 = Debug|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|x64.ActiveCfg = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|x64.Build.0 = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|x86.ActiveCfg = Release|Any CPU
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9}.Release|x86.Build.0 = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|x64.Build.0 = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Debug|x86.Build.0 = Debug|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|x64.ActiveCfg = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|x64.Build.0 = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|x86.ActiveCfg = Release|Any CPU
+ {DDA72406-95B8-4A67-A994-F1E5F2506126}.Release|x86.Build.0 = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|x64.Build.0 = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Debug|x86.Build.0 = Debug|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|x64.ActiveCfg = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|x64.Build.0 = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|x86.ActiveCfg = Release|Any CPU
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138}.Release|x86.Build.0 = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|x64.Build.0 = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Debug|x86.Build.0 = Debug|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|x64.ActiveCfg = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|x64.Build.0 = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|x86.ActiveCfg = Release|Any CPU
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3}.Release|x86.Build.0 = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|x64.Build.0 = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Debug|x86.Build.0 = Debug|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|x64.ActiveCfg = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|x64.Build.0 = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|x86.ActiveCfg = Release|Any CPU
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9}.Release|x86.Build.0 = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|x64.Build.0 = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Debug|x86.Build.0 = Debug|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|x64.ActiveCfg = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|x64.Build.0 = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|x86.ActiveCfg = Release|Any CPU
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0}.Release|x86.Build.0 = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|x64.Build.0 = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Debug|x86.Build.0 = Debug|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|x64.ActiveCfg = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|x64.Build.0 = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|x86.ActiveCfg = Release|Any CPU
+ {14FD172E-4134-4712-AE77-524208FFEA1C}.Release|x86.Build.0 = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|x64.Build.0 = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Debug|x86.Build.0 = Debug|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|x64.ActiveCfg = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|x64.Build.0 = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|x86.ActiveCfg = Release|Any CPU
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A}.Release|x86.Build.0 = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|x64.Build.0 = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Debug|x86.Build.0 = Debug|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|x64.ActiveCfg = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|x64.Build.0 = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|x86.ActiveCfg = Release|Any CPU
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6}.Release|x86.Build.0 = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|x64.Build.0 = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Debug|x86.Build.0 = Debug|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|x64.ActiveCfg = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|x64.Build.0 = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|x86.ActiveCfg = Release|Any CPU
+ {B590E838-37CE-4651-835B-7F83A6C987CE}.Release|x86.Build.0 = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|x64.Build.0 = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Debug|x86.Build.0 = Debug|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|x64.ActiveCfg = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|x64.Build.0 = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|x86.ActiveCfg = Release|Any CPU
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463}.Release|x86.Build.0 = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|x64.Build.0 = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Debug|x86.Build.0 = Debug|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|x64.ActiveCfg = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|x64.Build.0 = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|x86.ActiveCfg = Release|Any CPU
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC}.Release|x86.Build.0 = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|x64.Build.0 = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Debug|x86.Build.0 = Debug|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|x64.ActiveCfg = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|x64.Build.0 = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|x86.ActiveCfg = Release|Any CPU
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863}.Release|x86.Build.0 = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|x64.Build.0 = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Debug|x86.Build.0 = Debug|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|x64.ActiveCfg = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|x64.Build.0 = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|x86.ActiveCfg = Release|Any CPU
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7}.Release|x86.Build.0 = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|x64.Build.0 = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Debug|x86.Build.0 = Debug|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|x64.ActiveCfg = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|x64.Build.0 = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|x86.ActiveCfg = Release|Any CPU
+ {8A71D3B4-D617-4960-8616-A196FBF351FE}.Release|x86.Build.0 = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|x64.Build.0 = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Debug|x86.Build.0 = Debug|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|x64.ActiveCfg = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|x64.Build.0 = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|x86.ActiveCfg = Release|Any CPU
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4}.Release|x86.Build.0 = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|x64.Build.0 = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Debug|x86.Build.0 = Debug|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|x64.ActiveCfg = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|x64.Build.0 = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|x86.ActiveCfg = Release|Any CPU
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273}.Release|x86.Build.0 = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|x64.Build.0 = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Debug|x86.Build.0 = Debug|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|x64.ActiveCfg = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|x64.Build.0 = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|x86.ActiveCfg = Release|Any CPU
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D}.Release|x86.Build.0 = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|x64.Build.0 = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Debug|x86.Build.0 = Debug|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|Any CPU.Build.0 = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|x64.ActiveCfg = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|x64.Build.0 = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|x86.ActiveCfg = Release|Any CPU
+ {03406538-75CB-4655-B210-643FE11A2B00}.Release|x86.Build.0 = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|x64.Build.0 = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Debug|x86.Build.0 = Debug|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|x64.ActiveCfg = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|x64.Build.0 = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|x86.ActiveCfg = Release|Any CPU
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4}.Release|x86.Build.0 = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|x64.Build.0 = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Debug|x86.Build.0 = Debug|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|x64.ActiveCfg = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|x64.Build.0 = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|x86.ActiveCfg = Release|Any CPU
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E}.Release|x86.Build.0 = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|x64.Build.0 = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Debug|x86.Build.0 = Debug|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|x64.ActiveCfg = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|x64.Build.0 = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|x86.ActiveCfg = Release|Any CPU
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {DD305D75-BD1B-43AE-BF04-869DA6A0858F}
+ GlobalSection(NestedProjects) = preSolution
+ {18BE6FD1-1EB1-44AD-A3AE-398C990060F5} = {ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}
+ {CEDC6CD0-0276-4C45-9B57-C222516840B9} = {ABD364B3-09A1-4CFE-8D26-FF6417DDEC84}
+ {DDA72406-95B8-4A67-A994-F1E5F2506126} = {695602EE-F2FD-4B9B-AF84-9208AE552B9E}
+ {0C2EE847-D78B-46FD-AB73-EAB8200C9138} = {695602EE-F2FD-4B9B-AF84-9208AE552B9E}
+ {22860B07-A42B-4757-9208-7D6BDB2B48F3} = {5CD76E65-363F-4CD5-B01D-2DF5DC16CB64}
+ {C36DAB08-F641-4C5A-86C0-3CC39FC779D9} = {5CD76E65-363F-4CD5-B01D-2DF5DC16CB64}
+ {93B3396D-0234-4D4E-A85B-4A391E0C6FE0} = {A5DE8834-6C9B-47A6-9CDC-AAB83C776F19}
+ {14FD172E-4134-4712-AE77-524208FFEA1C} = {A5DE8834-6C9B-47A6-9CDC-AAB83C776F19}
+ {A82BAE81-24E3-48DF-96BA-C8A6FEDD274A} = {EFADD18C-A0D7-4F51-AEAB-9E3346A208BF}
+ {3121B1B2-92C8-4049-94E7-CB0A8D83A7E6} = {EFADD18C-A0D7-4F51-AEAB-9E3346A208BF}
+ {B590E838-37CE-4651-835B-7F83A6C987CE} = {78481E7D-CD56-4700-A2FD-C8EAE9F0B51B}
+ {4C48D2E2-789D-4ECF-8FB7-ADC46BC7A463} = {78481E7D-CD56-4700-A2FD-C8EAE9F0B51B}
+ {7A64B793-719C-4EEE-A8FA-87AAABCC29AC} = {361B9ACA-DCA4-4C1B-A071-906348E849C0}
+ {DC6D371D-200A-40D9-B4BE-C9202C27A863} = {361B9ACA-DCA4-4C1B-A071-906348E849C0}
+ {0FEAE8C5-4EAF-4E87-9A07-69FCE19B31D7} = {1A2E71DA-8DFE-4DDA-B713-14B5F2B8EBAE}
+ {8A71D3B4-D617-4960-8616-A196FBF351FE} = {1A2E71DA-8DFE-4DDA-B713-14B5F2B8EBAE}
+ {BB197CC9-04B8-4BC7-BB2E-703798B82FD4} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {D8E4ED57-3D14-4453-A2FE-D36C97AE4273} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {9824655A-4BBF-418E-A7D9-3DA52D98D16D} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {03406538-75CB-4655-B210-643FE11A2B00} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {C5C425C8-5626-409B-9A81-4DC496CE41F4} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {E578D5C2-76AD-4A9B-A4F0-3A74D7ACD98E} = {9DF098B3-C8ED-471C-AE03-52E3196C1811}
+ {A65DAFB6-E03F-4140-892F-D7CA3B8D81D7} = {AA4BAE43-BD74-4292-8468-46F4DF60F9C7}
EndGlobalSection
EndGlobal
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ActivatorExtensions.cs b/src/DataProtection/DataProtection/src/ActivatorExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ActivatorExtensions.cs
rename to src/DataProtection/DataProtection/src/ActivatorExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ApplyPolicyAttribute.cs b/src/DataProtection/DataProtection/src/ApplyPolicyAttribute.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ApplyPolicyAttribute.cs
rename to src/DataProtection/DataProtection/src/ApplyPolicyAttribute.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ArraySegmentExtensions.cs b/src/DataProtection/DataProtection/src/ArraySegmentExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ArraySegmentExtensions.cs
rename to src/DataProtection/DataProtection/src/ArraySegmentExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AlgorithmAssert.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/AlgorithmAssert.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AlgorithmAssert.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/AlgorithmAssert.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/AuthenticatedEncryptorExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorFactory.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/AuthenticatedEncryptorFactory.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/AuthenticatedEncryptorFactory.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/AuthenticatedEncryptorFactory.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactory.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactory.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactory.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactory.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactory.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactory.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactory.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactory.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AlgorithmConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AlgorithmConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AlgorithmConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AlgorithmConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IAuthenticatedEncryptorDescriptorDeserializer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IInternalAlgorithmConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IInternalAlgorithmConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/IInternalAlgorithmConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/IInternalAlgorithmConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfiguration.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/SecretExtensions.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/SecretExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/SecretExtensions.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/SecretExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/XmlExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ConfigurationModel/XmlSerializedDescriptorInfo.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/EncryptionAlgorithm.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/EncryptionAlgorithm.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/EncryptionAlgorithm.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/EncryptionAlgorithm.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/IAuthenticatedEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/IAuthenticatedEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorFactory.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/IAuthenticatedEncryptorFactory.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IAuthenticatedEncryptorFactory.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/IAuthenticatedEncryptorFactory.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/IOptimizedAuthenticatedEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactory.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactory.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactory.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactory.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ValidationAlgorithm.cs b/src/DataProtection/DataProtection/src/AuthenticatedEncryption/ValidationAlgorithm.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/AuthenticatedEncryption/ValidationAlgorithm.cs
rename to src/DataProtection/DataProtection/src/AuthenticatedEncryption/ValidationAlgorithm.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/BitHelpers.cs b/src/DataProtection/DataProtection/src/BitHelpers.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/BitHelpers.cs
rename to src/DataProtection/DataProtection/src/BitHelpers.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/BCryptGenRandomImpl.cs b/src/DataProtection/DataProtection/src/Cng/BCryptGenRandomImpl.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/BCryptGenRandomImpl.cs
rename to src/DataProtection/DataProtection/src/Cng/BCryptGenRandomImpl.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/CbcAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Cng/CbcAuthenticatedEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/CbcAuthenticatedEncryptor.cs
rename to src/DataProtection/DataProtection/src/Cng/CbcAuthenticatedEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/DpapiSecretSerializerHelper.cs b/src/DataProtection/DataProtection/src/Cng/DpapiSecretSerializerHelper.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/DpapiSecretSerializerHelper.cs
rename to src/DataProtection/DataProtection/src/Cng/DpapiSecretSerializerHelper.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/GcmAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Cng/GcmAuthenticatedEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/GcmAuthenticatedEncryptor.cs
rename to src/DataProtection/DataProtection/src/Cng/GcmAuthenticatedEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/IBCryptGenRandom.cs b/src/DataProtection/DataProtection/src/Cng/IBCryptGenRandom.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/IBCryptGenRandom.cs
rename to src/DataProtection/DataProtection/src/Cng/IBCryptGenRandom.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/Internal/CngAuthenticatedEncryptorBase.cs b/src/DataProtection/DataProtection/src/Cng/Internal/CngAuthenticatedEncryptorBase.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Cng/Internal/CngAuthenticatedEncryptorBase.cs
rename to src/DataProtection/DataProtection/src/Cng/Internal/CngAuthenticatedEncryptorBase.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionBuilderExtensions.cs b/src/DataProtection/DataProtection/src/DataProtectionBuilderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionBuilderExtensions.cs
rename to src/DataProtection/DataProtection/src/DataProtectionBuilderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionOptions.cs b/src/DataProtection/DataProtection/src/DataProtectionOptions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionOptions.cs
rename to src/DataProtection/DataProtection/src/DataProtectionOptions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionServiceCollectionExtensions.cs b/src/DataProtection/DataProtection/src/DataProtectionServiceCollectionExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionServiceCollectionExtensions.cs
rename to src/DataProtection/DataProtection/src/DataProtectionServiceCollectionExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionUtilityExtensions.cs b/src/DataProtection/DataProtection/src/DataProtectionUtilityExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/DataProtectionUtilityExtensions.cs
rename to src/DataProtection/DataProtection/src/DataProtectionUtilityExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/EphemeralDataProtectionProvider.cs b/src/DataProtection/DataProtection/src/EphemeralDataProtectionProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/EphemeralDataProtectionProvider.cs
rename to src/DataProtection/DataProtection/src/EphemeralDataProtectionProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Error.cs b/src/DataProtection/DataProtection/src/Error.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Error.cs
rename to src/DataProtection/DataProtection/src/Error.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IDataProtectionBuilder.cs b/src/DataProtection/DataProtection/src/IDataProtectionBuilder.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IDataProtectionBuilder.cs
rename to src/DataProtection/DataProtection/src/IDataProtectionBuilder.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IPersistedDataProtector.cs b/src/DataProtection/DataProtection/src/IPersistedDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IPersistedDataProtector.cs
rename to src/DataProtection/DataProtection/src/IPersistedDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IRegistryPolicyResolver.cs b/src/DataProtection/DataProtection/src/IRegistryPolicyResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/IRegistryPolicyResolver.cs
rename to src/DataProtection/DataProtection/src/IRegistryPolicyResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ISecret.cs b/src/DataProtection/DataProtection/src/ISecret.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/ISecret.cs
rename to src/DataProtection/DataProtection/src/ISecret.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionBuilder.cs b/src/DataProtection/DataProtection/src/Internal/DataProtectionBuilder.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionBuilder.cs
rename to src/DataProtection/DataProtection/src/Internal/DataProtectionBuilder.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionOptionsSetup.cs b/src/DataProtection/DataProtection/src/Internal/DataProtectionOptionsSetup.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionOptionsSetup.cs
rename to src/DataProtection/DataProtection/src/Internal/DataProtectionOptionsSetup.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionStartupFilter.cs b/src/DataProtection/DataProtection/src/Internal/DataProtectionStartupFilter.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DataProtectionStartupFilter.cs
rename to src/DataProtection/DataProtection/src/Internal/DataProtectionStartupFilter.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DockerUtils.cs b/src/DataProtection/DataProtection/src/Internal/DockerUtils.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/DockerUtils.cs
rename to src/DataProtection/DataProtection/src/Internal/DockerUtils.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/HostingApplicationDiscriminator.cs b/src/DataProtection/DataProtection/src/Internal/HostingApplicationDiscriminator.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/HostingApplicationDiscriminator.cs
rename to src/DataProtection/DataProtection/src/Internal/HostingApplicationDiscriminator.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/IActivator.cs b/src/DataProtection/DataProtection/src/Internal/IActivator.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/IActivator.cs
rename to src/DataProtection/DataProtection/src/Internal/IActivator.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/KeyManagementOptionsSetup.cs b/src/DataProtection/DataProtection/src/Internal/KeyManagementOptionsSetup.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Internal/KeyManagementOptionsSetup.cs
rename to src/DataProtection/DataProtection/src/Internal/KeyManagementOptionsSetup.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/DefaultKeyResolver.cs b/src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/DefaultKeyResolver.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/DefaultKeyResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/DeferredKey.cs b/src/DataProtection/DataProtection/src/KeyManagement/DeferredKey.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/DeferredKey.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/DeferredKey.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKey.cs b/src/DataProtection/DataProtection/src/KeyManagement/IKey.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKey.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/IKey.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKeyEscrowSink.cs b/src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKeyEscrowSink.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/IKeyEscrowSink.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKeyManager.cs b/src/DataProtection/DataProtection/src/KeyManagement/IKeyManager.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/IKeyManager.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/IKeyManager.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/CacheableKeyRing.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/CacheableKeyRing.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/CacheableKeyRing.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/CacheableKeyRing.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/DefaultKeyResolution.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/DefaultKeyResolution.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/DefaultKeyResolution.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/ICacheableKeyRingProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/ICacheableKeyRingProvider.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/ICacheableKeyRingProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IDefaultKeyResolver.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IDefaultKeyResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IDefaultKeyResolver.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/IDefaultKeyResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IInternalXmlKeyManager.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IInternalXmlKeyManager.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/IInternalXmlKeyManager.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IKeyRing.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRing.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IKeyRing.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRing.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IKeyRingProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Internal/IKeyRingProvider.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Internal/IKeyRingProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Key.cs b/src/DataProtection/DataProtection/src/KeyManagement/Key.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/Key.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/Key.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyBase.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyBase.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyBase.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyBase.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyEscrowServiceProviderExtensions.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyEscrowServiceProviderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyEscrowServiceProviderExtensions.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyEscrowServiceProviderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyExtensions.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyExtensions.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyManagementOptions.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyManagementOptions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyManagementOptions.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyManagementOptions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRing.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyRing.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRing.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyRing.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtectionProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingBasedDataProtectionProvider.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtectionProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingBasedDataProtector.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyRingBasedDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingProvider.cs b/src/DataProtection/DataProtection/src/KeyManagement/KeyRingProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/KeyRingProvider.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/KeyRingProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/XmlKeyManager.cs b/src/DataProtection/DataProtection/src/KeyManagement/XmlKeyManager.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/KeyManagement/XmlKeyManager.cs
rename to src/DataProtection/DataProtection/src/KeyManagement/XmlKeyManager.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/LoggingExtensions.cs b/src/DataProtection/DataProtection/src/LoggingExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/LoggingExtensions.cs
rename to src/DataProtection/DataProtection/src/LoggingExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/LoggingServiceProviderExtensions.cs b/src/DataProtection/DataProtection/src/LoggingServiceProviderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/LoggingServiceProviderExtensions.cs
rename to src/DataProtection/DataProtection/src/LoggingServiceProviderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/HashAlgorithmExtensions.cs b/src/DataProtection/DataProtection/src/Managed/HashAlgorithmExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/HashAlgorithmExtensions.cs
rename to src/DataProtection/DataProtection/src/Managed/HashAlgorithmExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/IManagedGenRandom.cs b/src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/IManagedGenRandom.cs
rename to src/DataProtection/DataProtection/src/Managed/IManagedGenRandom.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs b/src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/ManagedAuthenticatedEncryptor.cs
rename to src/DataProtection/DataProtection/src/Managed/ManagedAuthenticatedEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/ManagedGenRandomImpl.cs b/src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/ManagedGenRandomImpl.cs
rename to src/DataProtection/DataProtection/src/Managed/ManagedGenRandomImpl.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/SymmetricAlgorithmExtensions.cs b/src/DataProtection/DataProtection/src/Managed/SymmetricAlgorithmExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Managed/SymmetricAlgorithmExtensions.cs
rename to src/DataProtection/DataProtection/src/Managed/SymmetricAlgorithmExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/MemoryProtection.cs b/src/DataProtection/DataProtection/src/MemoryProtection.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/MemoryProtection.cs
rename to src/DataProtection/DataProtection/src/MemoryProtection.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
similarity index 82%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj
rename to src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
index 3d3d87f25b..1428564533 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Microsoft.AspNetCore.DataProtection.csproj
+++ b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
@@ -10,12 +10,12 @@
-
+
-
-
+
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Properties/AssemblyInfo.cs b/src/DataProtection/DataProtection/src/Properties/AssemblyInfo.cs
similarity index 66%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Properties/AssemblyInfo.cs
rename to src/DataProtection/DataProtection/src/Properties/AssemblyInfo.cs
index 7816360b8b..6c9c4f8880 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Properties/AssemblyInfo.cs
+++ b/src/DataProtection/DataProtection/src/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Runtime.CompilerServices;
// for unit testing
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Properties/Resources.Designer.cs b/src/DataProtection/DataProtection/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Properties/Resources.Designer.cs
rename to src/DataProtection/DataProtection/src/Properties/Resources.Designer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/RegistryPolicy.cs b/src/DataProtection/DataProtection/src/RegistryPolicy.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/RegistryPolicy.cs
rename to src/DataProtection/DataProtection/src/RegistryPolicy.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/RegistryPolicyResolver.cs b/src/DataProtection/DataProtection/src/RegistryPolicyResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/RegistryPolicyResolver.cs
rename to src/DataProtection/DataProtection/src/RegistryPolicyResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/EphemeralXmlRepository.cs b/src/DataProtection/DataProtection/src/Repositories/EphemeralXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/EphemeralXmlRepository.cs
rename to src/DataProtection/DataProtection/src/Repositories/EphemeralXmlRepository.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/FileSystemXmlRepository.cs b/src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/FileSystemXmlRepository.cs
rename to src/DataProtection/DataProtection/src/Repositories/FileSystemXmlRepository.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/IXmlRepository.cs b/src/DataProtection/DataProtection/src/Repositories/IXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/IXmlRepository.cs
rename to src/DataProtection/DataProtection/src/Repositories/IXmlRepository.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/RegistryXmlRepository.cs b/src/DataProtection/DataProtection/src/Repositories/RegistryXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Repositories/RegistryXmlRepository.cs
rename to src/DataProtection/DataProtection/src/Repositories/RegistryXmlRepository.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Resources.resx b/src/DataProtection/DataProtection/src/Resources.resx
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Resources.resx
rename to src/DataProtection/DataProtection/src/Resources.resx
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs b/src/DataProtection/DataProtection/src/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs
rename to src/DataProtection/DataProtection/src/SP800_108/ISP800_108_CTR_HMACSHA512Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs b/src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
rename to src/DataProtection/DataProtection/src/SP800_108/ManagedSP800_108_CTR_HMACSHA512.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs b/src/DataProtection/DataProtection/src/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs
rename to src/DataProtection/DataProtection/src/SP800_108/SP800_108_CTR_HMACSHA512Extensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs b/src/DataProtection/DataProtection/src/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
rename to src/DataProtection/DataProtection/src/SP800_108/SP800_108_CTR_HMACSHA512Util.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs b/src/DataProtection/DataProtection/src/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs
rename to src/DataProtection/DataProtection/src/SP800_108/Win7SP800_108_CTR_HMACSHA512Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs b/src/DataProtection/DataProtection/src/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs
rename to src/DataProtection/DataProtection/src/SP800_108/Win8SP800_108_CTR_HMACSHA512Provider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Secret.cs b/src/DataProtection/DataProtection/src/Secret.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/Secret.cs
rename to src/DataProtection/DataProtection/src/Secret.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SimpleActivator.cs b/src/DataProtection/DataProtection/src/SimpleActivator.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/SimpleActivator.cs
rename to src/DataProtection/DataProtection/src/SimpleActivator.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/TypeExtensions.cs b/src/DataProtection/DataProtection/src/TypeExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/TypeExtensions.cs
rename to src/DataProtection/DataProtection/src/TypeExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/TypeForwardingActivator.cs b/src/DataProtection/DataProtection/src/TypeForwardingActivator.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/TypeForwardingActivator.cs
rename to src/DataProtection/DataProtection/src/TypeForwardingActivator.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlConstants.cs b/src/DataProtection/DataProtection/src/XmlConstants.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlConstants.cs
rename to src/DataProtection/DataProtection/src/XmlConstants.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/CertificateResolver.cs b/src/DataProtection/DataProtection/src/XmlEncryption/CertificateResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/CertificateResolver.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/CertificateResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/CertificateXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/CertificateXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/CertificateXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs b/src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGProtectionDescriptorFlags.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiNGXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/DpapiNGXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/DpapiXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/DpapiXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/DpapiXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/DpapiXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/DpapiXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/EncryptedXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/EncryptedXmlInfo.cs b/src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlInfo.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/EncryptedXmlInfo.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlInfo.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/ICertificateResolver.cs b/src/DataProtection/DataProtection/src/XmlEncryption/ICertificateResolver.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/ICertificateResolver.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/ICertificateResolver.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IInternalCertificateXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/IInternalCertificateXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IInternalCertificateXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/IInternalCertificateXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IInternalEncryptedXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/IInternalEncryptedXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IInternalEncryptedXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/IInternalEncryptedXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/IXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/IXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/IXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/IXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/IXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/NullXmlDecryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/NullXmlDecryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/NullXmlDecryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/NullXmlDecryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/NullXmlEncryptor.cs b/src/DataProtection/DataProtection/src/XmlEncryption/NullXmlEncryptor.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/NullXmlEncryptor.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/NullXmlEncryptor.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/XmlEncryptionExtensions.cs b/src/DataProtection/DataProtection/src/XmlEncryption/XmlEncryptionExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/XmlEncryptionExtensions.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/XmlEncryptionExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/XmlKeyDecryptionOptions.cs b/src/DataProtection/DataProtection/src/XmlEncryption/XmlKeyDecryptionOptions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlEncryption/XmlKeyDecryptionOptions.cs
rename to src/DataProtection/DataProtection/src/XmlEncryption/XmlKeyDecryptionOptions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlExtensions.cs b/src/DataProtection/DataProtection/src/XmlExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/XmlExtensions.cs
rename to src/DataProtection/DataProtection/src/XmlExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection/baseline.netcore.json b/src/DataProtection/DataProtection/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection/baseline.netcore.json
rename to src/DataProtection/DataProtection/src/baseline.netcore.json
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/ActivatorTests.cs b/src/DataProtection/DataProtection/test/ActivatorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/ActivatorTests.cs
rename to src/DataProtection/DataProtection/test/ActivatorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs b/src/DataProtection/DataProtection/test/AnonymousImpersonation.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AnonymousImpersonation.cs
rename to src/DataProtection/DataProtection/test/AnonymousImpersonation.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngCbcAuthenticatedEncryptorFactoryTest.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/CngGcmAuthenticatedEncryptorFactoryTest.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializerTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializerTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorDeserializerTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/AuthenticatedEncryptorDescriptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfigurationTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfigurationTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfigurationTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorConfigurationTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorDeserializerTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngCbcAuthenticatedEncryptorDescriptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfigurationTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfigurationTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfigurationTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorConfigurationTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorDeserializerTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/CngGcmAuthenticatedEncryptorDescriptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfigurationTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfigurationTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfigurationTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorConfigurationTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializerTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializerTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializerTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorDeserializerTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorTests.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorTests.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ConfigurationModel/ManagedAuthenticatedEncryptorDescriptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactoryTest.cs b/src/DataProtection/DataProtection/test/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactoryTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactoryTest.cs
rename to src/DataProtection/DataProtection/test/AuthenticatedEncryption/ManagedAuthenticatedEncryptorFactoryTest.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/CbcAuthenticatedEncryptorTests.cs
rename to src/DataProtection/DataProtection/test/Cng/CbcAuthenticatedEncryptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs b/src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/CngAuthenticatedEncryptorBaseTests.cs
rename to src/DataProtection/DataProtection/test/Cng/CngAuthenticatedEncryptorBaseTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Cng/GcmAuthenticatedEncryptorTests.cs
rename to src/DataProtection/DataProtection/test/Cng/GcmAuthenticatedEncryptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/DataProtectionUtilityExtensionsTests.cs b/src/DataProtection/DataProtection/test/DataProtectionUtilityExtensionsTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/DataProtectionUtilityExtensionsTests.cs
rename to src/DataProtection/DataProtection/test/DataProtectionUtilityExtensionsTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/DockerUtilsTests.cs b/src/DataProtection/DataProtection/test/DockerUtilsTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/DockerUtilsTests.cs
rename to src/DataProtection/DataProtection/test/DockerUtilsTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/EphemeralDataProtectionProviderTests.cs b/src/DataProtection/DataProtection/test/EphemeralDataProtectionProviderTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/EphemeralDataProtectionProviderTests.cs
rename to src/DataProtection/DataProtection/test/EphemeralDataProtectionProviderTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/HostingTests.cs b/src/DataProtection/DataProtection/test/HostingTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/HostingTests.cs
rename to src/DataProtection/DataProtection/test/HostingTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Internal/KeyManagementOptionsSetupTest.cs b/src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Internal/KeyManagementOptionsSetupTest.cs
rename to src/DataProtection/DataProtection/test/Internal/KeyManagementOptionsSetupTest.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/CacheableKeyRingTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/CacheableKeyRingTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/CacheableKeyRingTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/CacheableKeyRingTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/DefaultKeyResolverTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/DefaultKeyResolverTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/DefaultKeyResolverTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/DefaultKeyResolverTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/DeferredKeyTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/DeferredKeyTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/DeferredKeyTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/DeferredKeyTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/KeyEscrowServiceProviderExtensionsTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingBasedDataProtectorTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/KeyRingBasedDataProtectorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingBasedDataProtectorTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/KeyRingBasedDataProtectorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/KeyRingProviderTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingProviderTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/KeyRingProviderTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/KeyRingTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyRingTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/KeyRingTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/KeyTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/KeyTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/KeyTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs b/src/DataProtection/DataProtection/test/KeyManagement/XmlKeyManagerTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/KeyManagement/XmlKeyManagerTests.cs
rename to src/DataProtection/DataProtection/test/KeyManagement/XmlKeyManagerTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs b/src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Managed/ManagedAuthenticatedEncryptorTests.cs
rename to src/DataProtection/DataProtection/test/Managed/ManagedAuthenticatedEncryptorTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj
similarity index 71%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj
rename to src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj
index bf45498fbf..7f505ef53a 100644
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Microsoft.AspNetCore.DataProtection.Test.csproj
+++ b/src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests.csproj
@@ -1,17 +1,17 @@
- $(StandardTestTfms)
+ netcoreapp2.1;netcoreapp2.0;net461
true
-
+
-
+
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/MockExtensions.cs b/src/DataProtection/DataProtection/test/MockExtensions.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/MockExtensions.cs
rename to src/DataProtection/DataProtection/test/MockExtensions.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Properties/AssemblyInfo.cs b/src/DataProtection/DataProtection/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Properties/AssemblyInfo.cs
rename to src/DataProtection/DataProtection/test/Properties/AssemblyInfo.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/RegistryPolicyResolverTests.cs b/src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/RegistryPolicyResolverTests.cs
rename to src/DataProtection/DataProtection/test/RegistryPolicyResolverTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/EphemeralXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/EphemeralXmlRepositoryTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/EphemeralXmlRepositoryTests.cs
rename to src/DataProtection/DataProtection/test/Repositories/EphemeralXmlRepositoryTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/FileSystemXmlRepositoryTests.cs
rename to src/DataProtection/DataProtection/test/Repositories/FileSystemXmlRepositoryTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/RegistryXmlRepositoryTests.cs b/src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/Repositories/RegistryXmlRepositoryTests.cs
rename to src/DataProtection/DataProtection/test/Repositories/RegistryXmlRepositoryTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SP800_108/SP800_108Tests.cs b/src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SP800_108/SP800_108Tests.cs
rename to src/DataProtection/DataProtection/test/SP800_108/SP800_108Tests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SecretAssert.cs b/src/DataProtection/DataProtection/test/SecretAssert.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SecretAssert.cs
rename to src/DataProtection/DataProtection/test/SecretAssert.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SecretTests.cs b/src/DataProtection/DataProtection/test/SecretTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SecretTests.cs
rename to src/DataProtection/DataProtection/test/SecretTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SequentialGenRandom.cs b/src/DataProtection/DataProtection/test/SequentialGenRandom.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/SequentialGenRandom.cs
rename to src/DataProtection/DataProtection/test/SequentialGenRandom.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/ServiceCollectionTests.cs b/src/DataProtection/DataProtection/test/ServiceCollectionTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/ServiceCollectionTests.cs
rename to src/DataProtection/DataProtection/test/ServiceCollectionTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/StringLoggerFactory.cs b/src/DataProtection/DataProtection/test/StringLoggerFactory.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/StringLoggerFactory.cs
rename to src/DataProtection/DataProtection/test/StringLoggerFactory.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert1.PublicKeyOnly.cer b/src/DataProtection/DataProtection/test/TestFiles/TestCert1.PublicKeyOnly.cer
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert1.PublicKeyOnly.cer
rename to src/DataProtection/DataProtection/test/TestFiles/TestCert1.PublicKeyOnly.cer
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert1.pfx b/src/DataProtection/DataProtection/test/TestFiles/TestCert1.pfx
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert1.pfx
rename to src/DataProtection/DataProtection/test/TestFiles/TestCert1.pfx
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert2.pfx b/src/DataProtection/DataProtection/test/TestFiles/TestCert2.pfx
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TestFiles/TestCert2.pfx
rename to src/DataProtection/DataProtection/test/TestFiles/TestCert2.pfx
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs b/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs
similarity index 99%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs
rename to src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs
index 2b8931c98e..251369b7cd 100644
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Test/TypeForwardingActivatorTests.cs
+++ b/src/DataProtection/DataProtection/test/TypeForwardingActivatorTests.cs
@@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.DataProtection
var activator = services.GetActivator();
// Act
- var name = "Microsoft.AspNet.DataProtection.TypeForwardingActivatorTests+ClassWithParameterlessCtor, Microsoft.AspNet.DataProtection.Test, Version=1.0.0.0";
+ var name = "Microsoft.AspNet.DataProtection.TypeForwardingActivatorTests+ClassWithParameterlessCtor, Microsoft.AspNet.DataProtection.Tests, Version=1.0.0.0";
var instance = activator.CreateInstance
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/BitHelpers.cs b/src/DataProtection/Extensions/src/BitHelpers.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/BitHelpers.cs
rename to src/DataProtection/Extensions/src/BitHelpers.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/DataProtectionAdvancedExtensions.cs b/src/DataProtection/Extensions/src/DataProtectionAdvancedExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/DataProtectionAdvancedExtensions.cs
rename to src/DataProtection/Extensions/src/DataProtectionAdvancedExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/DataProtectionProvider.cs b/src/DataProtection/Extensions/src/DataProtectionProvider.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/DataProtectionProvider.cs
rename to src/DataProtection/Extensions/src/DataProtectionProvider.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/ITimeLimitedDataProtector.cs b/src/DataProtection/Extensions/src/ITimeLimitedDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/ITimeLimitedDataProtector.cs
rename to src/DataProtection/Extensions/src/ITimeLimitedDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
similarity index 78%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj
rename to src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
index 44885e5711..e8335310e4 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Microsoft.AspNetCore.DataProtection.Extensions.csproj
+++ b/src/DataProtection/Extensions/src/Microsoft.AspNetCore.DataProtection.Extensions.csproj
@@ -8,11 +8,11 @@
-
+
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Properties/AssemblyInfo.cs b/src/DataProtection/Extensions/src/Properties/AssemblyInfo.cs
similarity index 79%
rename from src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Properties/AssemblyInfo.cs
rename to src/DataProtection/Extensions/src/Properties/AssemblyInfo.cs
index 2ca6553c5d..19b8993815 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.Cryptography.KeyDerivation/Properties/AssemblyInfo.cs
+++ b/src/DataProtection/Extensions/src/Properties/AssemblyInfo.cs
@@ -3,4 +3,4 @@
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Cryptography.KeyDerivation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Properties/Resources.Designer.cs b/src/DataProtection/Extensions/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Properties/Resources.Designer.cs
rename to src/DataProtection/Extensions/src/Properties/Resources.Designer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Resources.resx b/src/DataProtection/Extensions/src/Resources.resx
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Resources.resx
rename to src/DataProtection/Extensions/src/Resources.resx
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/TimeLimitedDataProtector.cs b/src/DataProtection/Extensions/src/TimeLimitedDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/TimeLimitedDataProtector.cs
rename to src/DataProtection/Extensions/src/TimeLimitedDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/baseline.netcore.json b/src/DataProtection/Extensions/src/baseline.netcore.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/baseline.netcore.json
rename to src/DataProtection/Extensions/src/baseline.netcore.json
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionAdvancedExtensionsTests.cs b/src/DataProtection/Extensions/test/DataProtectionAdvancedExtensionsTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionAdvancedExtensionsTests.cs
rename to src/DataProtection/Extensions/test/DataProtectionAdvancedExtensionsTests.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/DataProtectionProviderTests.cs
rename to src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
diff --git a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
new file mode 100644
index 0000000000..24bd4c8933
--- /dev/null
+++ b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
@@ -0,0 +1,17 @@
+
+
+
+ netcoreapp2.1;netcoreapp2.0;net461
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Properties/AssemblyInfo.cs b/src/DataProtection/Extensions/test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Properties/AssemblyInfo.cs
rename to src/DataProtection/Extensions/test/Properties/AssemblyInfo.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TestFiles/TestCert.pfx b/src/DataProtection/Extensions/test/TestFiles/TestCert.pfx
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TestFiles/TestCert.pfx
rename to src/DataProtection/Extensions/test/TestFiles/TestCert.pfx
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TestFiles/TestCert2.pfx b/src/DataProtection/Extensions/test/TestFiles/TestCert2.pfx
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TestFiles/TestCert2.pfx
rename to src/DataProtection/Extensions/test/TestFiles/TestCert2.pfx
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TimeLimitedDataProtectorTests.cs b/src/DataProtection/Extensions/test/TimeLimitedDataProtectorTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/TimeLimitedDataProtectorTests.cs
rename to src/DataProtection/Extensions/test/TimeLimitedDataProtectorTests.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj b/src/DataProtection/Redis/src/Microsoft.AspNetCore.DataProtection.Redis.csproj
similarity index 89%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj
rename to src/DataProtection/Redis/src/Microsoft.AspNetCore.DataProtection.Redis.csproj
index 3cad440e37..45ed6e5bc3 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/Microsoft.AspNetCore.DataProtection.Redis.csproj
+++ b/src/DataProtection/Redis/src/Microsoft.AspNetCore.DataProtection.Redis.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs b/src/DataProtection/Redis/src/RedisDataProtectionBuilderExtensions.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/RedisDataProtectionBuilderExtensions.cs
rename to src/DataProtection/Redis/src/RedisDataProtectionBuilderExtensions.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/RedisXmlRepository.cs b/src/DataProtection/Redis/src/RedisXmlRepository.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Redis/RedisXmlRepository.cs
rename to src/DataProtection/Redis/src/RedisXmlRepository.cs
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/DataProtectionRedisTests.cs b/src/DataProtection/Redis/test/DataProtectionRedisTests.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/DataProtectionRedisTests.cs
rename to src/DataProtection/Redis/test/DataProtectionRedisTests.cs
diff --git a/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj b/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj
new file mode 100644
index 0000000000..426f2c2681
--- /dev/null
+++ b/src/DataProtection/Redis/test/Microsoft.AspNetCore.DataProtection.Redis.Tests.csproj
@@ -0,0 +1,15 @@
+
+
+
+ netcoreapp2.1;netcoreapp2.0;net461
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs b/src/DataProtection/Redis/test/RedisDataProtectionBuilderExtensionsTest.cs
similarity index 100%
rename from src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/RedisDataProtectionBuilderExtensionsTest.cs
rename to src/DataProtection/Redis/test/RedisDataProtectionBuilderExtensionsTest.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/CompatibilityDataProtector.cs b/src/DataProtection/SystemWeb/src/CompatibilityDataProtector.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/CompatibilityDataProtector.cs
rename to src/DataProtection/SystemWeb/src/CompatibilityDataProtector.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/DataProtectionStartup.cs b/src/DataProtection/SystemWeb/src/DataProtectionStartup.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/DataProtectionStartup.cs
rename to src/DataProtection/SystemWeb/src/DataProtectionStartup.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj b/src/DataProtection/SystemWeb/src/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
similarity index 87%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
rename to src/DataProtection/SystemWeb/src/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
index a40024990e..03629c1de3 100644
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
+++ b/src/DataProtection/SystemWeb/src/Microsoft.AspNetCore.DataProtection.SystemWeb.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Properties/Resources.Designer.cs b/src/DataProtection/SystemWeb/src/Properties/Resources.Designer.cs
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Properties/Resources.Designer.cs
rename to src/DataProtection/SystemWeb/src/Properties/Resources.Designer.cs
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Resources.resx b/src/DataProtection/SystemWeb/src/Resources.resx
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/Resources.resx
rename to src/DataProtection/SystemWeb/src/Resources.resx
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/baseline.netframework.json b/src/DataProtection/SystemWeb/src/baseline.netframework.json
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/baseline.netframework.json
rename to src/DataProtection/SystemWeb/src/baseline.netframework.json
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/web.config.transform b/src/DataProtection/SystemWeb/src/web.config.transform
similarity index 100%
rename from src/DataProtection/src/Microsoft.AspNetCore.DataProtection.SystemWeb/web.config.transform
rename to src/DataProtection/SystemWeb/src/web.config.transform
diff --git a/src/DataProtection/build/repo.props b/src/DataProtection/build/repo.props
index 37ae8832dc..b8dd411686 100644
--- a/src/DataProtection/build/repo.props
+++ b/src/DataProtection/build/repo.props
@@ -4,5 +4,9 @@
true
+ false
+ false
+ $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)..\'))
+ $(DataProtectionRoot)**\*.csproj
diff --git a/src/DataProtection/samples/AzureBlob/AzureBlob.csproj b/src/DataProtection/samples/AzureBlob/AzureBlob.csproj
index 8ba3d51f0f..5863e186ab 100644
--- a/src/DataProtection/samples/AzureBlob/AzureBlob.csproj
+++ b/src/DataProtection/samples/AzureBlob/AzureBlob.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj b/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj
index ce4ae01408..cd9e5cd193 100644
--- a/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj
+++ b/src/DataProtection/samples/AzureKeyVault/AzureKeyVault.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/DataProtection/samples/CustomEncryptorSample/CustomEncryptorSample.csproj b/src/DataProtection/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
index 1cfe237b50..3fd8400239 100644
--- a/src/DataProtection/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
+++ b/src/DataProtection/samples/CustomEncryptorSample/CustomEncryptorSample.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/DataProtection/samples/KeyManagementSample/KeyManagementSample.csproj b/src/DataProtection/samples/KeyManagementSample/KeyManagementSample.csproj
index e240e30b6d..89141c6a0e 100644
--- a/src/DataProtection/samples/KeyManagementSample/KeyManagementSample.csproj
+++ b/src/DataProtection/samples/KeyManagementSample/KeyManagementSample.csproj
@@ -6,8 +6,8 @@
-
-
+
+
diff --git a/src/DataProtection/samples/NonDISample/NonDISample.csproj b/src/DataProtection/samples/NonDISample/NonDISample.csproj
index 168e26a249..b305f80bf0 100644
--- a/src/DataProtection/samples/NonDISample/NonDISample.csproj
+++ b/src/DataProtection/samples/NonDISample/NonDISample.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/DataProtection/samples/Redis/Redis.csproj b/src/DataProtection/samples/Redis/Redis.csproj
index dc79399c6c..22e398ef9f 100644
--- a/src/DataProtection/samples/Redis/Redis.csproj
+++ b/src/DataProtection/samples/Redis/Redis.csproj
@@ -6,7 +6,7 @@
-
+
diff --git a/src/DataProtection/shared/EncodingUtil.cs b/src/DataProtection/shared/src/EncodingUtil.cs
similarity index 100%
rename from src/DataProtection/shared/EncodingUtil.cs
rename to src/DataProtection/shared/src/EncodingUtil.cs
diff --git a/src/DataProtection/shared/ExceptionExtensions.cs b/src/DataProtection/shared/src/ExceptionExtensions.cs
similarity index 100%
rename from src/DataProtection/shared/ExceptionExtensions.cs
rename to src/DataProtection/shared/src/ExceptionExtensions.cs
diff --git a/src/DataProtection/test/shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
similarity index 100%
rename from src/DataProtection/test/shared/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
rename to src/DataProtection/shared/test/ConditionalRunTestOnlyWindows8OrLaterAttribute.cs
diff --git a/src/DataProtection/test/shared/ConditionalRunTestOnlyWindowsAttribute.cs b/src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
similarity index 100%
rename from src/DataProtection/test/shared/ConditionalRunTestOnlyWindowsAttribute.cs
rename to src/DataProtection/shared/test/ConditionalRunTestOnlyWindowsAttribute.cs
diff --git a/src/DataProtection/test/shared/ExceptionAssert2.cs b/src/DataProtection/shared/test/ExceptionAssert2.cs
similarity index 100%
rename from src/DataProtection/test/shared/ExceptionAssert2.cs
rename to src/DataProtection/shared/test/ExceptionAssert2.cs
diff --git a/src/DataProtection/src/Directory.Build.props b/src/DataProtection/src/Directory.Build.props
deleted file mode 100644
index 4b89a431e7..0000000000
--- a/src/DataProtection/src/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Properties/AssemblyInfo.cs b/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Properties/AssemblyInfo.cs
deleted file mode 100644
index 022a5a3e6c..0000000000
--- a/src/DataProtection/src/Microsoft.AspNetCore.DataProtection.Extensions/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,6 +0,0 @@
-// 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.Runtime.CompilerServices;
-
-[assembly: InternalsVisibleTo("Microsoft.AspNetCore.DataProtection.Extensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
diff --git a/src/DataProtection/test/Directory.Build.props b/src/DataProtection/test/Directory.Build.props
deleted file mode 100644
index 9d4d4a902c..0000000000
--- a/src/DataProtection/test/Directory.Build.props
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
- netcoreapp2.1
- $(DeveloperBuildTestTfms)
- netcoreapp2.1;netcoreapp2.0
- $(StandardTestTfms);net461
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj b/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj
deleted file mode 100644
index 759f10679d..0000000000
--- a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.Internal.Test/Microsoft.AspNetCore.Cryptography.Internal.Test.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- $(StandardTestTfms)
- true
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj b/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj
deleted file mode 100644
index a475ac199d..0000000000
--- a/src/DataProtection/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- $(StandardTestTfms)
- true
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj b/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj
deleted file mode 100644
index 1da22cec0d..0000000000
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/Microsoft.AspNetCore.DataProtection.Abstractions.Test.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- $(StandardTestTfms)
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj b/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj
deleted file mode 100644
index 16a4f12c98..0000000000
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/Microsoft.AspNetCore.DataProtection.Extensions.Test.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- $(StandardTestTfms)
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj b/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj
deleted file mode 100644
index d359ab936e..0000000000
--- a/src/DataProtection/test/Microsoft.AspNetCore.DataProtection.Redis.Test/Microsoft.AspNetCore.DataProtection.Redis.Test.csproj
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
- $(StandardTestTfms)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-