diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
deleted file mode 100644
index db29a16b0..000000000
--- a/.config/dotnet-tools.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "version": 1,
- "isRoot": true,
- "tools": {
- "signclient": {
- "version": "1.2.17",
- "commands": [
- "SignClient"
- ]
- },
- "dotnet-ef": {
- "version": "3.1.0",
- "commands": [
- "dotnet-ef"
- ]
- }
- }
-}
\ No newline at end of file
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9957d59e0..0c7d73dbb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,11 +21,10 @@ jobs:
steps:
- uses: actions/checkout@af513c7a016048ae468971c52ed77d9562c7c819
- - name: Setup dotnet
+ - name: Setup dotnet (main)
uses: actions/setup-dotnet@v1
- with:
- dotnet-version: '5.0.100'
- - name: Setup dotnet
+
+ - name: Setup dotnet (testing)
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.x'
@@ -39,4 +38,4 @@ jobs:
- if: (matrix.runs-on == 'windows-latest') && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/'))
run: |
./build.ps1
- dotnet nuget push .\nuget\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
+ dotnet nuget push .\artifacts\*.nupkg -s https://www.myget.org/F/duende_identityserver/api/v2/package -k ${{ secrets.MYGET }}
diff --git a/src/Directory.Build.props b/Directory.Build.props
similarity index 80%
rename from src/Directory.Build.props
rename to Directory.Build.props
index a5f2f2f0c..5a99d7c16 100644
--- a/src/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,13 +16,12 @@
true
true
$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb
-
- True
+
True
-
-
+
+
\ No newline at end of file
diff --git a/src/Directory.Build.targets b/Directory.Build.targets
similarity index 82%
rename from src/Directory.Build.targets
rename to Directory.Build.targets
index d433ef844..be4ad901f 100644
--- a/src/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,9 +1,5 @@
-
- 5.0.0-*
-
-
3.1.0
3.1.0
@@ -19,11 +15,14 @@
+
+
+
-
+
@@ -31,15 +30,6 @@
-
-
-
-
-
-
-
-
-
@@ -53,6 +43,7 @@
+
diff --git a/Duende.IdentityServer.Core.sln b/Duende.IdentityServer.Core.sln
new file mode 100644
index 000000000..2aa9895b8
--- /dev/null
+++ b/Duende.IdentityServer.Core.sln
@@ -0,0 +1,103 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.IdentityServer.Storage", "src\Storage\Duende.IdentityServer.Storage.csproj", "{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.IdentityServer", "src\IdentityServer\Duende.IdentityServer.csproj", "{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF26567D-46BB-4720-8610-EC3D6AB9793C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.UnitTests", "test\IdentityServer.UnitTests\IdentityServer.UnitTests.csproj", "{7FE80A13-4265-4427-91E1-89C8AA7548BC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.IntegrationTests", "test\IdentityServer.IntegrationTests\IdentityServer.IntegrationTests.csproj", "{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{82C80BEB-73A0-4B96-83A4-7C69792CF010}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Host", "hosts\main\Host.csproj", "{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}"
+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(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE} = {82C80BEB-73A0-4B96-83A4-7C69792CF010}
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.Build.0 = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+EndGlobal
diff --git a/Duende.IdentityServer.sln b/Duende.IdentityServer.sln
new file mode 100644
index 000000000..52e8b7239
--- /dev/null
+++ b/Duende.IdentityServer.sln
@@ -0,0 +1,243 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30717.126
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.Storage", "src\Storage\Duende.IdentityServer.Storage.csproj", "{4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer", "src\IdentityServer\Duende.IdentityServer.csproj", "{B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF26567D-46BB-4720-8610-EC3D6AB9793C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.UnitTests", "test\IdentityServer.UnitTests\IdentityServer.UnitTests.csproj", "{7FE80A13-4265-4427-91E1-89C8AA7548BC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.IntegrationTests", "test\IdentityServer.IntegrationTests\IdentityServer.IntegrationTests.csproj", "{CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "hosts", "hosts", "{82C80BEB-73A0-4B96-83A4-7C69792CF010}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host.Main", "hosts\main\Host.Main.csproj", "{7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.AspNetIdentity", "src\AspNetIdentity\Duende.IdentityServer.AspNetIdentity.csproj", "{67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.EntityFramework.Storage", "src\EntityFramework.Storage\Duende.IdentityServer.EntityFramework.Storage.csproj", "{E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.EntityFramework", "src\EntityFramework\Duende.IdentityServer.EntityFramework.csproj", "{376FD801-0E35-4145-9322-28FFB219E668}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Tests", "test\EntityFramework.Tests\EntityFramework.Tests.csproj", "{0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Storage.UnitTests", "test\EntityFramework.Storage.UnitTests\EntityFramework.Storage.UnitTests.csproj", "{3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFramework.Storage.IntegrationTests", "test\EntityFramework.Storage.IntegrationTests\EntityFramework.Storage.IntegrationTests.csproj", "{6D14B6B6-8F3F-472A-91BE-7E0303BA4592}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host.AspNetIdentity", "hosts\AspNetIdentity\Host.AspNetIdentity.csproj", "{6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host.EntityFramework", "hosts\EntityFramework\Host.EntityFramework.csproj", "{C53603DE-CAF5-4AEB-A424-C1C72356BB17}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", "{49E98D89-5E7E-46BD-86D0-AB33039A5F28}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServer", "migrations\SqlServer\SqlServer.csproj", "{88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}"
+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
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x64.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Debug|x86.Build.0 = Debug|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x64.Build.0 = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.ActiveCfg = Release|Any CPU
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0}.Release|x86.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x64.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Debug|x86.Build.0 = Debug|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x64.Build.0 = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.ActiveCfg = Release|Any CPU
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED}.Release|x86.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x64.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Debug|x86.Build.0 = Debug|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x64.Build.0 = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.ActiveCfg = Release|Any CPU
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC}.Release|x86.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x64.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Debug|x86.Build.0 = Debug|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x64.Build.0 = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.ActiveCfg = Release|Any CPU
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0}.Release|x86.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x64.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Debug|x86.Build.0 = Debug|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x64.Build.0 = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.ActiveCfg = Release|Any CPU
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE}.Release|x86.Build.0 = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|x64.Build.0 = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Debug|x86.Build.0 = Debug|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|Any CPU.Build.0 = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|x64.ActiveCfg = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|x64.Build.0 = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|x86.ActiveCfg = Release|Any CPU
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3}.Release|x86.Build.0 = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|x64.Build.0 = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Debug|x86.Build.0 = Debug|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|x64.ActiveCfg = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|x64.Build.0 = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|x86.ActiveCfg = Release|Any CPU
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155}.Release|x86.Build.0 = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|x64.Build.0 = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Debug|x86.Build.0 = Debug|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|Any CPU.Build.0 = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|x64.ActiveCfg = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|x64.Build.0 = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|x86.ActiveCfg = Release|Any CPU
+ {376FD801-0E35-4145-9322-28FFB219E668}.Release|x86.Build.0 = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|x64.Build.0 = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Debug|x86.Build.0 = Debug|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|x64.ActiveCfg = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|x64.Build.0 = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|x86.ActiveCfg = Release|Any CPU
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D}.Release|x86.Build.0 = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|x64.Build.0 = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Debug|x86.Build.0 = Debug|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|x64.ActiveCfg = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|x64.Build.0 = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|x86.ActiveCfg = Release|Any CPU
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E}.Release|x86.Build.0 = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|x64.Build.0 = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Debug|x86.Build.0 = Debug|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|x64.ActiveCfg = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|x64.Build.0 = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|x86.ActiveCfg = Release|Any CPU
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592}.Release|x86.Build.0 = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|x64.Build.0 = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Debug|x86.Build.0 = Debug|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|x64.ActiveCfg = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|x64.Build.0 = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|x86.ActiveCfg = Release|Any CPU
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B}.Release|x86.Build.0 = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|x64.Build.0 = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Debug|x86.Build.0 = Debug|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|x64.ActiveCfg = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|x64.Build.0 = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|x86.ActiveCfg = Release|Any CPU
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17}.Release|x86.Build.0 = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|x64.Build.0 = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Debug|x86.Build.0 = Debug|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|Any CPU.Build.0 = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|x64.ActiveCfg = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|x64.Build.0 = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|x86.ActiveCfg = Release|Any CPU
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739}.Release|x86.Build.0 = Release|Any CPU
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {4FEBAA3A-EBF6-4F47-BD44-A8556C14E9F0} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {B323C0BF-C0BB-4BD4-9B08-A92EC68C9CED} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {7FE80A13-4265-4427-91E1-89C8AA7548BC} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {CCF44C3A-3A43-43DB-A595-BC39F3CB2CD0} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {7DB9D734-1D15-4A7B-BAEF-416301DCC6DE} = {82C80BEB-73A0-4B96-83A4-7C69792CF010}
+ {67B2A6B5-31B0-4CD3-8EE4-A4B0BDEA0BD3} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {E2849A9F-9BDA-4101-A98B-CA8E2FE9D155} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {376FD801-0E35-4145-9322-28FFB219E668} = {D5E9E8E5-4050-4B9A-9F1F-15FA3BDB0684}
+ {0772AE76-46E3-42A2-AA2F-B8EB56B4EB0D} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {3A72EDFA-1E19-46E6-B983-ECF3EFBF192E} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {6D14B6B6-8F3F-472A-91BE-7E0303BA4592} = {DF26567D-46BB-4720-8610-EC3D6AB9793C}
+ {6070C566-BD7B-42B8-B0F8-5F15CBBA0A9B} = {82C80BEB-73A0-4B96-83A4-7C69792CF010}
+ {C53603DE-CAF5-4AEB-A424-C1C72356BB17} = {82C80BEB-73A0-4B96-83A4-7C69792CF010}
+ {88E9E1E5-5F6A-4B1D-8AE3-B55F2477A739} = {49E98D89-5E7E-46BD-86D0-AB33039A5F28}
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {FDB095BE-A04A-4440-ACA0-EDD7CF9CFD64}
+ EndGlobalSection
+EndGlobal
diff --git a/NuGet.config b/NuGet.config
deleted file mode 100644
index a347cc617..000000000
--- a/NuGet.config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/build.cmd b/build.cmd
new file mode 100644
index 000000000..b3cc00bcb
--- /dev/null
+++ b/build.cmd
@@ -0,0 +1,2 @@
+@echo off
+dotnet run --project build -- %*
diff --git a/build.ps1 b/build.ps1
index 65b844df0..650f67a8a 100644
--- a/build.ps1
+++ b/build.ps1
@@ -1,25 +1,2 @@
$ErrorActionPreference = "Stop";
-
-New-Item -ItemType Directory -Force -Path ./nuget
-
-dotnet tool restore
-
-pushd ./src/Storage
-Invoke-Expression "./build.ps1 $args"
-popd
-
-pushd ./src/IdentityServer
-Invoke-Expression "./build.ps1 $args"
-popd
-
-pushd ./src/EntityFramework.Storage
-Invoke-Expression "./build.ps1 $args"
-popd
-
-pushd ./src/EntityFramework
-Invoke-Expression "./build.ps1 $args"
-popd
-
-pushd ./src/AspNetIdentity
-Invoke-Expression "./build.ps1 $args"
-popd
+dotnet run --project build -- $args
diff --git a/build.sh b/build.sh
index 33795565e..b8feb2caa 100755
--- a/build.sh
+++ b/build.sh
@@ -1,27 +1,3 @@
#!/usr/bin/env bash
set -euo pipefail
-
-rm -rf nuget
-mkdir nuget
-
-dotnet tool restore
-
-pushd ./src/Storage
-./build.sh "$@"
-popd
-
-pushd ./src/IdentityServer
-./build.sh "$@"
-popd
-
-pushd ./src/EntityFramework.Storage
-./build.sh "$@"
-popd
-
-pushd ./src/EntityFramework
-./build.sh "$@"
-popd
-
-pushd ./src/AspNetIdentity
-./build.sh "$@"
-popd
+dotnet run --project build -- "$@"
diff --git a/src/build/Program.Partial.cs b/build/Program.cs
similarity index 52%
rename from src/build/Program.Partial.cs
rename to build/Program.cs
index 9f56ba55c..083bbfbfc 100644
--- a/src/build/Program.Partial.cs
+++ b/build/Program.cs
@@ -1,104 +1,102 @@
-using System;
-using System.IO;
-using System.Linq;
-using static Bullseye.Targets;
-using static SimpleExec.Command;
-
-namespace build
-{
- partial class Program
- {
- private const string packOutput = "./artifacts";
- private const string packOutputCopy = "../../nuget";
- private const string envVarMissing = " environment variable is missing. Aborting.";
-
- private static class Targets
- {
- public const string CleanBuildOutput = "clean-build-output";
- public const string CleanPackOutput = "clean-pack-output";
- public const string Build = "build";
- public const string Test = "test";
- public const string Pack = "pack";
- public const string SignBinary = "sign-binary";
- public const string SignPackage = "sign-package";
- public const string CopyPackOutput = "copy-pack-output";
- }
-
- static void Main(string[] args)
- {
- Target(Targets.CleanBuildOutput, () =>
- {
- //Run("dotnet", "clean -c Release -v m --nologo", echoPrefix: Prefix);
- });
-
- Target(Targets.Build, DependsOn(Targets.CleanBuildOutput), () =>
- {
- Run("dotnet", "build -c Release --nologo", echoPrefix: Prefix);
- });
-
- Target(Targets.SignBinary, DependsOn(Targets.Build), () =>
- {
- Sign("./src/bin/Release", "*.dll");
- });
-
- Target(Targets.Test, DependsOn(Targets.Build), () =>
- {
- Run("dotnet", $"test -c Release --no-build", echoPrefix: Prefix);
- });
-
- Target(Targets.CleanPackOutput, () =>
- {
- if (Directory.Exists(packOutput))
- {
- Directory.Delete(packOutput, true);
- }
- });
-
- Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
- {
- var project = Directory.GetFiles("./src", "*.csproj", SearchOption.TopDirectoryOnly).OrderBy(_ => _).First();
-
- Run("dotnet", $"pack {project} -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo", echoPrefix: Prefix);
- });
-
- Target(Targets.SignPackage, DependsOn(Targets.Pack), () =>
- {
- Sign(packOutput, "*.nupkg");
- });
-
- Target(Targets.CopyPackOutput, DependsOn(Targets.Pack), () =>
- {
- Directory.CreateDirectory(packOutputCopy);
-
- foreach (var file in Directory.GetFiles(packOutput))
- {
- File.Copy(file, Path.Combine(packOutputCopy, Path.GetFileName(file)), true);
- }
- });
-
- Target("quick", DependsOn(Targets.CopyPackOutput));
-
- Target("default", DependsOn(Targets.Test, Targets.CopyPackOutput));
-
- Target("sign", DependsOn(Targets.SignBinary, Targets.Test, Targets.SignPackage, Targets.CopyPackOutput));
-
- RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException || ex.Message.EndsWith(envVarMissing), Prefix);
- }
-
- private static void Sign(string path, string searchTerm)
- {
- var signClientSecret = Environment.GetEnvironmentVariable("SignClientSecret");
-
- if (string.IsNullOrWhiteSpace(signClientSecret))
- {
- throw new Exception($"SignClientSecret{envVarMissing}");
- }
-
- foreach (var file in Directory.GetFiles(path, searchTerm, SearchOption.AllDirectories))
- {
- Console.WriteLine($" Signing {file}");
- Run("dotnet", $"SignClient sign -c ../../signClient.json -i {file} -r sc-ids@dotnetfoundation.org -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
- }
- }
- }
-}
+using System;
+using System.IO;
+using static Bullseye.Targets;
+using static SimpleExec.Command;
+
+namespace build
+{
+ internal static class Program
+ {
+ private const string solution = "Duende.IdentityServer.sln";
+ private const string packOutput = "./artifacts";
+ private const string envVarMissing = " environment variable is missing. Aborting.";
+
+ private static class Targets
+ {
+ public const string RestoreTools = "restore-tools";
+ public const string CleanBuildOutput = "clean-build-output";
+ public const string CleanPackOutput = "clean-pack-output";
+ public const string Build = "build";
+ public const string Test = "test";
+ public const string Pack = "pack";
+ public const string SignBinary = "sign-binary";
+ public const string SignPackage = "sign-package";
+ }
+
+ internal static void Main(string[] args)
+ {
+ Target(Targets.RestoreTools, () =>
+ {
+ Run("dotnet", "tool restore");
+ });
+
+ Target(Targets.CleanBuildOutput, () =>
+ {
+ Run("dotnet", $"clean {solution} -c Release -v m --nologo");
+ });
+
+ Target(Targets.Build, DependsOn(Targets.CleanBuildOutput), () =>
+ {
+ Run("dotnet", $"build {solution} -c Release --nologo");
+ });
+
+ Target(Targets.SignBinary, DependsOn(Targets.Build, Targets.RestoreTools), () =>
+ {
+ // sign all dlls
+ });
+
+ Target(Targets.Test, DependsOn(Targets.Build), () =>
+ {
+ Run("dotnet", $"test {solution} -c Release --no-build --nologo");
+ });
+
+ Target(Targets.CleanPackOutput, () =>
+ {
+ if (Directory.Exists(packOutput))
+ {
+ Directory.Delete(packOutput, true);
+ }
+ });
+
+ Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
+ {
+ var directory = Directory.CreateDirectory(packOutput).FullName;
+
+ Run("dotnet", $"pack ./src/Storage/Duende.IdentityServer.Storage.csproj -c Release -o {directory} --no-build --nologo");
+ Run("dotnet", $"pack ./src/IdentityServer/Duende.IdentityServer.csproj -c Release -o {directory} --no-build --nologo");
+
+ Run("dotnet", $"pack ./src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj -c Release -o {directory} --no-build --nologo");
+ Run("dotnet", $"pack ./src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj -c Release -o {directory} --no-build --nologo");
+
+ Run("dotnet", $"pack ./src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj -c Release -o {directory} --no-build --nologo");
+ });
+
+ Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>
+ {
+ Sign(packOutput, "*.nupkg");
+ });
+
+ Target("default", DependsOn(Targets.Test, Targets.Pack));
+
+ Target("sign", DependsOn(Targets.SignBinary, Targets.Test, Targets.SignPackage));
+
+ RunTargetsAndExit(args, ex => ex is SimpleExec.NonZeroExitCodeException || ex.Message.EndsWith(envVarMissing));
+ }
+
+ private static void Sign(string path, string searchTerm)
+ {
+ var signClientSecret = Environment.GetEnvironmentVariable("SignClientSecret");
+
+ if (string.IsNullOrWhiteSpace(signClientSecret))
+ {
+ throw new Exception($"SignClientSecret{envVarMissing}");
+ }
+
+ foreach (var file in Directory.GetFiles(path, searchTerm, SearchOption.AllDirectories))
+ {
+ Console.WriteLine($" Signing {file}");
+ Run("dotnet", $"SignClient sign -c signClient.json -i {file} -r sc-ids@dotnetfoundation.org -s \"{signClientSecret}\" -n 'IdentityServer4'", noEcho: true);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/build/build.csproj b/build/build.csproj
new file mode 100644
index 000000000..f596b91bd
--- /dev/null
+++ b/build/build.csproj
@@ -0,0 +1,13 @@
+
+
+
+ Exe
+ net5.0
+
+
+
+
+
+
+
+
diff --git a/clean.ps1 b/clean.ps1
deleted file mode 100644
index 972c9f85c..000000000
--- a/clean.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-git clean -xdf -e samples -e src/IdentityServer4/.vs
-
-./clean_cache.ps1
\ No newline at end of file
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index f385ce158..000000000
--- a/clean.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-git clean -xdf
-
-./clean_cache.sh
\ No newline at end of file
diff --git a/clean_cache.ps1 b/clean_cache.ps1
deleted file mode 100644
index 4019860d7..000000000
--- a/clean_cache.ps1
+++ /dev/null
@@ -1,9 +0,0 @@
-Remove-Item $env:USERPROFILE\.nuget\packages\duende.identityserver\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\duende.identityserver.storage\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\duende.identityserver.entityframework\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\duende.identityserver.entityframework.storage\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\duende.identityserver.aspnetidentity\ -Recurse -ErrorAction SilentlyContinue
-
-Remove-Item $env:USERPROFILE\.nuget\packages\identitymodel\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\IdentityModel.AspNetCore.OAuth2Introspection\ -Recurse -ErrorAction SilentlyContinue
-Remove-Item $env:USERPROFILE\.nuget\packages\IdentityServer4.AccessTokenValidation\ -Recurse -ErrorAction SilentlyContinue
\ No newline at end of file
diff --git a/clean_cache.sh b/clean_cache.sh
deleted file mode 100755
index eda196979..000000000
--- a/clean_cache.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-rm -rf ./nuget
-
-rm -rf ~/.nuget/packages/duende.identityserver
-rm -rf ~/.nuget/packages/duende.identityserver.entityframework
-rm -rf ~/.nuget/packages/duende.identityserver.entityframework.storage
-rm -rf ~/.nuget/packages/duende.identityserver.aspnetidentity
-rm -rf ~/.nuget/packages/duende.identityserver.storage
\ No newline at end of file
diff --git a/global.json b/global.json
index 2cb2ac9bd..7abee7494 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,6 @@
{
"sdk": {
- "version": "5.0.100"
+ "version": "5.0.100",
+ "rollForward": "latestMajor"
}
}
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/Data/ApplicationDbContext.cs b/hosts/AspNetIdentity/Data/ApplicationDbContext.cs
similarity index 100%
rename from src/AspNetIdentity/host/Data/ApplicationDbContext.cs
rename to hosts/AspNetIdentity/Data/ApplicationDbContext.cs
diff --git a/hosts/AspNetIdentity/Host.AspNetIdentity.csproj b/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
new file mode 100644
index 000000000..a8af5f16a
--- /dev/null
+++ b/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
@@ -0,0 +1,36 @@
+
+
+
+ netcoreapp3.1;net5.0
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configuration\Clients.cs
+
+
+ Configuration\ClientsConsole.cs
+
+
+ Configuration\ClientsWeb.cs
+
+
+ Configuration\Resources.cs
+
+
+
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/ExternalLoginViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/ExternalLoginViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/ExternalLoginViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/ExternalLoginViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/ForgotPasswordViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/ForgotPasswordViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/ForgotPasswordViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/ForgotPasswordViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/LoginViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/LoginViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/LoginViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/LoginViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/LoginWith2faViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/LoginWith2faViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/LoginWith2faViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/LoginWith2faViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/LoginWithRecoveryCodeViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/RegisterViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/RegisterViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/RegisterViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/RegisterViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/AccountViewModels/ResetPasswordViewModel.cs b/hosts/AspNetIdentity/Models/AccountViewModels/ResetPasswordViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/AccountViewModels/ResetPasswordViewModel.cs
rename to hosts/AspNetIdentity/Models/AccountViewModels/ResetPasswordViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ApplicationUser.cs b/hosts/AspNetIdentity/Models/ApplicationUser.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ApplicationUser.cs
rename to hosts/AspNetIdentity/Models/ApplicationUser.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/ChangePasswordViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/ChangePasswordViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/ChangePasswordViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/ChangePasswordViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/EnableAuthenticatorViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/EnableAuthenticatorViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/ExternalLoginsViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/ExternalLoginsViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/ExternalLoginsViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/ExternalLoginsViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/GenerateRecoveryCodesViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/IndexViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/IndexViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/IndexViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/IndexViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/RemoveLoginViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/RemoveLoginViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/RemoveLoginViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/RemoveLoginViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/SetPasswordViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/SetPasswordViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/SetPasswordViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/SetPasswordViewModel.cs
diff --git a/src/AspNetIdentity/host/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs b/hosts/AspNetIdentity/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs
rename to hosts/AspNetIdentity/Models/ManageViewModels/TwoFactorAuthenticationViewModel.cs
diff --git a/src/AspNetIdentity/host/Program.cs b/hosts/AspNetIdentity/Program.cs
similarity index 100%
rename from src/AspNetIdentity/host/Program.cs
rename to hosts/AspNetIdentity/Program.cs
diff --git a/src/EntityFramework/host/Properties/launchSettings.json b/hosts/AspNetIdentity/Properties/launchSettings.json
similarity index 55%
rename from src/EntityFramework/host/Properties/launchSettings.json
rename to hosts/AspNetIdentity/Properties/launchSettings.json
index e41dbca00..ad529fa7f 100644
--- a/src/EntityFramework/host/Properties/launchSettings.json
+++ b/hosts/AspNetIdentity/Properties/launchSettings.json
@@ -1,12 +1,4 @@
{
- "iisSettings": {
- "windowsAuthentication": true,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:5000",
- "sslPort": 44334
- }
- },
"profiles": {
"Host": {
"commandName": "Project",
diff --git a/src/AspNetIdentity/host/Quickstart/Account/AccountController.cs b/hosts/AspNetIdentity/Quickstart/Account/AccountController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/AccountController.cs
rename to hosts/AspNetIdentity/Quickstart/Account/AccountController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/AccountOptions.cs b/hosts/AspNetIdentity/Quickstart/Account/AccountOptions.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/AccountOptions.cs
rename to hosts/AspNetIdentity/Quickstart/Account/AccountOptions.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/ExternalController.cs b/hosts/AspNetIdentity/Quickstart/Account/ExternalController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/ExternalController.cs
rename to hosts/AspNetIdentity/Quickstart/Account/ExternalController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/ExternalProvider.cs b/hosts/AspNetIdentity/Quickstart/Account/ExternalProvider.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/ExternalProvider.cs
rename to hosts/AspNetIdentity/Quickstart/Account/ExternalProvider.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/LoggedOutViewModel.cs b/hosts/AspNetIdentity/Quickstart/Account/LoggedOutViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/LoggedOutViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/LoggedOutViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/LoginInputModel.cs b/hosts/AspNetIdentity/Quickstart/Account/LoginInputModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/LoginInputModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/LoginInputModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/LoginViewModel.cs b/hosts/AspNetIdentity/Quickstart/Account/LoginViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/LoginViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/LoginViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/LogoutInputModel.cs b/hosts/AspNetIdentity/Quickstart/Account/LogoutInputModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/LogoutInputModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/LogoutInputModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/LogoutViewModel.cs b/hosts/AspNetIdentity/Quickstart/Account/LogoutViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/LogoutViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/LogoutViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Account/RedirectViewModel.cs b/hosts/AspNetIdentity/Quickstart/Account/RedirectViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Account/RedirectViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Account/RedirectViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ConsentController.cs b/hosts/AspNetIdentity/Quickstart/Consent/ConsentController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ConsentController.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ConsentController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ConsentInputModel.cs b/hosts/AspNetIdentity/Quickstart/Consent/ConsentInputModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ConsentInputModel.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ConsentInputModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ConsentOptions.cs b/hosts/AspNetIdentity/Quickstart/Consent/ConsentOptions.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ConsentOptions.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ConsentOptions.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ConsentViewModel.cs b/hosts/AspNetIdentity/Quickstart/Consent/ConsentViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ConsentViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ConsentViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ProcessConsentResult.cs b/hosts/AspNetIdentity/Quickstart/Consent/ProcessConsentResult.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ProcessConsentResult.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ProcessConsentResult.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Consent/ScopeViewModel.cs b/hosts/AspNetIdentity/Quickstart/Consent/ScopeViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Consent/ScopeViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Consent/ScopeViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationInputModel.cs b/hosts/AspNetIdentity/Quickstart/Device/DeviceAuthorizationInputModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationInputModel.cs
rename to hosts/AspNetIdentity/Quickstart/Device/DeviceAuthorizationInputModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationViewModel.cs b/hosts/AspNetIdentity/Quickstart/Device/DeviceAuthorizationViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Device/DeviceAuthorizationViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Device/DeviceAuthorizationViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Device/DeviceController.cs b/hosts/AspNetIdentity/Quickstart/Device/DeviceController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Device/DeviceController.cs
rename to hosts/AspNetIdentity/Quickstart/Device/DeviceController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsController.cs b/hosts/AspNetIdentity/Quickstart/Diagnostics/DiagnosticsController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsController.cs
rename to hosts/AspNetIdentity/Quickstart/Diagnostics/DiagnosticsController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/hosts/AspNetIdentity/Quickstart/Diagnostics/DiagnosticsViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Diagnostics/DiagnosticsViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Extensions.cs b/hosts/AspNetIdentity/Quickstart/Extensions.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Extensions.cs
rename to hosts/AspNetIdentity/Quickstart/Extensions.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Grants/GrantsController.cs b/hosts/AspNetIdentity/Quickstart/Grants/GrantsController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Grants/GrantsController.cs
rename to hosts/AspNetIdentity/Quickstart/Grants/GrantsController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Grants/GrantsViewModel.cs b/hosts/AspNetIdentity/Quickstart/Grants/GrantsViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Grants/GrantsViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Grants/GrantsViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Home/ErrorViewModel.cs b/hosts/AspNetIdentity/Quickstart/Home/ErrorViewModel.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Home/ErrorViewModel.cs
rename to hosts/AspNetIdentity/Quickstart/Home/ErrorViewModel.cs
diff --git a/src/AspNetIdentity/host/Quickstart/Home/HomeController.cs b/hosts/AspNetIdentity/Quickstart/Home/HomeController.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/Home/HomeController.cs
rename to hosts/AspNetIdentity/Quickstart/Home/HomeController.cs
diff --git a/src/AspNetIdentity/host/Quickstart/SecurityHeadersAttribute.cs b/hosts/AspNetIdentity/Quickstart/SecurityHeadersAttribute.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/SecurityHeadersAttribute.cs
rename to hosts/AspNetIdentity/Quickstart/SecurityHeadersAttribute.cs
diff --git a/src/AspNetIdentity/host/Quickstart/TestUsers.cs b/hosts/AspNetIdentity/Quickstart/TestUsers.cs
similarity index 100%
rename from src/AspNetIdentity/host/Quickstart/TestUsers.cs
rename to hosts/AspNetIdentity/Quickstart/TestUsers.cs
diff --git a/src/AspNetIdentity/host/Startup.cs b/hosts/AspNetIdentity/Startup.cs
similarity index 100%
rename from src/AspNetIdentity/host/Startup.cs
rename to hosts/AspNetIdentity/Startup.cs
diff --git a/src/AspNetIdentity/host/Views/Account/AccessDenied.cshtml b/hosts/AspNetIdentity/Views/Account/AccessDenied.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Account/AccessDenied.cshtml
rename to hosts/AspNetIdentity/Views/Account/AccessDenied.cshtml
diff --git a/src/AspNetIdentity/host/Views/Account/LoggedOut.cshtml b/hosts/AspNetIdentity/Views/Account/LoggedOut.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Account/LoggedOut.cshtml
rename to hosts/AspNetIdentity/Views/Account/LoggedOut.cshtml
diff --git a/src/AspNetIdentity/host/Views/Account/Login.cshtml b/hosts/AspNetIdentity/Views/Account/Login.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Account/Login.cshtml
rename to hosts/AspNetIdentity/Views/Account/Login.cshtml
diff --git a/src/AspNetIdentity/host/Views/Account/Logout.cshtml b/hosts/AspNetIdentity/Views/Account/Logout.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Account/Logout.cshtml
rename to hosts/AspNetIdentity/Views/Account/Logout.cshtml
diff --git a/src/AspNetIdentity/host/Views/Consent/Index.cshtml b/hosts/AspNetIdentity/Views/Consent/Index.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Consent/Index.cshtml
rename to hosts/AspNetIdentity/Views/Consent/Index.cshtml
diff --git a/src/AspNetIdentity/host/Views/Device/Success.cshtml b/hosts/AspNetIdentity/Views/Device/Success.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Device/Success.cshtml
rename to hosts/AspNetIdentity/Views/Device/Success.cshtml
diff --git a/src/AspNetIdentity/host/Views/Device/UserCodeCapture.cshtml b/hosts/AspNetIdentity/Views/Device/UserCodeCapture.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Device/UserCodeCapture.cshtml
rename to hosts/AspNetIdentity/Views/Device/UserCodeCapture.cshtml
diff --git a/src/AspNetIdentity/host/Views/Device/UserCodeConfirmation.cshtml b/hosts/AspNetIdentity/Views/Device/UserCodeConfirmation.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Device/UserCodeConfirmation.cshtml
rename to hosts/AspNetIdentity/Views/Device/UserCodeConfirmation.cshtml
diff --git a/src/AspNetIdentity/host/Views/Diagnostics/Index.cshtml b/hosts/AspNetIdentity/Views/Diagnostics/Index.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Diagnostics/Index.cshtml
rename to hosts/AspNetIdentity/Views/Diagnostics/Index.cshtml
diff --git a/src/AspNetIdentity/host/Views/Grants/Index.cshtml b/hosts/AspNetIdentity/Views/Grants/Index.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Grants/Index.cshtml
rename to hosts/AspNetIdentity/Views/Grants/Index.cshtml
diff --git a/src/AspNetIdentity/host/Views/Home/Index.cshtml b/hosts/AspNetIdentity/Views/Home/Index.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Home/Index.cshtml
rename to hosts/AspNetIdentity/Views/Home/Index.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/Error.cshtml b/hosts/AspNetIdentity/Views/Shared/Error.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/Error.cshtml
rename to hosts/AspNetIdentity/Views/Shared/Error.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/Redirect.cshtml b/hosts/AspNetIdentity/Views/Shared/Redirect.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/Redirect.cshtml
rename to hosts/AspNetIdentity/Views/Shared/Redirect.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/_Layout.cshtml b/hosts/AspNetIdentity/Views/Shared/_Layout.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/_Layout.cshtml
rename to hosts/AspNetIdentity/Views/Shared/_Layout.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/_Nav.cshtml b/hosts/AspNetIdentity/Views/Shared/_Nav.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/_Nav.cshtml
rename to hosts/AspNetIdentity/Views/Shared/_Nav.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/_ScopeListItem.cshtml b/hosts/AspNetIdentity/Views/Shared/_ScopeListItem.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/_ScopeListItem.cshtml
rename to hosts/AspNetIdentity/Views/Shared/_ScopeListItem.cshtml
diff --git a/src/AspNetIdentity/host/Views/Shared/_ValidationSummary.cshtml b/hosts/AspNetIdentity/Views/Shared/_ValidationSummary.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/Shared/_ValidationSummary.cshtml
rename to hosts/AspNetIdentity/Views/Shared/_ValidationSummary.cshtml
diff --git a/src/AspNetIdentity/host/Views/_ViewImports.cshtml b/hosts/AspNetIdentity/Views/_ViewImports.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/_ViewImports.cshtml
rename to hosts/AspNetIdentity/Views/_ViewImports.cshtml
diff --git a/src/AspNetIdentity/host/Views/_ViewStart.cshtml b/hosts/AspNetIdentity/Views/_ViewStart.cshtml
similarity index 100%
rename from src/AspNetIdentity/host/Views/_ViewStart.cshtml
rename to hosts/AspNetIdentity/Views/_ViewStart.cshtml
diff --git a/src/AspNetIdentity/host/appsettings.json b/hosts/AspNetIdentity/appsettings.json
similarity index 64%
rename from src/AspNetIdentity/host/appsettings.json
rename to hosts/AspNetIdentity/appsettings.json
index c574bb7a8..21f81ed32 100644
--- a/src/AspNetIdentity/host/appsettings.json
+++ b/hosts/AspNetIdentity/appsettings.json
@@ -1,11 +1,5 @@
{
"ConnectionStrings": {
"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=Duende.AspNetIdentity-5.0.0;Trusted_Connection=True;MultipleActiveResultSets=true"
- },
- "Logging": {
- "IncludeScopes": false,
- "LogLevel": {
- "Default": "Warning"
- }
}
}
diff --git a/src/AspNetIdentity/host/wwwroot/css/site.css b/hosts/AspNetIdentity/wwwroot/css/site.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/css/site.css
rename to hosts/AspNetIdentity/wwwroot/css/site.css
diff --git a/src/AspNetIdentity/host/wwwroot/css/site.min.css b/hosts/AspNetIdentity/wwwroot/css/site.min.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/css/site.min.css
rename to hosts/AspNetIdentity/wwwroot/css/site.min.css
diff --git a/src/AspNetIdentity/host/wwwroot/css/site.scss b/hosts/AspNetIdentity/wwwroot/css/site.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/css/site.scss
rename to hosts/AspNetIdentity/wwwroot/css/site.scss
diff --git a/src/AspNetIdentity/host/wwwroot/duende-logo.svg b/hosts/AspNetIdentity/wwwroot/duende-logo.svg
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/duende-logo.svg
rename to hosts/AspNetIdentity/wwwroot/duende-logo.svg
diff --git a/src/AspNetIdentity/host/wwwroot/favicon.ico b/hosts/AspNetIdentity/wwwroot/favicon.ico
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/favicon.ico
rename to hosts/AspNetIdentity/wwwroot/favicon.ico
diff --git a/src/AspNetIdentity/host/wwwroot/js/signin-redirect.js b/hosts/AspNetIdentity/wwwroot/js/signin-redirect.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/js/signin-redirect.js
rename to hosts/AspNetIdentity/wwwroot/js/signin-redirect.js
diff --git a/src/AspNetIdentity/host/wwwroot/js/signout-redirect.js b/hosts/AspNetIdentity/wwwroot/js/signout-redirect.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/js/signout-redirect.js
rename to hosts/AspNetIdentity/wwwroot/js/signout-redirect.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/LICENSE b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/LICENSE
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/README.md b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/README.md
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/README.md
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/README.md
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_alert.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_alert.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_alert.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_alert.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_badge.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_badge.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_badge.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_badge.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_button-group.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_button-group.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_button-group.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_button-group.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_buttons.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_buttons.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_buttons.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_buttons.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_card.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_card.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_card.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_card.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_carousel.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_carousel.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_carousel.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_carousel.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_close.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_close.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_close.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_close.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_code.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_code.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_code.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_code.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_custom-forms.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_custom-forms.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_dropdown.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_dropdown.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_dropdown.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_dropdown.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_forms.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_forms.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_forms.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_forms.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_functions.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_functions.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_functions.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_functions.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_grid.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_grid.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_grid.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_grid.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_images.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_images.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_images.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_images.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_input-group.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_input-group.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_input-group.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_input-group.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_jumbotron.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_jumbotron.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_list-group.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_list-group.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_list-group.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_list-group.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_media.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_media.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_media.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_media.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_mixins.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_mixins.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_mixins.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_mixins.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_modal.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_modal.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_modal.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_modal.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_nav.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_nav.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_nav.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_nav.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_navbar.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_navbar.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_navbar.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_navbar.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_pagination.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_pagination.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_pagination.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_pagination.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_popover.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_popover.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_popover.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_popover.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_print.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_print.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_print.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_print.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_progress.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_progress.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_progress.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_progress.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_reboot.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_reboot.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_reboot.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_reboot.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_root.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_root.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_root.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_root.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_spinners.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_spinners.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_spinners.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_spinners.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_tables.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_tables.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_tables.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_tables.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_toasts.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_toasts.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_toasts.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_toasts.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_tooltip.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_tooltip.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_tooltip.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_tooltip.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_transitions.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_transitions.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_transitions.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_transitions.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_type.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_type.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_type.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_type.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_utilities.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_utilities.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_utilities.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_utilities.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_variables.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_variables.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/_variables.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/_variables.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/bootstrap.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/bootstrap.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_float.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_float.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_image.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_image.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_size.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_size.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_align.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_align.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_background.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_background.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_display.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_display.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_float.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_float.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_position.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_position.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_text.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_text.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss b/hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
rename to hosts/AspNetIdentity/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/LICENSE.txt b/hosts/AspNetIdentity/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/LICENSE.txt
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/README.md b/hosts/AspNetIdentity/wwwroot/lib/jquery/README.md
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/README.md
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/README.md
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.js b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.js
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.min.js b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.min.js
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.min.map b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.min.map
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.js b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.js
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.min.js b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.min.js
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.min.js
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.min.js
diff --git a/src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.min.map b/hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.min.map
similarity index 100%
rename from src/AspNetIdentity/host/wwwroot/lib/jquery/dist/jquery.slim.min.map
rename to hosts/AspNetIdentity/wwwroot/lib/jquery/dist/jquery.slim.min.map
diff --git a/src/IdentityServer/host/Configuration/Clients.cs b/hosts/Configuration/Clients.cs
similarity index 100%
rename from src/IdentityServer/host/Configuration/Clients.cs
rename to hosts/Configuration/Clients.cs
diff --git a/src/IdentityServer/host/Configuration/ClientsConsole.cs b/hosts/Configuration/ClientsConsole.cs
similarity index 100%
rename from src/IdentityServer/host/Configuration/ClientsConsole.cs
rename to hosts/Configuration/ClientsConsole.cs
diff --git a/src/IdentityServer/host/Configuration/ClientsWeb.cs b/hosts/Configuration/ClientsWeb.cs
similarity index 100%
rename from src/IdentityServer/host/Configuration/ClientsWeb.cs
rename to hosts/Configuration/ClientsWeb.cs
diff --git a/src/IdentityServer/host/Configuration/Resources.cs b/hosts/Configuration/Resources.cs
similarity index 100%
rename from src/IdentityServer/host/Configuration/Resources.cs
rename to hosts/Configuration/Resources.cs
diff --git a/src/EntityFramework/host/Host.csproj b/hosts/EntityFramework/Host.EntityFramework.csproj
similarity index 64%
rename from src/EntityFramework/host/Host.csproj
rename to hosts/EntityFramework/Host.EntityFramework.csproj
index 01958e375..4be807db8 100644
--- a/src/EntityFramework/host/Host.csproj
+++ b/hosts/EntityFramework/Host.EntityFramework.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.1;net5.0
@@ -8,9 +8,11 @@
-
-
+
+
+
+
diff --git a/src/EntityFramework/host/Program.cs b/hosts/EntityFramework/Program.cs
similarity index 100%
rename from src/EntityFramework/host/Program.cs
rename to hosts/EntityFramework/Program.cs
diff --git a/src/AspNetIdentity/host/Properties/launchSettings.json b/hosts/EntityFramework/Properties/launchSettings.json
similarity index 100%
rename from src/AspNetIdentity/host/Properties/launchSettings.json
rename to hosts/EntityFramework/Properties/launchSettings.json
diff --git a/src/EntityFramework/host/Quickstart/Account/AccountController.cs b/hosts/EntityFramework/Quickstart/Account/AccountController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/AccountController.cs
rename to hosts/EntityFramework/Quickstart/Account/AccountController.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/AccountOptions.cs b/hosts/EntityFramework/Quickstart/Account/AccountOptions.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/AccountOptions.cs
rename to hosts/EntityFramework/Quickstart/Account/AccountOptions.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/ExternalController.cs b/hosts/EntityFramework/Quickstart/Account/ExternalController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/ExternalController.cs
rename to hosts/EntityFramework/Quickstart/Account/ExternalController.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/ExternalProvider.cs b/hosts/EntityFramework/Quickstart/Account/ExternalProvider.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/ExternalProvider.cs
rename to hosts/EntityFramework/Quickstart/Account/ExternalProvider.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/LoggedOutViewModel.cs b/hosts/EntityFramework/Quickstart/Account/LoggedOutViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/LoggedOutViewModel.cs
rename to hosts/EntityFramework/Quickstart/Account/LoggedOutViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/LoginInputModel.cs b/hosts/EntityFramework/Quickstart/Account/LoginInputModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/LoginInputModel.cs
rename to hosts/EntityFramework/Quickstart/Account/LoginInputModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/LoginViewModel.cs b/hosts/EntityFramework/Quickstart/Account/LoginViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/LoginViewModel.cs
rename to hosts/EntityFramework/Quickstart/Account/LoginViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/LogoutInputModel.cs b/hosts/EntityFramework/Quickstart/Account/LogoutInputModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/LogoutInputModel.cs
rename to hosts/EntityFramework/Quickstart/Account/LogoutInputModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/LogoutViewModel.cs b/hosts/EntityFramework/Quickstart/Account/LogoutViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/LogoutViewModel.cs
rename to hosts/EntityFramework/Quickstart/Account/LogoutViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Account/RedirectViewModel.cs b/hosts/EntityFramework/Quickstart/Account/RedirectViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Account/RedirectViewModel.cs
rename to hosts/EntityFramework/Quickstart/Account/RedirectViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ConsentController.cs b/hosts/EntityFramework/Quickstart/Consent/ConsentController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ConsentController.cs
rename to hosts/EntityFramework/Quickstart/Consent/ConsentController.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ConsentInputModel.cs b/hosts/EntityFramework/Quickstart/Consent/ConsentInputModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ConsentInputModel.cs
rename to hosts/EntityFramework/Quickstart/Consent/ConsentInputModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ConsentOptions.cs b/hosts/EntityFramework/Quickstart/Consent/ConsentOptions.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ConsentOptions.cs
rename to hosts/EntityFramework/Quickstart/Consent/ConsentOptions.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ConsentViewModel.cs b/hosts/EntityFramework/Quickstart/Consent/ConsentViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ConsentViewModel.cs
rename to hosts/EntityFramework/Quickstart/Consent/ConsentViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ProcessConsentResult.cs b/hosts/EntityFramework/Quickstart/Consent/ProcessConsentResult.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ProcessConsentResult.cs
rename to hosts/EntityFramework/Quickstart/Consent/ProcessConsentResult.cs
diff --git a/src/EntityFramework/host/Quickstart/Consent/ScopeViewModel.cs b/hosts/EntityFramework/Quickstart/Consent/ScopeViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Consent/ScopeViewModel.cs
rename to hosts/EntityFramework/Quickstart/Consent/ScopeViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Device/DeviceAuthorizationInputModel.cs b/hosts/EntityFramework/Quickstart/Device/DeviceAuthorizationInputModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Device/DeviceAuthorizationInputModel.cs
rename to hosts/EntityFramework/Quickstart/Device/DeviceAuthorizationInputModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Device/DeviceAuthorizationViewModel.cs b/hosts/EntityFramework/Quickstart/Device/DeviceAuthorizationViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Device/DeviceAuthorizationViewModel.cs
rename to hosts/EntityFramework/Quickstart/Device/DeviceAuthorizationViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Device/DeviceController.cs b/hosts/EntityFramework/Quickstart/Device/DeviceController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Device/DeviceController.cs
rename to hosts/EntityFramework/Quickstart/Device/DeviceController.cs
diff --git a/src/EntityFramework/host/Quickstart/Diagnostics/DiagnosticsController.cs b/hosts/EntityFramework/Quickstart/Diagnostics/DiagnosticsController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Diagnostics/DiagnosticsController.cs
rename to hosts/EntityFramework/Quickstart/Diagnostics/DiagnosticsController.cs
diff --git a/src/EntityFramework/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/hosts/EntityFramework/Quickstart/Diagnostics/DiagnosticsViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs
rename to hosts/EntityFramework/Quickstart/Diagnostics/DiagnosticsViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Extensions.cs b/hosts/EntityFramework/Quickstart/Extensions.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Extensions.cs
rename to hosts/EntityFramework/Quickstart/Extensions.cs
diff --git a/src/EntityFramework/host/Quickstart/Grants/GrantsController.cs b/hosts/EntityFramework/Quickstart/Grants/GrantsController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Grants/GrantsController.cs
rename to hosts/EntityFramework/Quickstart/Grants/GrantsController.cs
diff --git a/src/EntityFramework/host/Quickstart/Grants/GrantsViewModel.cs b/hosts/EntityFramework/Quickstart/Grants/GrantsViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Grants/GrantsViewModel.cs
rename to hosts/EntityFramework/Quickstart/Grants/GrantsViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Home/ErrorViewModel.cs b/hosts/EntityFramework/Quickstart/Home/ErrorViewModel.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Home/ErrorViewModel.cs
rename to hosts/EntityFramework/Quickstart/Home/ErrorViewModel.cs
diff --git a/src/EntityFramework/host/Quickstart/Home/HomeController.cs b/hosts/EntityFramework/Quickstart/Home/HomeController.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/Home/HomeController.cs
rename to hosts/EntityFramework/Quickstart/Home/HomeController.cs
diff --git a/src/EntityFramework/host/Quickstart/SecurityHeadersAttribute.cs b/hosts/EntityFramework/Quickstart/SecurityHeadersAttribute.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/SecurityHeadersAttribute.cs
rename to hosts/EntityFramework/Quickstart/SecurityHeadersAttribute.cs
diff --git a/src/EntityFramework/host/Quickstart/TestUsers.cs b/hosts/EntityFramework/Quickstart/TestUsers.cs
similarity index 100%
rename from src/EntityFramework/host/Quickstart/TestUsers.cs
rename to hosts/EntityFramework/Quickstart/TestUsers.cs
diff --git a/src/EntityFramework/host/Startup.cs b/hosts/EntityFramework/Startup.cs
similarity index 100%
rename from src/EntityFramework/host/Startup.cs
rename to hosts/EntityFramework/Startup.cs
diff --git a/src/EntityFramework/host/TestOperationalStoreNotification.cs b/hosts/EntityFramework/TestOperationalStoreNotification.cs
similarity index 100%
rename from src/EntityFramework/host/TestOperationalStoreNotification.cs
rename to hosts/EntityFramework/TestOperationalStoreNotification.cs
diff --git a/src/EntityFramework/host/Views/Account/AccessDenied.cshtml b/hosts/EntityFramework/Views/Account/AccessDenied.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Account/AccessDenied.cshtml
rename to hosts/EntityFramework/Views/Account/AccessDenied.cshtml
diff --git a/src/EntityFramework/host/Views/Account/LoggedOut.cshtml b/hosts/EntityFramework/Views/Account/LoggedOut.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Account/LoggedOut.cshtml
rename to hosts/EntityFramework/Views/Account/LoggedOut.cshtml
diff --git a/src/EntityFramework/host/Views/Account/Login.cshtml b/hosts/EntityFramework/Views/Account/Login.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Account/Login.cshtml
rename to hosts/EntityFramework/Views/Account/Login.cshtml
diff --git a/src/EntityFramework/host/Views/Account/Logout.cshtml b/hosts/EntityFramework/Views/Account/Logout.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Account/Logout.cshtml
rename to hosts/EntityFramework/Views/Account/Logout.cshtml
diff --git a/src/EntityFramework/host/Views/Consent/Index.cshtml b/hosts/EntityFramework/Views/Consent/Index.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Consent/Index.cshtml
rename to hosts/EntityFramework/Views/Consent/Index.cshtml
diff --git a/src/EntityFramework/host/Views/Device/Success.cshtml b/hosts/EntityFramework/Views/Device/Success.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Device/Success.cshtml
rename to hosts/EntityFramework/Views/Device/Success.cshtml
diff --git a/src/EntityFramework/host/Views/Device/UserCodeCapture.cshtml b/hosts/EntityFramework/Views/Device/UserCodeCapture.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Device/UserCodeCapture.cshtml
rename to hosts/EntityFramework/Views/Device/UserCodeCapture.cshtml
diff --git a/src/EntityFramework/host/Views/Device/UserCodeConfirmation.cshtml b/hosts/EntityFramework/Views/Device/UserCodeConfirmation.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Device/UserCodeConfirmation.cshtml
rename to hosts/EntityFramework/Views/Device/UserCodeConfirmation.cshtml
diff --git a/src/EntityFramework/host/Views/Diagnostics/Index.cshtml b/hosts/EntityFramework/Views/Diagnostics/Index.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Diagnostics/Index.cshtml
rename to hosts/EntityFramework/Views/Diagnostics/Index.cshtml
diff --git a/src/EntityFramework/host/Views/Grants/Index.cshtml b/hosts/EntityFramework/Views/Grants/Index.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Grants/Index.cshtml
rename to hosts/EntityFramework/Views/Grants/Index.cshtml
diff --git a/src/EntityFramework/host/Views/Home/Index.cshtml b/hosts/EntityFramework/Views/Home/Index.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Home/Index.cshtml
rename to hosts/EntityFramework/Views/Home/Index.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/Error.cshtml b/hosts/EntityFramework/Views/Shared/Error.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/Error.cshtml
rename to hosts/EntityFramework/Views/Shared/Error.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/Redirect.cshtml b/hosts/EntityFramework/Views/Shared/Redirect.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/Redirect.cshtml
rename to hosts/EntityFramework/Views/Shared/Redirect.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/_Layout.cshtml b/hosts/EntityFramework/Views/Shared/_Layout.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/_Layout.cshtml
rename to hosts/EntityFramework/Views/Shared/_Layout.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/_Nav.cshtml b/hosts/EntityFramework/Views/Shared/_Nav.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/_Nav.cshtml
rename to hosts/EntityFramework/Views/Shared/_Nav.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/_ScopeListItem.cshtml b/hosts/EntityFramework/Views/Shared/_ScopeListItem.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/_ScopeListItem.cshtml
rename to hosts/EntityFramework/Views/Shared/_ScopeListItem.cshtml
diff --git a/src/EntityFramework/host/Views/Shared/_ValidationSummary.cshtml b/hosts/EntityFramework/Views/Shared/_ValidationSummary.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/Shared/_ValidationSummary.cshtml
rename to hosts/EntityFramework/Views/Shared/_ValidationSummary.cshtml
diff --git a/src/EntityFramework/host/Views/_ViewImports.cshtml b/hosts/EntityFramework/Views/_ViewImports.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/_ViewImports.cshtml
rename to hosts/EntityFramework/Views/_ViewImports.cshtml
diff --git a/src/EntityFramework/host/Views/_ViewStart.cshtml b/hosts/EntityFramework/Views/_ViewStart.cshtml
similarity index 100%
rename from src/EntityFramework/host/Views/_ViewStart.cshtml
rename to hosts/EntityFramework/Views/_ViewStart.cshtml
diff --git a/src/EntityFramework/host/appsettings.json b/hosts/EntityFramework/appsettings.json
similarity index 100%
rename from src/EntityFramework/host/appsettings.json
rename to hosts/EntityFramework/appsettings.json
diff --git a/src/EntityFramework/host/wwwroot/css/site.css b/hosts/EntityFramework/wwwroot/css/site.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/css/site.css
rename to hosts/EntityFramework/wwwroot/css/site.css
diff --git a/src/EntityFramework/host/wwwroot/css/site.min.css b/hosts/EntityFramework/wwwroot/css/site.min.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/css/site.min.css
rename to hosts/EntityFramework/wwwroot/css/site.min.css
diff --git a/src/EntityFramework/host/wwwroot/css/site.scss b/hosts/EntityFramework/wwwroot/css/site.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/css/site.scss
rename to hosts/EntityFramework/wwwroot/css/site.scss
diff --git a/src/EntityFramework/host/wwwroot/duende-logo.svg b/hosts/EntityFramework/wwwroot/duende-logo.svg
similarity index 100%
rename from src/EntityFramework/host/wwwroot/duende-logo.svg
rename to hosts/EntityFramework/wwwroot/duende-logo.svg
diff --git a/src/EntityFramework/host/wwwroot/favicon.ico b/hosts/EntityFramework/wwwroot/favicon.ico
similarity index 100%
rename from src/EntityFramework/host/wwwroot/favicon.ico
rename to hosts/EntityFramework/wwwroot/favicon.ico
diff --git a/src/EntityFramework/host/wwwroot/js/signin-redirect.js b/hosts/EntityFramework/wwwroot/js/signin-redirect.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/js/signin-redirect.js
rename to hosts/EntityFramework/wwwroot/js/signin-redirect.js
diff --git a/src/EntityFramework/host/wwwroot/js/signout-redirect.js b/hosts/EntityFramework/wwwroot/js/signout-redirect.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/js/signout-redirect.js
rename to hosts/EntityFramework/wwwroot/js/signout-redirect.js
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/LICENSE b/hosts/EntityFramework/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/LICENSE
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/README.md b/hosts/EntityFramework/wwwroot/lib/bootstrap/README.md
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/README.md
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/README.md
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_alert.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_alert.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_alert.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_alert.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_badge.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_badge.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_badge.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_badge.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_button-group.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_button-group.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_button-group.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_button-group.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_buttons.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_buttons.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_buttons.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_buttons.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_card.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_card.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_card.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_card.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_carousel.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_carousel.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_carousel.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_carousel.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_close.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_close.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_close.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_close.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_code.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_code.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_code.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_code.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_custom-forms.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_custom-forms.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_dropdown.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_dropdown.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_dropdown.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_dropdown.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_forms.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_forms.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_forms.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_forms.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_functions.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_functions.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_functions.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_functions.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_grid.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_grid.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_grid.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_grid.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_images.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_images.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_images.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_images.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_input-group.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_input-group.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_input-group.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_input-group.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_jumbotron.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_jumbotron.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_list-group.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_list-group.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_list-group.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_list-group.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_media.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_media.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_media.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_media.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_mixins.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_mixins.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_mixins.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_mixins.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_modal.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_modal.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_modal.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_modal.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_nav.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_nav.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_nav.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_nav.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_navbar.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_navbar.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_navbar.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_navbar.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_pagination.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_pagination.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_pagination.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_pagination.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_popover.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_popover.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_popover.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_popover.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_print.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_print.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_print.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_print.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_progress.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_progress.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_progress.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_progress.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_reboot.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_reboot.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_reboot.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_reboot.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_root.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_root.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_root.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_root.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_spinners.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_spinners.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_spinners.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_spinners.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_tables.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_tables.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_tables.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_tables.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_toasts.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_toasts.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_toasts.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_toasts.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_tooltip.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_tooltip.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_tooltip.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_tooltip.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_transitions.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_transitions.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_transitions.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_transitions.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_type.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_type.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_type.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_type.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_utilities.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_utilities.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_utilities.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_utilities.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_variables.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_variables.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/_variables.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/_variables.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/bootstrap.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/bootstrap.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_float.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_float.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_image.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_image.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_size.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_size.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_align.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_align.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_background.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_background.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_display.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_display.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_float.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_float.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_position.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_position.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_text.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_text.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss b/hosts/EntityFramework/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
rename to hosts/EntityFramework/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/LICENSE.txt b/hosts/EntityFramework/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/LICENSE.txt
rename to hosts/EntityFramework/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/README.md b/hosts/EntityFramework/wwwroot/lib/jquery/README.md
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/README.md
rename to hosts/EntityFramework/wwwroot/lib/jquery/README.md
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.js b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.js
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.min.js b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.min.js
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.min.map b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.min.map
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.js b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.js
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.js
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.min.js b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.min.js
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.min.js
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.min.js
diff --git a/src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.min.map b/hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.min.map
similarity index 100%
rename from src/EntityFramework/host/wwwroot/lib/jquery/dist/jquery.slim.min.map
rename to hosts/EntityFramework/wwwroot/lib/jquery/dist/jquery.slim.min.map
diff --git a/src/IdentityServer/host/Extensions/ExtensionGrantValidator.cs b/hosts/main/Extensions/ExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/ExtensionGrantValidator.cs
rename to hosts/main/Extensions/ExtensionGrantValidator.cs
diff --git a/src/IdentityServer/host/Extensions/HostProfileService.cs b/hosts/main/Extensions/HostProfileService.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/HostProfileService.cs
rename to hosts/main/Extensions/HostProfileService.cs
diff --git a/src/IdentityServer/host/Extensions/NoSubjectExtensionGrantValidator.cs b/hosts/main/Extensions/NoSubjectExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/NoSubjectExtensionGrantValidator.cs
rename to hosts/main/Extensions/NoSubjectExtensionGrantValidator.cs
diff --git a/src/IdentityServer/host/Extensions/ParameterizedScopeParser.cs b/hosts/main/Extensions/ParameterizedScopeParser.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/ParameterizedScopeParser.cs
rename to hosts/main/Extensions/ParameterizedScopeParser.cs
diff --git a/src/IdentityServer/host/Extensions/ParameterizedScopeTokenRequestValidator.cs b/hosts/main/Extensions/ParameterizedScopeTokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/ParameterizedScopeTokenRequestValidator.cs
rename to hosts/main/Extensions/ParameterizedScopeTokenRequestValidator.cs
diff --git a/src/IdentityServer/host/Extensions/SameSiteHandlingExtensions.cs b/hosts/main/Extensions/SameSiteHandlingExtensions.cs
similarity index 100%
rename from src/IdentityServer/host/Extensions/SameSiteHandlingExtensions.cs
rename to hosts/main/Extensions/SameSiteHandlingExtensions.cs
diff --git a/hosts/main/Host.Main.csproj b/hosts/main/Host.Main.csproj
new file mode 100644
index 000000000..6c44257dd
--- /dev/null
+++ b/hosts/main/Host.Main.csproj
@@ -0,0 +1,43 @@
+
+
+
+ netcoreapp3.1;net5.0
+ InProcess
+ Host
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configuration\Clients.cs
+
+
+ Configuration\ClientsConsole.cs
+
+
+ Configuration\ClientsWeb.cs
+
+
+ Configuration\Resources.cs
+
+
+
\ No newline at end of file
diff --git a/src/IdentityServer/host/LocalApiController.cs b/hosts/main/LocalApiController.cs
similarity index 100%
rename from src/IdentityServer/host/LocalApiController.cs
rename to hosts/main/LocalApiController.cs
diff --git a/src/IdentityServer/host/Program.cs b/hosts/main/Program.cs
similarity index 100%
rename from src/IdentityServer/host/Program.cs
rename to hosts/main/Program.cs
diff --git a/src/IdentityServer/host/Properties/launchSettings.json b/hosts/main/Properties/launchSettings.json
similarity index 100%
rename from src/IdentityServer/host/Properties/launchSettings.json
rename to hosts/main/Properties/launchSettings.json
diff --git a/src/IdentityServer/host/Quickstart/Account/AccountController.cs b/hosts/main/Quickstart/Account/AccountController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/AccountController.cs
rename to hosts/main/Quickstart/Account/AccountController.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/AccountOptions.cs b/hosts/main/Quickstart/Account/AccountOptions.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/AccountOptions.cs
rename to hosts/main/Quickstart/Account/AccountOptions.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/ExternalController.cs b/hosts/main/Quickstart/Account/ExternalController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/ExternalController.cs
rename to hosts/main/Quickstart/Account/ExternalController.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/ExternalProvider.cs b/hosts/main/Quickstart/Account/ExternalProvider.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/ExternalProvider.cs
rename to hosts/main/Quickstart/Account/ExternalProvider.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/LoggedOutViewModel.cs b/hosts/main/Quickstart/Account/LoggedOutViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/LoggedOutViewModel.cs
rename to hosts/main/Quickstart/Account/LoggedOutViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/LoginInputModel.cs b/hosts/main/Quickstart/Account/LoginInputModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/LoginInputModel.cs
rename to hosts/main/Quickstart/Account/LoginInputModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/LoginViewModel.cs b/hosts/main/Quickstart/Account/LoginViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/LoginViewModel.cs
rename to hosts/main/Quickstart/Account/LoginViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/LogoutInputModel.cs b/hosts/main/Quickstart/Account/LogoutInputModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/LogoutInputModel.cs
rename to hosts/main/Quickstart/Account/LogoutInputModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/LogoutViewModel.cs b/hosts/main/Quickstart/Account/LogoutViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/LogoutViewModel.cs
rename to hosts/main/Quickstart/Account/LogoutViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Account/RedirectViewModel.cs b/hosts/main/Quickstart/Account/RedirectViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Account/RedirectViewModel.cs
rename to hosts/main/Quickstart/Account/RedirectViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ConsentController.cs b/hosts/main/Quickstart/Consent/ConsentController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ConsentController.cs
rename to hosts/main/Quickstart/Consent/ConsentController.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ConsentInputModel.cs b/hosts/main/Quickstart/Consent/ConsentInputModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ConsentInputModel.cs
rename to hosts/main/Quickstart/Consent/ConsentInputModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ConsentOptions.cs b/hosts/main/Quickstart/Consent/ConsentOptions.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ConsentOptions.cs
rename to hosts/main/Quickstart/Consent/ConsentOptions.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ConsentViewModel.cs b/hosts/main/Quickstart/Consent/ConsentViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ConsentViewModel.cs
rename to hosts/main/Quickstart/Consent/ConsentViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ProcessConsentResult.cs b/hosts/main/Quickstart/Consent/ProcessConsentResult.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ProcessConsentResult.cs
rename to hosts/main/Quickstart/Consent/ProcessConsentResult.cs
diff --git a/src/IdentityServer/host/Quickstart/Consent/ScopeViewModel.cs b/hosts/main/Quickstart/Consent/ScopeViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Consent/ScopeViewModel.cs
rename to hosts/main/Quickstart/Consent/ScopeViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Device/DeviceAuthorizationInputModel.cs b/hosts/main/Quickstart/Device/DeviceAuthorizationInputModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Device/DeviceAuthorizationInputModel.cs
rename to hosts/main/Quickstart/Device/DeviceAuthorizationInputModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Device/DeviceAuthorizationViewModel.cs b/hosts/main/Quickstart/Device/DeviceAuthorizationViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Device/DeviceAuthorizationViewModel.cs
rename to hosts/main/Quickstart/Device/DeviceAuthorizationViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Device/DeviceController.cs b/hosts/main/Quickstart/Device/DeviceController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Device/DeviceController.cs
rename to hosts/main/Quickstart/Device/DeviceController.cs
diff --git a/src/IdentityServer/host/Quickstart/Diagnostics/DiagnosticsController.cs b/hosts/main/Quickstart/Diagnostics/DiagnosticsController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Diagnostics/DiagnosticsController.cs
rename to hosts/main/Quickstart/Diagnostics/DiagnosticsController.cs
diff --git a/src/IdentityServer/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs b/hosts/main/Quickstart/Diagnostics/DiagnosticsViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Diagnostics/DiagnosticsViewModel.cs
rename to hosts/main/Quickstart/Diagnostics/DiagnosticsViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Extensions.cs b/hosts/main/Quickstart/Extensions.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Extensions.cs
rename to hosts/main/Quickstart/Extensions.cs
diff --git a/src/IdentityServer/host/Quickstart/Grants/GrantsController.cs b/hosts/main/Quickstart/Grants/GrantsController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Grants/GrantsController.cs
rename to hosts/main/Quickstart/Grants/GrantsController.cs
diff --git a/src/IdentityServer/host/Quickstart/Grants/GrantsViewModel.cs b/hosts/main/Quickstart/Grants/GrantsViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Grants/GrantsViewModel.cs
rename to hosts/main/Quickstart/Grants/GrantsViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Home/ErrorViewModel.cs b/hosts/main/Quickstart/Home/ErrorViewModel.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Home/ErrorViewModel.cs
rename to hosts/main/Quickstart/Home/ErrorViewModel.cs
diff --git a/src/IdentityServer/host/Quickstart/Home/HomeController.cs b/hosts/main/Quickstart/Home/HomeController.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/Home/HomeController.cs
rename to hosts/main/Quickstart/Home/HomeController.cs
diff --git a/src/IdentityServer/host/Quickstart/SecurityHeadersAttribute.cs b/hosts/main/Quickstart/SecurityHeadersAttribute.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/SecurityHeadersAttribute.cs
rename to hosts/main/Quickstart/SecurityHeadersAttribute.cs
diff --git a/src/IdentityServer/host/Quickstart/TestUsers.cs b/hosts/main/Quickstart/TestUsers.cs
similarity index 100%
rename from src/IdentityServer/host/Quickstart/TestUsers.cs
rename to hosts/main/Quickstart/TestUsers.cs
diff --git a/src/IdentityServer/host/Startup.cs b/hosts/main/Startup.cs
similarity index 100%
rename from src/IdentityServer/host/Startup.cs
rename to hosts/main/Startup.cs
diff --git a/src/IdentityServer/host/TestKeys/identityserver.test.ecdsa.p12 b/hosts/main/TestKeys/identityserver.test.ecdsa.p12
similarity index 100%
rename from src/IdentityServer/host/TestKeys/identityserver.test.ecdsa.p12
rename to hosts/main/TestKeys/identityserver.test.ecdsa.p12
diff --git a/src/IdentityServer/host/TestKeys/identityserver.test.rsa.p12 b/hosts/main/TestKeys/identityserver.test.rsa.p12
similarity index 100%
rename from src/IdentityServer/host/TestKeys/identityserver.test.rsa.p12
rename to hosts/main/TestKeys/identityserver.test.rsa.p12
diff --git a/src/IdentityServer/host/Views/Account/AccessDenied.cshtml b/hosts/main/Views/Account/AccessDenied.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Account/AccessDenied.cshtml
rename to hosts/main/Views/Account/AccessDenied.cshtml
diff --git a/src/IdentityServer/host/Views/Account/LoggedOut.cshtml b/hosts/main/Views/Account/LoggedOut.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Account/LoggedOut.cshtml
rename to hosts/main/Views/Account/LoggedOut.cshtml
diff --git a/src/IdentityServer/host/Views/Account/Login.cshtml b/hosts/main/Views/Account/Login.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Account/Login.cshtml
rename to hosts/main/Views/Account/Login.cshtml
diff --git a/src/IdentityServer/host/Views/Account/Logout.cshtml b/hosts/main/Views/Account/Logout.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Account/Logout.cshtml
rename to hosts/main/Views/Account/Logout.cshtml
diff --git a/src/IdentityServer/host/Views/Consent/Index.cshtml b/hosts/main/Views/Consent/Index.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Consent/Index.cshtml
rename to hosts/main/Views/Consent/Index.cshtml
diff --git a/src/IdentityServer/host/Views/Device/Success.cshtml b/hosts/main/Views/Device/Success.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Device/Success.cshtml
rename to hosts/main/Views/Device/Success.cshtml
diff --git a/src/IdentityServer/host/Views/Device/UserCodeCapture.cshtml b/hosts/main/Views/Device/UserCodeCapture.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Device/UserCodeCapture.cshtml
rename to hosts/main/Views/Device/UserCodeCapture.cshtml
diff --git a/src/IdentityServer/host/Views/Device/UserCodeConfirmation.cshtml b/hosts/main/Views/Device/UserCodeConfirmation.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Device/UserCodeConfirmation.cshtml
rename to hosts/main/Views/Device/UserCodeConfirmation.cshtml
diff --git a/src/IdentityServer/host/Views/Diagnostics/Index.cshtml b/hosts/main/Views/Diagnostics/Index.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Diagnostics/Index.cshtml
rename to hosts/main/Views/Diagnostics/Index.cshtml
diff --git a/src/IdentityServer/host/Views/Grants/Index.cshtml b/hosts/main/Views/Grants/Index.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Grants/Index.cshtml
rename to hosts/main/Views/Grants/Index.cshtml
diff --git a/src/IdentityServer/host/Views/Home/Index.cshtml b/hosts/main/Views/Home/Index.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Home/Index.cshtml
rename to hosts/main/Views/Home/Index.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/Error.cshtml b/hosts/main/Views/Shared/Error.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/Error.cshtml
rename to hosts/main/Views/Shared/Error.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/Redirect.cshtml b/hosts/main/Views/Shared/Redirect.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/Redirect.cshtml
rename to hosts/main/Views/Shared/Redirect.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/_Layout.cshtml b/hosts/main/Views/Shared/_Layout.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/_Layout.cshtml
rename to hosts/main/Views/Shared/_Layout.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/_Nav.cshtml b/hosts/main/Views/Shared/_Nav.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/_Nav.cshtml
rename to hosts/main/Views/Shared/_Nav.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/_ScopeListItem.cshtml b/hosts/main/Views/Shared/_ScopeListItem.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/_ScopeListItem.cshtml
rename to hosts/main/Views/Shared/_ScopeListItem.cshtml
diff --git a/src/IdentityServer/host/Views/Shared/_ValidationSummary.cshtml b/hosts/main/Views/Shared/_ValidationSummary.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/Shared/_ValidationSummary.cshtml
rename to hosts/main/Views/Shared/_ValidationSummary.cshtml
diff --git a/src/IdentityServer/host/Views/_ViewImports.cshtml b/hosts/main/Views/_ViewImports.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/_ViewImports.cshtml
rename to hosts/main/Views/_ViewImports.cshtml
diff --git a/src/IdentityServer/host/Views/_ViewStart.cshtml b/hosts/main/Views/_ViewStart.cshtml
similarity index 100%
rename from src/IdentityServer/host/Views/_ViewStart.cshtml
rename to hosts/main/Views/_ViewStart.cshtml
diff --git a/src/IdentityServer/host/appsettings.json b/hosts/main/appsettings.json
similarity index 100%
rename from src/IdentityServer/host/appsettings.json
rename to hosts/main/appsettings.json
diff --git a/src/IdentityServer/host/compilerconfig.json b/hosts/main/compilerconfig.json
similarity index 100%
rename from src/IdentityServer/host/compilerconfig.json
rename to hosts/main/compilerconfig.json
diff --git a/src/IdentityServer/host/compilerconfig.json.defaults b/hosts/main/compilerconfig.json.defaults
similarity index 100%
rename from src/IdentityServer/host/compilerconfig.json.defaults
rename to hosts/main/compilerconfig.json.defaults
diff --git a/src/IdentityServer/host/wwwroot/css/site.css b/hosts/main/wwwroot/css/site.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/css/site.css
rename to hosts/main/wwwroot/css/site.css
diff --git a/src/IdentityServer/host/wwwroot/css/site.min.css b/hosts/main/wwwroot/css/site.min.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/css/site.min.css
rename to hosts/main/wwwroot/css/site.min.css
diff --git a/src/IdentityServer/host/wwwroot/css/site.scss b/hosts/main/wwwroot/css/site.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/css/site.scss
rename to hosts/main/wwwroot/css/site.scss
diff --git a/src/IdentityServer/host/wwwroot/duende-logo.svg b/hosts/main/wwwroot/duende-logo.svg
similarity index 100%
rename from src/IdentityServer/host/wwwroot/duende-logo.svg
rename to hosts/main/wwwroot/duende-logo.svg
diff --git a/src/IdentityServer/host/wwwroot/favicon.ico b/hosts/main/wwwroot/favicon.ico
similarity index 100%
rename from src/IdentityServer/host/wwwroot/favicon.ico
rename to hosts/main/wwwroot/favicon.ico
diff --git a/src/IdentityServer/host/wwwroot/js/signin-redirect.js b/hosts/main/wwwroot/js/signin-redirect.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/js/signin-redirect.js
rename to hosts/main/wwwroot/js/signin-redirect.js
diff --git a/src/IdentityServer/host/wwwroot/js/signout-redirect.js b/hosts/main/wwwroot/js/signout-redirect.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/js/signout-redirect.js
rename to hosts/main/wwwroot/js/signout-redirect.js
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/LICENSE b/hosts/main/wwwroot/lib/bootstrap/LICENSE
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/LICENSE
rename to hosts/main/wwwroot/lib/bootstrap/LICENSE
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/README.md b/hosts/main/wwwroot/lib/bootstrap/README.md
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/README.md
rename to hosts/main/wwwroot/lib/bootstrap/README.md
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-grid.min.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map b/hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/css/bootstrap.min.css.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.js.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.bundle.min.js.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.js
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.js.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map b/hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
rename to hosts/main/wwwroot/lib/bootstrap/dist/js/bootstrap.min.js.map
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_alert.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_alert.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_alert.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_alert.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_badge.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_badge.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_badge.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_badge.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_breadcrumb.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_button-group.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_button-group.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_button-group.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_button-group.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_buttons.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_buttons.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_buttons.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_buttons.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_card.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_card.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_card.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_card.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_carousel.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_carousel.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_carousel.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_carousel.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_close.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_close.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_close.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_close.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_code.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_code.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_code.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_code.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_custom-forms.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_custom-forms.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_custom-forms.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_dropdown.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_dropdown.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_dropdown.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_dropdown.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_forms.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_forms.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_forms.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_forms.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_functions.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_functions.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_functions.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_functions.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_grid.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_grid.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_grid.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_grid.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_images.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_images.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_images.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_images.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_input-group.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_input-group.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_input-group.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_input-group.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_jumbotron.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_jumbotron.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_jumbotron.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_list-group.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_list-group.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_list-group.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_list-group.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_media.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_media.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_media.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_media.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_mixins.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_mixins.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_mixins.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_mixins.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_modal.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_modal.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_modal.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_modal.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_nav.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_nav.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_nav.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_nav.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_navbar.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_navbar.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_navbar.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_navbar.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_pagination.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_pagination.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_pagination.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_pagination.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_popover.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_popover.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_popover.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_popover.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_print.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_print.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_print.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_print.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_progress.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_progress.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_progress.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_progress.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_reboot.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_reboot.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_reboot.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_reboot.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_root.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_root.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_root.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_root.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_spinners.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_spinners.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_spinners.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_spinners.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_tables.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_tables.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_tables.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_tables.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_toasts.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_toasts.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_toasts.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_toasts.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_tooltip.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_tooltip.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_tooltip.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_tooltip.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_transitions.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_transitions.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_transitions.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_transitions.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_type.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_type.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_type.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_type.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_utilities.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_utilities.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_utilities.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_utilities.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_variables.scss b/hosts/main/wwwroot/lib/bootstrap/scss/_variables.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/_variables.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/_variables.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss b/hosts/main/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/bootstrap-grid.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss b/hosts/main/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/bootstrap-reboot.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap.scss b/hosts/main/wwwroot/lib/bootstrap/scss/bootstrap.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/bootstrap.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/bootstrap.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_alert.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_background-variant.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_badge.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_border-radius.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_box-shadow.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_breakpoints.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_buttons.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_caret.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_clearfix.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_deprecate.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_float.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_float.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_float.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_forms.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_gradients.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_grid-framework.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_grid.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_hover.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_image.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_image.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_image.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_list-group.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_lists.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_nav-divider.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_pagination.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_reset-text.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_resize.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_screen-reader.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_size.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_size.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_size.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_table-row.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-emphasis.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-hide.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_text-truncate.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_transition.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss b/hosts/main/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/mixins/_visibility.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_align.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_align.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_align.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_background.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_background.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_background.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_borders.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_clearfix.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_display.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_display.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_display.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_embed.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_flex.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_float.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_float.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_float.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_overflow.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_position.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_position.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_position.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_screenreaders.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_shadows.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_sizing.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_spacing.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_stretched-link.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_text.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_text.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_text.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss b/hosts/main/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/utilities/_visibility.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss b/hosts/main/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
rename to hosts/main/wwwroot/lib/bootstrap/scss/vendor/_rfs.scss
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/LICENSE.txt b/hosts/main/wwwroot/lib/jquery/LICENSE.txt
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/LICENSE.txt
rename to hosts/main/wwwroot/lib/jquery/LICENSE.txt
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/README.md b/hosts/main/wwwroot/lib/jquery/README.md
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/README.md
rename to hosts/main/wwwroot/lib/jquery/README.md
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.js b/hosts/main/wwwroot/lib/jquery/dist/jquery.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.js
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.js
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.min.js b/hosts/main/wwwroot/lib/jquery/dist/jquery.min.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.min.js
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.min.js
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.min.map b/hosts/main/wwwroot/lib/jquery/dist/jquery.min.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.min.map
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.min.map
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.js b/hosts/main/wwwroot/lib/jquery/dist/jquery.slim.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.js
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.slim.js
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.min.js b/hosts/main/wwwroot/lib/jquery/dist/jquery.slim.min.js
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.min.js
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.slim.min.js
diff --git a/src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.min.map b/hosts/main/wwwroot/lib/jquery/dist/jquery.slim.min.map
similarity index 100%
rename from src/IdentityServer/host/wwwroot/lib/jquery/dist/jquery.slim.min.map
rename to hosts/main/wwwroot/lib/jquery/dist/jquery.slim.min.map
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb.sql b/migrations/SqlServer/Migrations/ConfigurationDb.sql
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb.sql
rename to migrations/SqlServer/Migrations/ConfigurationDb.sql
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.Designer.cs b/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.Designer.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.Designer.cs
rename to migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.Designer.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.cs b/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.cs
rename to migrations/SqlServer/Migrations/ConfigurationDb/20201123190954_Configuration.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs b/migrations/SqlServer/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs
rename to migrations/SqlServer/Migrations/ConfigurationDb/ConfigurationDbContextModelSnapshot.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb.sql b/migrations/SqlServer/Migrations/PersistedGrantDb.sql
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb.sql
rename to migrations/SqlServer/Migrations/PersistedGrantDb.sql
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.Designer.cs b/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.Designer.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.Designer.cs
rename to migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.Designer.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.cs b/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.cs
rename to migrations/SqlServer/Migrations/PersistedGrantDb/20201123190949_Grants.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs b/migrations/SqlServer/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs
rename to migrations/SqlServer/Migrations/PersistedGrantDb/PersistedGrantDbContextModelSnapshot.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Program.cs b/migrations/SqlServer/Program.cs
similarity index 82%
rename from src/EntityFramework.Storage/migrations/SqlServer/Program.cs
rename to migrations/SqlServer/Program.cs
index d03481596..9a2957a0c 100644
--- a/src/EntityFramework.Storage/migrations/SqlServer/Program.cs
+++ b/migrations/SqlServer/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Duende Software. All rights reserved.
+// Copyright (c) Duende Software. All rights reserved.
// See LICENSE in the project root for license information.
@@ -11,6 +11,7 @@ class Program
{
public static void Main(string[] args)
{
+ // todo: add seed data
}
public static IWebHost BuildWebHost(string[] args) =>
diff --git a/src/AspNetIdentity/migrations/SqlServer/Properties/launchSettings.json b/migrations/SqlServer/Properties/launchSettings.json
similarity index 100%
rename from src/AspNetIdentity/migrations/SqlServer/Properties/launchSettings.json
rename to migrations/SqlServer/Properties/launchSettings.json
diff --git a/migrations/SqlServer/SqlServer.csproj b/migrations/SqlServer/SqlServer.csproj
new file mode 100644
index 000000000..e490cd7c4
--- /dev/null
+++ b/migrations/SqlServer/SqlServer.csproj
@@ -0,0 +1,32 @@
+
+
+
+ netcoreapp3.1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configuration\Clients.cs
+
+
+ Configuration\ClientsConsole.cs
+
+
+ Configuration\ClientsWeb.cs
+
+
+ Configuration\Resources.cs
+
+
+
+
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Startup.cs b/migrations/SqlServer/Startup.cs
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/Startup.cs
rename to migrations/SqlServer/Startup.cs
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/appsettings.json b/migrations/SqlServer/appsettings.json
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/appsettings.json
rename to migrations/SqlServer/appsettings.json
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/buildschema.bat b/migrations/SqlServer/buildschema.bat
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/buildschema.bat
rename to migrations/SqlServer/buildschema.bat
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/createdb.bat b/migrations/SqlServer/createdb.bat
similarity index 100%
rename from src/EntityFramework.Storage/migrations/SqlServer/createdb.bat
rename to migrations/SqlServer/createdb.bat
diff --git a/rebuild.ps1 b/rebuild.ps1
deleted file mode 100644
index 9552043b0..000000000
--- a/rebuild.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-.\clean.ps1
-.\build.ps1 quick
\ No newline at end of file
diff --git a/rebuild.sh b/rebuild.sh
deleted file mode 100755
index 7ffcdab77..000000000
--- a/rebuild.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-./clean.sh
-./build.sh quick
\ No newline at end of file
diff --git a/src/AspNetIdentity/src/Decorator.cs b/src/AspNetIdentity/Decorator.cs
similarity index 100%
rename from src/AspNetIdentity/src/Decorator.cs
rename to src/AspNetIdentity/Decorator.cs
diff --git a/src/AspNetIdentity/src/Duende.IdentityServer.AspNetIdentity.csproj b/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj
similarity index 79%
rename from src/AspNetIdentity/src/Duende.IdentityServer.AspNetIdentity.csproj
rename to src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj
index 7cb4bc281..b0627ca04 100644
--- a/src/AspNetIdentity/src/Duende.IdentityServer.AspNetIdentity.csproj
+++ b/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.csproj
@@ -14,9 +14,7 @@
-
-
-
+
\ No newline at end of file
diff --git a/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.sln b/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.sln
deleted file mode 100644
index cc24eb4b2..000000000
--- a/src/AspNetIdentity/Duende.IdentityServer.AspNetIdentity.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26228.9
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{932FA9D0-7FB4-4047-8FFD-B74907B5FA15}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.AspNetIdentity", "src\Duende.IdentityServer.AspNetIdentity.csproj", "{A2CDBE15-5898-4A04-94DC-133EE03A78B3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host", "host\Host.csproj", "{B7FBA07C-A462-4869-AF94-5E36DFC3742D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", "{4BC142B6-4922-4203-82A2-F28CB6AC5004}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServer", "migrations\SqlServer\SqlServer.csproj", "{DD44B9E9-C32E-4F89-92C9-25444A709BBB}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A2CDBE15-5898-4A04-94DC-133EE03A78B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A2CDBE15-5898-4A04-94DC-133EE03A78B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A2CDBE15-5898-4A04-94DC-133EE03A78B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A2CDBE15-5898-4A04-94DC-133EE03A78B3}.Release|Any CPU.Build.0 = Release|Any CPU
- {B7FBA07C-A462-4869-AF94-5E36DFC3742D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B7FBA07C-A462-4869-AF94-5E36DFC3742D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B7FBA07C-A462-4869-AF94-5E36DFC3742D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B7FBA07C-A462-4869-AF94-5E36DFC3742D}.Release|Any CPU.Build.0 = Release|Any CPU
- {DD44B9E9-C32E-4F89-92C9-25444A709BBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DD44B9E9-C32E-4F89-92C9-25444A709BBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DD44B9E9-C32E-4F89-92C9-25444A709BBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DD44B9E9-C32E-4F89-92C9-25444A709BBB}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {A2CDBE15-5898-4A04-94DC-133EE03A78B3} = {932FA9D0-7FB4-4047-8FFD-B74907B5FA15}
- {B7FBA07C-A462-4869-AF94-5E36DFC3742D} = {932FA9D0-7FB4-4047-8FFD-B74907B5FA15}
- {DD44B9E9-C32E-4F89-92C9-25444A709BBB} = {4BC142B6-4922-4203-82A2-F28CB6AC5004}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {03AF716A-120B-409D-B384-B65E7FDEFEEF}
- EndGlobalSection
-EndGlobal
diff --git a/src/AspNetIdentity/src/IdentityServerBuilderExtensions.cs b/src/AspNetIdentity/IdentityServerBuilderExtensions.cs
similarity index 100%
rename from src/AspNetIdentity/src/IdentityServerBuilderExtensions.cs
rename to src/AspNetIdentity/IdentityServerBuilderExtensions.cs
diff --git a/src/AspNetIdentity/src/ProfileService.cs b/src/AspNetIdentity/ProfileService.cs
similarity index 100%
rename from src/AspNetIdentity/src/ProfileService.cs
rename to src/AspNetIdentity/ProfileService.cs
diff --git a/src/AspNetIdentity/src/ResourceOwnerPasswordValidator.cs b/src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
similarity index 100%
rename from src/AspNetIdentity/src/ResourceOwnerPasswordValidator.cs
rename to src/AspNetIdentity/ResourceOwnerPasswordValidator.cs
diff --git a/src/AspNetIdentity/src/SecurityStampValidatorCallback.cs b/src/AspNetIdentity/SecurityStampValidatorCallback.cs
similarity index 100%
rename from src/AspNetIdentity/src/SecurityStampValidatorCallback.cs
rename to src/AspNetIdentity/SecurityStampValidatorCallback.cs
diff --git a/src/AspNetIdentity/src/UserClaimsFactory.cs b/src/AspNetIdentity/UserClaimsFactory.cs
similarity index 100%
rename from src/AspNetIdentity/src/UserClaimsFactory.cs
rename to src/AspNetIdentity/UserClaimsFactory.cs
diff --git a/src/AspNetIdentity/build.cmd b/src/AspNetIdentity/build.cmd
deleted file mode 100644
index e4cf78f4a..000000000
--- a/src/AspNetIdentity/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-dotnet run --project build -- %*
\ No newline at end of file
diff --git a/src/AspNetIdentity/build.ps1 b/src/AspNetIdentity/build.ps1
deleted file mode 100644
index 8c950bdae..000000000
--- a/src/AspNetIdentity/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-$ErrorActionPreference = "Stop";
-dotnet run --project build -- $args
\ No newline at end of file
diff --git a/src/AspNetIdentity/build.sh b/src/AspNetIdentity/build.sh
deleted file mode 100755
index bb8ef5b20..000000000
--- a/src/AspNetIdentity/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-dotnet run --project build -- "$@"
\ No newline at end of file
diff --git a/src/AspNetIdentity/build/Program.cs b/src/AspNetIdentity/build/Program.cs
deleted file mode 100644
index 46a19ae28..000000000
--- a/src/AspNetIdentity/build/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace build
-{
- partial class Program
- {
- private const string Prefix = "AspNetIdentity";
- }
-}
diff --git a/src/AspNetIdentity/build/build.csproj b/src/AspNetIdentity/build/build.csproj
deleted file mode 100644
index 43c81aaed..000000000
--- a/src/AspNetIdentity/build/build.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/AspNetIdentity/host/Configuration/Clients.cs b/src/AspNetIdentity/host/Configuration/Clients.cs
deleted file mode 100644
index d0f229e61..000000000
--- a/src/AspNetIdentity/host/Configuration/Clients.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using System.Collections.Generic;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public static class Clients
- {
- public static IEnumerable Get()
- {
- var clients = new List();
-
- clients.AddRange(ClientsConsole.Get());
- clients.AddRange(ClientsWeb.Get());
-
- return clients;
- }
- }
-}
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/Configuration/ClientsConsole.cs b/src/AspNetIdentity/host/Configuration/ClientsConsole.cs
deleted file mode 100644
index 9ea7fb366..000000000
--- a/src/AspNetIdentity/host/Configuration/ClientsConsole.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public static class ClientsConsole
- {
- public static IEnumerable Get()
- {
- return new List
- {
- ///////////////////////////////////////////////////////////////
- // Console-based Client
- ///////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////
- // Console Client Credentials Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1", IdentityServerConstants.LocalApi.ScopeName}
- },
-
- ///////////////////////////////////////////
- // Console Structured Scope Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "parameterized.client",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "transaction" }
- },
-
- ///////////////////////////////////////////
- // X509 mTLS Client
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mtls",
- ClientSecrets =
- {
- // new Secret(@"CN=mtls.test, OU=ROO\ballen@roo, O=mkcert development certificate", "mtls.test")
- // {
- // Type = SecretTypes.X509CertificateName
- // },
- new Secret("5D9E9B6B333CD42C99D1DE6175CC0F3EF99DDF68", "mtls.test")
- {
- Type = IdentityServerConstants.SecretTypes.X509CertificateThumbprint
- },
- },
-
- AccessTokenType = AccessTokenType.Jwt,
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Console Client Credentials Flow with client JWT assertion
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client.jwt",
- ClientSecrets =
- {
- new Secret
- {
- Type = IdentityServerConstants.SecretTypes.X509CertificateBase64,
- Value =
- "MIIEgTCCAumgAwIBAgIQDMMu7l/umJhfEbzJMpcttzANBgkqhkiG9w0BAQsFADCBkzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTQwMgYDVQQLDCtkb21pbmlja0Bkb21icDE2LmZyaXR6LmJveCAoRG9taW5pY2sgQmFpZXIpMTswOQYDVQQDDDJta2NlcnQgZG9taW5pY2tAZG9tYnAxNi5mcml0ei5ib3ggKERvbWluaWNrIEJhaWVyKTAeFw0xOTA2MDEwMDAwMDBaFw0zMDAxMDMxMjM0MDdaMHAxJzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTE0MDIGA1UECwwrZG9taW5pY2tAZG9tYnAxNi5mcml0ei5ib3ggKERvbWluaWNrIEJhaWVyKTEPMA0GA1UEAxMGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNtpipaS8k1zA6w0Aoy8U4l+8zM4jHhhblExf3PULrMR6RauxniTki8p+P8CsZT4V8A4qo+JwsgpLIHrVQrbt9DEhHfBKzxwHqt+GoHt7byTfTtp8A/5nLhYc/5CW4HiR194gVx5+HAlvt+BriMTb1czvTf+H20dj41yUPsN7nMdyRLF+uXapQYMLYnq2BJIDq83mqGwojHk7d+N6GwoO95jlyas7KSoj8/FvfbaqkRNx0446hqPOzFHKc8er8K5VrLp6tVjh8ZJyY0F0dKgx6yWITsL54ctbj/cCyfuGjWEMbS2XXgc+x/xQMnmpfhK1qQAUn9jg5EzF9n6mQomOwIDAQABo3MwcTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUEMUlw41YsKZQVls3pEG6CrJk4O8wEQYDVR0RBAowCIIGY2xpZW50MA0GCSqGSIb3DQEBCwUAA4IBgQC0TjNY4Q3Wmw7ggamDImV6HUng3WbYGLYbbL2e3myBrjIxGd1Bi8ZyOu8qeUMIRAbZt2YsSX5S8kx0biaVg2zC+aO5eHhEWMwKB66huInXFjI4wtxZ22r+33fg1R0cLuEUePhftOWrbL0MS4YXVyn9HUMWO4WptG9PJdxNw1UbEB8nw3FkVOdAC9RGqiqalSK+E2UT/kUbTIQ1gPSdQ3nh52mre0H/T9+IRqiozJtNK/CQg4NuEV7rUXHnp7Fmigp6RIJ4TCozglspL341y0rV8M7npU1FYZC2UKNr4ed+GOO1n/sF3LbXDlPXwne99CVVn85wjDaevoR7Md0y2KwE9EggLYcViXNehx4YVv/BjfgqxW8NxiKAxP6kPOZE0XdBrZj2rmcDcGOXCzzYpcduKhFyTOpA0K5RNGC3j1KOUjPVlOtLvjASP7udBEYNfH3mgqXAgqNDOEKi2jG9LITv2IyGUsXhTAsKNJ6A6qiDBzDrvPAYDvsfabPq6tRTwjA="
- },
- new Secret
- {
- Type = IdentityServerConstants.SecretTypes.JsonWebKey,
- Value =
- "{'e':'AQAB','kid':'ZzAjSnraU3bkWGnnAqLapYGpTyNfLbjbzgAPbbW2GEA','kty':'RSA','n':'wWwQFtSzeRjjerpEM5Rmqz_DsNaZ9S1Bw6UbZkDLowuuTCjBWUax0vBMMxdy6XjEEK4Oq9lKMvx9JzjmeJf1knoqSNrox3Ka0rnxXpNAz6sATvme8p9mTXyp0cX4lF4U2J54xa2_S9NF5QWvpXvBeC4GAJx7QaSw4zrUkrc6XyaAiFnLhQEwKJCwUw4NOqIuYvYp_IXhw-5Ti_icDlZS-282PcccnBeOcX7vc21pozibIdmZJKqXNsL1Ibx5Nkx1F1jLnekJAmdaACDjYRLL_6n3W4wUp19UvzB1lGtXcJKLLkqB6YDiZNu16OSiSprfmrRXvYmvD8m6Fnl5aetgKw'}"
- }
- },
-
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Custom Grant Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client.custom",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = {"custom", "custom.nosubject"},
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Console Resource Owner Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- "custom.profile",
- "resource1.scope1", "resource2.scope1"
- }
- },
-
- ///////////////////////////////////////////
- // Console Public Resource Owner Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient.public",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
-
- ///////////////////////////////////////////
- // Console with PKCE Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "console.pkce",
- ClientName = "Console with PKCE Sample",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
- RedirectUris = {"http://127.0.0.1"},
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
- ///////////////////////////////////////////
- // WinConsole with PKCE Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "winconsole",
- ClientName = "Windows Console with PKCE Sample",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
- RedirectUris = {"sample-windows-client://callback"},
- RequireConsent = false,
- AllowOfflineAccess = true,
- AllowedIdentityTokenSigningAlgorithms = {"ES256"},
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
-
-
- ///////////////////////////////////////////
- // Introspection Client Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient.reference",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" },
- AccessTokenType = AccessTokenType.Reference
- },
-
- ///////////////////////////////////////////
- // Device Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "device",
- ClientName = "Device Flow Client",
-
- AllowedGrantTypes = GrantTypes.DeviceFlow,
- RequireClientSecret = false,
-
- AllowOfflineAccess = true,
-
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- }
- };
- }
- }
-}
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/Configuration/ClientsWeb.cs b/src/AspNetIdentity/host/Configuration/ClientsWeb.cs
deleted file mode 100644
index 8b5b48d02..000000000
--- a/src/AspNetIdentity/host/Configuration/ClientsWeb.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.using System.Collections.Generic;
-
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public static class ClientsWeb
- {
- static string[] allowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1",
- "resource2.scope1",
- "transaction"
- };
-
- public static IEnumerable Get()
- {
- return new List
- {
- ///////////////////////////////////////////
- // JS OIDC Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "js_oidc",
- ClientName = "JavaScript OIDC Client",
- ClientUri = "http://identityserver.io",
-
- AllowedGrantTypes = GrantTypes.Code,
- RequireClientSecret = false,
-
- RedirectUris =
- {
- "https://localhost:44300/index.html",
- "https://localhost:44300/callback.html",
- "https://localhost:44300/silent.html",
- "https://localhost:44300/popup.html"
- },
-
- PostLogoutRedirectUris = { "https://localhost:44300/index.html" },
- AllowedCorsOrigins = { "https://localhost:44300" },
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Automatic Token Management Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.tokenmanagement",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
-
- AccessTokenLifetime = 75,
-
- RedirectUris = { "https://localhost:44301/signin-oidc" },
- FrontChannelLogoutUri = "https://localhost:44301/signout-oidc",
- PostLogoutRedirectUris = { "https://localhost:44301/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Code Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.code",
- ClientName = "MVC Code Flow",
- ClientUri = "http://identityserver.io",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- RequireConsent = true,
- AllowedGrantTypes = GrantTypes.Code,
-
- RedirectUris = { "https://localhost:44302/signin-oidc" },
- FrontChannelLogoutUri = "https://localhost:44302/signout-oidc",
- PostLogoutRedirectUris = { "https://localhost:44302/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Hybrid Flow Sample (Back Channel logout)
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.hybrid.backchannel",
- ClientName = "MVC Hybrid (with BackChannel logout)",
- ClientUri = "http://identityserver.io",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- AllowedGrantTypes = GrantTypes.Hybrid,
- RequirePkce = false,
-
- RedirectUris = { "https://localhost:44303/signin-oidc" },
- BackChannelLogoutUri = "https://localhost:44303/logout",
- PostLogoutRedirectUris = { "https://localhost:44303/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- }
- };
- }
- }
-}
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/Configuration/Resources.cs b/src/AspNetIdentity/host/Configuration/Resources.cs
deleted file mode 100644
index bad9802ba..000000000
--- a/src/AspNetIdentity/host/Configuration/Resources.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using IdentityModel;
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public class Resources
- {
- // identity resources represent identity data about a user that can be requested via the scope parameter (OpenID Connect)
- public static readonly IEnumerable IdentityResources =
- new[]
- {
- // some standard scopes from the OIDC spec
- new IdentityResources.OpenId(),
- new IdentityResources.Profile(),
- new IdentityResources.Email(),
-
- // custom identity resource with some consolidated claims
- new IdentityResource("custom.profile", new[] { JwtClaimTypes.Name, JwtClaimTypes.Email, "location" })
- };
-
- // API scopes represent values that describe scope of access and can be requested by the scope parameter (OAuth)
- public static readonly IEnumerable ApiScopes =
- new[]
- {
- // local API scope
- new ApiScope(IdentityServerConstants.LocalApi.ScopeName),
-
- // resource specific scopes
- new ApiScope("resource1.scope1"),
- new ApiScope("resource2.scope1"),
-
- // a scope without resource association
- new ApiScope("scope3"),
-
- // a scope shared by multiple resources
- new ApiScope("shared.scope"),
-
- // a parameterized scope
- new ApiScope("transaction", "Transaction")
- {
- Description = "Some Transaction"
- }
- };
-
- // API resources are more formal representation of a resource with processing rules and their scopes (if any)
- public static readonly IEnumerable ApiResources =
- new[]
- {
- new ApiResource("resource1", "Resource 1")
- {
- ApiSecrets = { new Secret("secret".Sha256()) },
-
- Scopes = { "resource1.scope1", "shared.scope" }
- },
-
- // expanded version if more control is needed
- new ApiResource("resource2", "Resource 2")
- {
- ApiSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- // additional claims to put into access token
- UserClaims =
- {
- JwtClaimTypes.Name,
- JwtClaimTypes.Email
- },
-
- Scopes = { "resource2.scope1", "shared.scope" }
- }
- };
- }
-}
diff --git a/src/AspNetIdentity/host/Host.csproj b/src/AspNetIdentity/host/Host.csproj
deleted file mode 100644
index 2c0f98b38..000000000
--- a/src/AspNetIdentity/host/Host.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
- netcoreapp3.1;net5.0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/AspNetIdentity/host/tempkey.jwk b/src/AspNetIdentity/host/tempkey.jwk
deleted file mode 100644
index dd0af1d82..000000000
--- a/src/AspNetIdentity/host/tempkey.jwk
+++ /dev/null
@@ -1 +0,0 @@
-{"alg":"RS256","d":"H3UIgB6rNmSMsINjdSi5rs1ZaF6jQ4AjopBuxYpcql9elC8aIISbd6Xo7cZbb2R8qh8bAPZS3LcogbgR9kqMxzrHwqIaUOJvkmR5pbciUHdbu1mBJqokfEOsMahyyd5get8cHMCfUgK41bLVPuaFVuOjzxZoptsIkDcJWbCnNcY9qApFqV_NGHYF19W3hs1QHYtmdIm3-0RK34X_z1_g0ilbSOIgCHHUYvxrtN11FTnn6aJYsShlD4RRDpb7Pas-PFcVzXAL4Be0znQycIN-qYhWBXqjulEETRt1GPHsrC4GaibL6ZYOGqrhnx9-Ztodgh1sFeaLIeelX9do48tuJQ","dp":"dKt0G-IvGv2uepFVxCN69SzDjGGG3bgcUwSfFJTIryXU4BwMg2TlF5u0fxxUqqGKnpkvcp_UvQDht8u2SjoX2GYtZ_njtGNUbGIwzI1lsXn03IA0vvJWQmJL7PnWe8yuswMJDDD4S1JCQEhOKw957atIByjQbkKHV6_ylAUKZO8","dq":"lZAuNp6H5sI4jRVsT1KPmO-8hl8b_D_2T9ANUnXkC1vU43E3PLvk06EoJbF4m0gFuxMSEk5i1t11M7faNqSOaBbwCQOHaI4ZvHNlesoDao9OXRmRqOByGmcroZSze_LmoKCILHr2t62492hguL8pVJ7_aUB0POMqs_lbCpayxFU","e":"AQAB","kid":"56A8EF81C37F3A287C3A4EC117531B2C","kty":"RSA","n":"wVea56jhzJGQYxuh_zAoIWVwna_ym1Gt6J4aN2PnPbne5-l825jcNbcsPVkTXl_j7MmyQ02RAsLtp52O-lKEncWKJ0Yy69O9X3thHjJ3T7k6eiK6WyqYIEVYylti2X6m4yf_Uw_rUfDxb-T9R9nhcoTUlicgj8D9B2iwhq-2yP2figWPOVCzx0fK4uS-XlKmsH4tBtuCxEPPW5a_BdsHaIhqmnCLnvFXaXOccqIaqv79JrlurSRCbT4UT-25BJdrnfIrZCMtw26vzZs8smTWIXIOH5LUkpiWHPhnTBrVyWdCl1QXSw67IM5YAwu7LSpwiolhLKJMbbOyPOUGlca4bQ","p":"z5Fspr_JRgzBcu_i59TLoDvFYbYCkOshf2YDTWx_e1ZDxX3IsRV8AQi47sqwRlEcGRKTkKnXmeigdJ-FLGrJe_yfBTNHRPeoxHe0_exnbdW_yhtZHzQ4YS-ntUNYHFIMtyyKPBmFpgVyCeZmqwL8_CM0SM8mHJxnSRVUeKtH9lc","q":"7nRu_zHs4FBPNprudGcs7Jo7_9LGo1FJ7C92gXvJc8YoYGUBt_ON2piBSDC3OgJ49pN7QbsnDlz4ErcCfoQvdbns8U_nww06yzuP8Cc_tscru_Ex7MG6ZBOEpPbNTBsrVIGLErckZjaiYNaV_1OgnReUItM024OKg26P78TLZNs","qi":"oJ13PvBSMZM8Dhv5dprTXJ0EgtaUi6eFDnZkWzLPd2btphh1QN9BC-igyCBN8tjnQpndRf9MHxkpoWww34GxxFZzFhgoxDy98e5iYDZkPBX_LvteBMh-6bkR-ZbROEgZ700hoK9HRKveXYDRzyekwrJCotRLTwZFEDAzW3GrLW4"}
\ No newline at end of file
diff --git a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb.sql b/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb.sql
deleted file mode 100644
index 983d7cc76..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb.sql
+++ /dev/null
@@ -1,129 +0,0 @@
-IF OBJECT_ID(N'[__EFMigrationsHistory]') IS NULL
-BEGIN
- CREATE TABLE [__EFMigrationsHistory] (
- [MigrationId] nvarchar(150) NOT NULL,
- [ProductVersion] nvarchar(32) NOT NULL,
- CONSTRAINT [PK___EFMigrationsHistory] PRIMARY KEY ([MigrationId])
- );
-END;
-
-GO
-
-CREATE TABLE [AspNetRoles] (
- [Id] nvarchar(450) NOT NULL,
- [Name] nvarchar(256) NULL,
- [NormalizedName] nvarchar(256) NULL,
- [ConcurrencyStamp] nvarchar(max) NULL,
- CONSTRAINT [PK_AspNetRoles] PRIMARY KEY ([Id])
-);
-
-GO
-
-CREATE TABLE [AspNetUsers] (
- [Id] nvarchar(450) NOT NULL,
- [UserName] nvarchar(256) NULL,
- [NormalizedUserName] nvarchar(256) NULL,
- [Email] nvarchar(256) NULL,
- [NormalizedEmail] nvarchar(256) NULL,
- [EmailConfirmed] bit NOT NULL,
- [PasswordHash] nvarchar(max) NULL,
- [SecurityStamp] nvarchar(max) NULL,
- [ConcurrencyStamp] nvarchar(max) NULL,
- [PhoneNumber] nvarchar(max) NULL,
- [PhoneNumberConfirmed] bit NOT NULL,
- [TwoFactorEnabled] bit NOT NULL,
- [LockoutEnd] datetimeoffset NULL,
- [LockoutEnabled] bit NOT NULL,
- [AccessFailedCount] int NOT NULL,
- CONSTRAINT [PK_AspNetUsers] PRIMARY KEY ([Id])
-);
-
-GO
-
-CREATE TABLE [AspNetRoleClaims] (
- [Id] int NOT NULL IDENTITY,
- [RoleId] nvarchar(450) NOT NULL,
- [ClaimType] nvarchar(max) NULL,
- [ClaimValue] nvarchar(max) NULL,
- CONSTRAINT [PK_AspNetRoleClaims] PRIMARY KEY ([Id]),
- CONSTRAINT [FK_AspNetRoleClaims_AspNetRoles_RoleId] FOREIGN KEY ([RoleId]) REFERENCES [AspNetRoles] ([Id]) ON DELETE CASCADE
-);
-
-GO
-
-CREATE TABLE [AspNetUserClaims] (
- [Id] int NOT NULL IDENTITY,
- [UserId] nvarchar(450) NOT NULL,
- [ClaimType] nvarchar(max) NULL,
- [ClaimValue] nvarchar(max) NULL,
- CONSTRAINT [PK_AspNetUserClaims] PRIMARY KEY ([Id]),
- CONSTRAINT [FK_AspNetUserClaims_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
-);
-
-GO
-
-CREATE TABLE [AspNetUserLogins] (
- [LoginProvider] nvarchar(450) NOT NULL,
- [ProviderKey] nvarchar(450) NOT NULL,
- [ProviderDisplayName] nvarchar(max) NULL,
- [UserId] nvarchar(450) NOT NULL,
- CONSTRAINT [PK_AspNetUserLogins] PRIMARY KEY ([LoginProvider], [ProviderKey]),
- CONSTRAINT [FK_AspNetUserLogins_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
-);
-
-GO
-
-CREATE TABLE [AspNetUserRoles] (
- [UserId] nvarchar(450) NOT NULL,
- [RoleId] nvarchar(450) NOT NULL,
- CONSTRAINT [PK_AspNetUserRoles] PRIMARY KEY ([UserId], [RoleId]),
- CONSTRAINT [FK_AspNetUserRoles_AspNetRoles_RoleId] FOREIGN KEY ([RoleId]) REFERENCES [AspNetRoles] ([Id]) ON DELETE CASCADE,
- CONSTRAINT [FK_AspNetUserRoles_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
-);
-
-GO
-
-CREATE TABLE [AspNetUserTokens] (
- [UserId] nvarchar(450) NOT NULL,
- [LoginProvider] nvarchar(450) NOT NULL,
- [Name] nvarchar(450) NOT NULL,
- [Value] nvarchar(max) NULL,
- CONSTRAINT [PK_AspNetUserTokens] PRIMARY KEY ([UserId], [LoginProvider], [Name]),
- CONSTRAINT [FK_AspNetUserTokens_AspNetUsers_UserId] FOREIGN KEY ([UserId]) REFERENCES [AspNetUsers] ([Id]) ON DELETE CASCADE
-);
-
-GO
-
-CREATE INDEX [IX_AspNetRoleClaims_RoleId] ON [AspNetRoleClaims] ([RoleId]);
-
-GO
-
-CREATE UNIQUE INDEX [RoleNameIndex] ON [AspNetRoles] ([NormalizedName]) WHERE [NormalizedName] IS NOT NULL;
-
-GO
-
-CREATE INDEX [IX_AspNetUserClaims_UserId] ON [AspNetUserClaims] ([UserId]);
-
-GO
-
-CREATE INDEX [IX_AspNetUserLogins_UserId] ON [AspNetUserLogins] ([UserId]);
-
-GO
-
-CREATE INDEX [IX_AspNetUserRoles_RoleId] ON [AspNetUserRoles] ([RoleId]);
-
-GO
-
-CREATE INDEX [EmailIndex] ON [AspNetUsers] ([NormalizedEmail]);
-
-GO
-
-CREATE UNIQUE INDEX [UserNameIndex] ON [AspNetUsers] ([NormalizedUserName]) WHERE [NormalizedUserName] IS NOT NULL;
-
-GO
-
-INSERT INTO [__EFMigrationsHistory] ([MigrationId], [ProductVersion])
-VALUES (N'20201012145524_Users', N'3.1.0');
-
-GO
-
diff --git a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.Designer.cs b/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.Designer.cs
deleted file mode 100644
index c95fca838..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.Designer.cs
+++ /dev/null
@@ -1,273 +0,0 @@
-//
-using System;
-using IdentityServerHost.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Migrations;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace SqlServer.Migrations.UsersDb
-{
- [DbContext(typeof(ApplicationDbContext))]
- [Migration("20201012145524_Users")]
- partial class Users
- {
- protected override void BuildTargetModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.0")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("IdentityServerHost.Models.ApplicationUser", b =>
- {
- b.Property("Id")
- .HasColumnType("nvarchar(450)");
-
- b.Property("AccessFailedCount")
- .HasColumnType("int");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Email")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("EmailConfirmed")
- .HasColumnType("bit");
-
- b.Property("LockoutEnabled")
- .HasColumnType("bit");
-
- b.Property("LockoutEnd")
- .HasColumnType("datetimeoffset");
-
- b.Property("NormalizedEmail")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("NormalizedUserName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("PasswordHash")
- .HasColumnType("nvarchar(max)");
-
- b.Property("PhoneNumber")
- .HasColumnType("nvarchar(max)");
-
- b.Property("PhoneNumberConfirmed")
- .HasColumnType("bit");
-
- b.Property("SecurityStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("TwoFactorEnabled")
- .HasColumnType("bit");
-
- b.Property("UserName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedEmail")
- .HasName("EmailIndex");
-
- b.HasIndex("NormalizedUserName")
- .IsUnique()
- .HasName("UserNameIndex")
- .HasFilter("[NormalizedUserName] IS NOT NULL");
-
- b.ToTable("AspNetUsers");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
- {
- b.Property("Id")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Name")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("NormalizedName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedName")
- .IsUnique()
- .HasName("RoleNameIndex")
- .HasFilter("[NormalizedName] IS NOT NULL");
-
- b.ToTable("AspNetRoles");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("ClaimType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ClaimValue")
- .HasColumnType("nvarchar(max)");
-
- b.Property("RoleId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("Id");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AspNetRoleClaims");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("ClaimType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ClaimValue")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("AspNetUserClaims");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.Property("LoginProvider")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ProviderKey")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ProviderDisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("LoginProvider", "ProviderKey");
-
- b.HasIndex("UserId");
-
- b.ToTable("AspNetUserLogins");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
- {
- b.Property("UserId")
- .HasColumnType("nvarchar(450)");
-
- b.Property("RoleId")
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("UserId", "RoleId");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AspNetUserRoles");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.Property("UserId")
- .HasColumnType("nvarchar(450)");
-
- b.Property("LoginProvider")
- .HasColumnType("nvarchar(450)");
-
- b.Property("Name")
- .HasColumnType("nvarchar(450)");
-
- b.Property("Value")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("UserId", "LoginProvider", "Name");
-
- b.ToTable("AspNetUserTokens");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
- {
- b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.cs b/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.cs
deleted file mode 100644
index 86a4ccc12..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/20201012145524_Users.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace SqlServer.Migrations.UsersDb
-{
- public partial class Users : Migration
- {
- protected override void Up(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.CreateTable(
- name: "AspNetRoles",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- Name = table.Column(maxLength: 256, nullable: true),
- NormalizedName = table.Column(maxLength: 256, nullable: true),
- ConcurrencyStamp = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetRoles", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetUsers",
- columns: table => new
- {
- Id = table.Column(nullable: false),
- UserName = table.Column(maxLength: 256, nullable: true),
- NormalizedUserName = table.Column(maxLength: 256, nullable: true),
- Email = table.Column(maxLength: 256, nullable: true),
- NormalizedEmail = table.Column(maxLength: 256, nullable: true),
- EmailConfirmed = table.Column(nullable: false),
- PasswordHash = table.Column(nullable: true),
- SecurityStamp = table.Column(nullable: true),
- ConcurrencyStamp = table.Column(nullable: true),
- PhoneNumber = table.Column(nullable: true),
- PhoneNumberConfirmed = table.Column(nullable: false),
- TwoFactorEnabled = table.Column(nullable: false),
- LockoutEnd = table.Column(nullable: true),
- LockoutEnabled = table.Column(nullable: false),
- AccessFailedCount = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetUsers", x => x.Id);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetRoleClaims",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- RoleId = table.Column(nullable: false),
- ClaimType = table.Column(nullable: true),
- ClaimValue = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
- table.ForeignKey(
- name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
- column: x => x.RoleId,
- principalTable: "AspNetRoles",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetUserClaims",
- columns: table => new
- {
- Id = table.Column(nullable: false)
- .Annotation("SqlServer:Identity", "1, 1"),
- UserId = table.Column(nullable: false),
- ClaimType = table.Column(nullable: true),
- ClaimValue = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
- table.ForeignKey(
- name: "FK_AspNetUserClaims_AspNetUsers_UserId",
- column: x => x.UserId,
- principalTable: "AspNetUsers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetUserLogins",
- columns: table => new
- {
- LoginProvider = table.Column(nullable: false),
- ProviderKey = table.Column(nullable: false),
- ProviderDisplayName = table.Column(nullable: true),
- UserId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
- table.ForeignKey(
- name: "FK_AspNetUserLogins_AspNetUsers_UserId",
- column: x => x.UserId,
- principalTable: "AspNetUsers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetUserRoles",
- columns: table => new
- {
- UserId = table.Column(nullable: false),
- RoleId = table.Column(nullable: false)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
- table.ForeignKey(
- name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
- column: x => x.RoleId,
- principalTable: "AspNetRoles",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- table.ForeignKey(
- name: "FK_AspNetUserRoles_AspNetUsers_UserId",
- column: x => x.UserId,
- principalTable: "AspNetUsers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateTable(
- name: "AspNetUserTokens",
- columns: table => new
- {
- UserId = table.Column(nullable: false),
- LoginProvider = table.Column(nullable: false),
- Name = table.Column(nullable: false),
- Value = table.Column(nullable: true)
- },
- constraints: table =>
- {
- table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
- table.ForeignKey(
- name: "FK_AspNetUserTokens_AspNetUsers_UserId",
- column: x => x.UserId,
- principalTable: "AspNetUsers",
- principalColumn: "Id",
- onDelete: ReferentialAction.Cascade);
- });
-
- migrationBuilder.CreateIndex(
- name: "IX_AspNetRoleClaims_RoleId",
- table: "AspNetRoleClaims",
- column: "RoleId");
-
- migrationBuilder.CreateIndex(
- name: "RoleNameIndex",
- table: "AspNetRoles",
- column: "NormalizedName",
- unique: true,
- filter: "[NormalizedName] IS NOT NULL");
-
- migrationBuilder.CreateIndex(
- name: "IX_AspNetUserClaims_UserId",
- table: "AspNetUserClaims",
- column: "UserId");
-
- migrationBuilder.CreateIndex(
- name: "IX_AspNetUserLogins_UserId",
- table: "AspNetUserLogins",
- column: "UserId");
-
- migrationBuilder.CreateIndex(
- name: "IX_AspNetUserRoles_RoleId",
- table: "AspNetUserRoles",
- column: "RoleId");
-
- migrationBuilder.CreateIndex(
- name: "EmailIndex",
- table: "AspNetUsers",
- column: "NormalizedEmail");
-
- migrationBuilder.CreateIndex(
- name: "UserNameIndex",
- table: "AspNetUsers",
- column: "NormalizedUserName",
- unique: true,
- filter: "[NormalizedUserName] IS NOT NULL");
- }
-
- protected override void Down(MigrationBuilder migrationBuilder)
- {
- migrationBuilder.DropTable(
- name: "AspNetRoleClaims");
-
- migrationBuilder.DropTable(
- name: "AspNetUserClaims");
-
- migrationBuilder.DropTable(
- name: "AspNetUserLogins");
-
- migrationBuilder.DropTable(
- name: "AspNetUserRoles");
-
- migrationBuilder.DropTable(
- name: "AspNetUserTokens");
-
- migrationBuilder.DropTable(
- name: "AspNetRoles");
-
- migrationBuilder.DropTable(
- name: "AspNetUsers");
- }
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/ApplicationDbContextModelSnapshot.cs b/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/ApplicationDbContextModelSnapshot.cs
deleted file mode 100644
index 6238fd08f..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Migrations/UsersDb/ApplicationDbContextModelSnapshot.cs
+++ /dev/null
@@ -1,271 +0,0 @@
-//
-using System;
-using IdentityServerHost.Data;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
-
-namespace SqlServer.Migrations.UsersDb
-{
- [DbContext(typeof(ApplicationDbContext))]
- partial class ApplicationDbContextModelSnapshot : ModelSnapshot
- {
- protected override void BuildModel(ModelBuilder modelBuilder)
- {
-#pragma warning disable 612, 618
- modelBuilder
- .HasAnnotation("ProductVersion", "3.1.0")
- .HasAnnotation("Relational:MaxIdentifierLength", 128)
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- modelBuilder.Entity("IdentityServerHost.Models.ApplicationUser", b =>
- {
- b.Property("Id")
- .HasColumnType("nvarchar(450)");
-
- b.Property("AccessFailedCount")
- .HasColumnType("int");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Email")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("EmailConfirmed")
- .HasColumnType("bit");
-
- b.Property("LockoutEnabled")
- .HasColumnType("bit");
-
- b.Property("LockoutEnd")
- .HasColumnType("datetimeoffset");
-
- b.Property("NormalizedEmail")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("NormalizedUserName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("PasswordHash")
- .HasColumnType("nvarchar(max)");
-
- b.Property("PhoneNumber")
- .HasColumnType("nvarchar(max)");
-
- b.Property("PhoneNumberConfirmed")
- .HasColumnType("bit");
-
- b.Property("SecurityStamp")
- .HasColumnType("nvarchar(max)");
-
- b.Property("TwoFactorEnabled")
- .HasColumnType("bit");
-
- b.Property("UserName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedEmail")
- .HasName("EmailIndex");
-
- b.HasIndex("NormalizedUserName")
- .IsUnique()
- .HasName("UserNameIndex")
- .HasFilter("[NormalizedUserName] IS NOT NULL");
-
- b.ToTable("AspNetUsers");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
- {
- b.Property("Id")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ConcurrencyStamp")
- .IsConcurrencyToken()
- .HasColumnType("nvarchar(max)");
-
- b.Property("Name")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.Property("NormalizedName")
- .HasColumnType("nvarchar(256)")
- .HasMaxLength(256);
-
- b.HasKey("Id");
-
- b.HasIndex("NormalizedName")
- .IsUnique()
- .HasName("RoleNameIndex")
- .HasFilter("[NormalizedName] IS NOT NULL");
-
- b.ToTable("AspNetRoles");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("ClaimType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ClaimValue")
- .HasColumnType("nvarchar(max)");
-
- b.Property("RoleId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("Id");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AspNetRoleClaims");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.Property("Id")
- .ValueGeneratedOnAdd()
- .HasColumnType("int")
- .HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
-
- b.Property("ClaimType")
- .HasColumnType("nvarchar(max)");
-
- b.Property("ClaimValue")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("Id");
-
- b.HasIndex("UserId");
-
- b.ToTable("AspNetUserClaims");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.Property("LoginProvider")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ProviderKey")
- .HasColumnType("nvarchar(450)");
-
- b.Property("ProviderDisplayName")
- .HasColumnType("nvarchar(max)");
-
- b.Property("UserId")
- .IsRequired()
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("LoginProvider", "ProviderKey");
-
- b.HasIndex("UserId");
-
- b.ToTable("AspNetUserLogins");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
- {
- b.Property("UserId")
- .HasColumnType("nvarchar(450)");
-
- b.Property("RoleId")
- .HasColumnType("nvarchar(450)");
-
- b.HasKey("UserId", "RoleId");
-
- b.HasIndex("RoleId");
-
- b.ToTable("AspNetUserRoles");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.Property("UserId")
- .HasColumnType("nvarchar(450)");
-
- b.Property("LoginProvider")
- .HasColumnType("nvarchar(450)");
-
- b.Property("Name")
- .HasColumnType("nvarchar(450)");
-
- b.Property("Value")
- .HasColumnType("nvarchar(max)");
-
- b.HasKey("UserId", "LoginProvider", "Name");
-
- b.ToTable("AspNetUserTokens");
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
- {
- b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
- {
- b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
- .WithMany()
- .HasForeignKey("RoleId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
-
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-
- modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
- {
- b.HasOne("IdentityServerHost.Models.ApplicationUser", null)
- .WithMany()
- .HasForeignKey("UserId")
- .OnDelete(DeleteBehavior.Cascade)
- .IsRequired();
- });
-#pragma warning restore 612, 618
- }
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/Program.cs b/src/AspNetIdentity/migrations/SqlServer/Program.cs
deleted file mode 100644
index 16246e6ae..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Program.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using IdentityServerHost;
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-
-namespace SqlServer
-{
- class Program
- {
- public static void Main(string[] args)
- {
- var host = BuildWebHost(args);
- SeedData.EnsureSeedData(host.Services);
- }
-
- public static IWebHost BuildWebHost(string[] args) =>
- WebHost.CreateDefaultBuilder(args)
- .UseStartup()
- .Build();
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/SeedData.cs b/src/AspNetIdentity/migrations/SqlServer/SeedData.cs
deleted file mode 100644
index a111c89e0..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/SeedData.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using System;
-using System.Linq;
-using System.Security.Claims;
-using IdentityServerHost.Data;
-using IdentityModel;
-using Microsoft.AspNetCore.Identity;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using IdentityServerHost.Models;
-
-namespace IdentityServerHost
-{
- public class SeedData
- {
- public static void EnsureSeedData(IServiceProvider serviceProvider)
- {
- using (var scope = serviceProvider.GetRequiredService().CreateScope())
- {
- var context = scope.ServiceProvider.GetService();
- context.Database.Migrate();
-
- var userMgr = scope.ServiceProvider.GetRequiredService>();
- var alice = userMgr.FindByNameAsync("alice").Result;
- if (alice == null)
- {
- alice = new ApplicationUser
- {
- UserName = "alice"
- };
- var result = userMgr.CreateAsync(alice, "Pass123$").Result;
- if (!result.Succeeded)
- {
- throw new Exception(result.Errors.First().Description);
- }
-
- result = userMgr.AddClaimsAsync(alice, new Claim[]{
- new Claim(JwtClaimTypes.Name, "Alice Smith"),
- new Claim(JwtClaimTypes.GivenName, "Alice"),
- new Claim(JwtClaimTypes.FamilyName, "Smith"),
- new Claim(JwtClaimTypes.Email, "AliceSmith@email.com"),
- new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean),
- new Claim(JwtClaimTypes.WebSite, "http://alice.com"),
- new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json)
- }).Result;
- if (!result.Succeeded)
- {
- throw new Exception(result.Errors.First().Description);
- }
- Console.WriteLine("alice created");
- }
- else
- {
- Console.WriteLine("alice already exists");
- }
-
- var bob = userMgr.FindByNameAsync("bob").Result;
- if (bob == null)
- {
- bob = new ApplicationUser
- {
- UserName = "bob"
- };
- var result = userMgr.CreateAsync(bob, "Pass123$").Result;
- if (!result.Succeeded)
- {
- throw new Exception(result.Errors.First().Description);
- }
-
- result = userMgr.AddClaimsAsync(bob, new Claim[]{
- new Claim(JwtClaimTypes.Name, "Bob Smith"),
- new Claim(JwtClaimTypes.GivenName, "Bob"),
- new Claim(JwtClaimTypes.FamilyName, "Smith"),
- new Claim(JwtClaimTypes.Email, "BobSmith@email.com"),
- new Claim(JwtClaimTypes.EmailVerified, "true", ClaimValueTypes.Boolean),
- new Claim(JwtClaimTypes.WebSite, "http://bob.com"),
- new Claim(JwtClaimTypes.Address, @"{ 'street_address': 'One Hacker Way', 'locality': 'Heidelberg', 'postal_code': 69118, 'country': 'Germany' }", Duende.IdentityServer.IdentityServerConstants.ClaimValueTypes.Json),
- new Claim("location", "somewhere")
- }).Result;
- if (!result.Succeeded)
- {
- throw new Exception(result.Errors.First().Description);
- }
- Console.WriteLine("bob created");
- }
- else
- {
- Console.WriteLine("bob already exists");
- }
- }
- }
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj b/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj
deleted file mode 100644
index 49389f4d3..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/SqlServer.csproj
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/AspNetIdentity/migrations/SqlServer/Startup.cs b/src/AspNetIdentity/migrations/SqlServer/Startup.cs
deleted file mode 100644
index 37d6f2fc3..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/Startup.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Configuration;
-using Microsoft.EntityFrameworkCore;
-using IdentityServerHost.Data;
-using Microsoft.AspNetCore.Identity;
-using IdentityServerHost.Models;
-
-namespace SqlServer
-{
- public class Startup
- {
- public IConfiguration Configuration { get; }
-
- public Startup(IConfiguration config)
- {
- Configuration = config;
- }
-
- public void ConfigureServices(IServiceCollection services)
- {
- var cn = Configuration.GetConnectionString("db");
- services.AddDbContext(options =>
- {
- options.UseSqlServer(cn, dbOpts => dbOpts.MigrationsAssembly(typeof(Startup).Assembly.FullName));
- });
-
- services.AddIdentity()
- .AddEntityFrameworkStores()
- .AddDefaultTokenProviders();
- }
-
- public void Configure(IApplicationBuilder app)
- {
- }
- }
-}
diff --git a/src/AspNetIdentity/migrations/SqlServer/appsettings.json b/src/AspNetIdentity/migrations/SqlServer/appsettings.json
deleted file mode 100644
index 7b3cba602..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/appsettings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "ConnectionStrings": {
- "db": "server=(localdb)\\mssqllocaldb;database=Duende.AspNetIdentity-5.0.0;trusted_connection=yes;"
- }
-}
\ No newline at end of file
diff --git a/src/AspNetIdentity/migrations/SqlServer/builddb.bat b/src/AspNetIdentity/migrations/SqlServer/builddb.bat
deleted file mode 100644
index 1115106a2..000000000
--- a/src/AspNetIdentity/migrations/SqlServer/builddb.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-rmdir /S /Q Migrations
-
-dotnet ef database drop
-
-dotnet ef migrations add Users -o Migrations/UsersDb
-dotnet ef migrations script -o Migrations/UsersDb.sql
-
-dotnet ef database update
diff --git a/src/EntityFramework.Storage/src/Configuration/ServiceCollectionExtensions.cs b/src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Configuration/ServiceCollectionExtensions.cs
rename to src/EntityFramework.Storage/Configuration/ServiceCollectionExtensions.cs
diff --git a/src/EntityFramework.Storage/src/DbContexts/ConfigurationDbContext.cs b/src/EntityFramework.Storage/DbContexts/ConfigurationDbContext.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/DbContexts/ConfigurationDbContext.cs
rename to src/EntityFramework.Storage/DbContexts/ConfigurationDbContext.cs
diff --git a/src/EntityFramework.Storage/src/DbContexts/PersistedGrantDbContext.cs b/src/EntityFramework.Storage/DbContexts/PersistedGrantDbContext.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/DbContexts/PersistedGrantDbContext.cs
rename to src/EntityFramework.Storage/DbContexts/PersistedGrantDbContext.cs
diff --git a/src/EntityFramework.Storage/src/Duende.IdentityServer.EntityFramework.Storage.csproj b/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj
similarity index 77%
rename from src/EntityFramework.Storage/src/Duende.IdentityServer.EntityFramework.Storage.csproj
rename to src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj
index 1cd4abe65..0f61a77cb 100644
--- a/src/EntityFramework.Storage/src/Duende.IdentityServer.EntityFramework.Storage.csproj
+++ b/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.csproj
@@ -8,12 +8,12 @@
-
-
-
-
+
+
+
+
diff --git a/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.sln b/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.sln
deleted file mode 100644
index cbbf0e0c0..000000000
--- a/src/EntityFramework.Storage/Duende.IdentityServer.EntityFramework.Storage.sln
+++ /dev/null
@@ -1,108 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30204.135
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{AF5DAC33-08AC-45EE-9772-4FF39FB09E57}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.EntityFramework.Storage", "src\Duende.IdentityServer.EntityFramework.Storage.csproj", "{5302DAB3-1662-4956-97AA-5EA5E85B10F6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{712ED94A-F982-4667-A9CE-E8F21900BBED}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "test\IntegrationTests\IntegrationTests.csproj", "{E90F7470-C7F8-464B-9C28-87C474085812}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "migrations", "migrations", "{E3EF31E0-6658-4899-8BDA-FF84355E2FDD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServer", "migrations\SqlServer\SqlServer.csproj", "{A93A59EC-D75D-44E1-9720-F75D9EF95BC3}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "host", "host", "{07C56E10-A807-4372-ACD9-ADED2D099BC8}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleHost", "host\ConsoleHost\ConsoleHost.csproj", "{2AA5AC6B-531B-426E-AD38-5B03F1949CF5}"
-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
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|x64.ActiveCfg = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|x64.Build.0 = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|x86.ActiveCfg = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Debug|x86.Build.0 = Debug|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|Any CPU.Build.0 = Release|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|x64.ActiveCfg = Release|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|x64.Build.0 = Release|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|x86.ActiveCfg = Release|Any CPU
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6}.Release|x86.Build.0 = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|x64.ActiveCfg = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|x64.Build.0 = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|x86.ActiveCfg = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Debug|x86.Build.0 = Debug|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|Any CPU.Build.0 = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|x64.ActiveCfg = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|x64.Build.0 = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|x86.ActiveCfg = Release|Any CPU
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC}.Release|x86.Build.0 = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|x64.ActiveCfg = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|x64.Build.0 = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|x86.ActiveCfg = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Debug|x86.Build.0 = Debug|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|Any CPU.Build.0 = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|x64.ActiveCfg = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|x64.Build.0 = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|x86.ActiveCfg = Release|Any CPU
- {E90F7470-C7F8-464B-9C28-87C474085812}.Release|x86.Build.0 = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|x64.Build.0 = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Debug|x86.Build.0 = Debug|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|Any CPU.Build.0 = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|x64.ActiveCfg = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|x64.Build.0 = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|x86.ActiveCfg = Release|Any CPU
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3}.Release|x86.Build.0 = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|x64.ActiveCfg = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|x64.Build.0 = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|x86.ActiveCfg = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Debug|x86.Build.0 = Debug|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|Any CPU.Build.0 = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|x64.ActiveCfg = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|x64.Build.0 = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|x86.ActiveCfg = Release|Any CPU
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {5302DAB3-1662-4956-97AA-5EA5E85B10F6} = {AF5DAC33-08AC-45EE-9772-4FF39FB09E57}
- {8239FC82-46A3-4F21-8D05-1F0BE0B1B1FC} = {712ED94A-F982-4667-A9CE-E8F21900BBED}
- {E90F7470-C7F8-464B-9C28-87C474085812} = {712ED94A-F982-4667-A9CE-E8F21900BBED}
- {A93A59EC-D75D-44E1-9720-F75D9EF95BC3} = {E3EF31E0-6658-4899-8BDA-FF84355E2FDD}
- {2AA5AC6B-531B-426E-AD38-5B03F1949CF5} = {07C56E10-A807-4372-ACD9-ADED2D099BC8}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {4DB894E3-1BF2-4410-911A-14D32FD79A96}
- EndGlobalSection
-EndGlobal
diff --git a/src/EntityFramework.Storage/src/Entities/ApiResource.cs b/src/EntityFramework.Storage/Entities/ApiResource.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiResource.cs
rename to src/EntityFramework.Storage/Entities/ApiResource.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiResourceClaim.cs b/src/EntityFramework.Storage/Entities/ApiResourceClaim.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiResourceClaim.cs
rename to src/EntityFramework.Storage/Entities/ApiResourceClaim.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiResourceProperty.cs b/src/EntityFramework.Storage/Entities/ApiResourceProperty.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiResourceProperty.cs
rename to src/EntityFramework.Storage/Entities/ApiResourceProperty.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiResourceScope.cs b/src/EntityFramework.Storage/Entities/ApiResourceScope.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiResourceScope.cs
rename to src/EntityFramework.Storage/Entities/ApiResourceScope.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiResourceSecret.cs b/src/EntityFramework.Storage/Entities/ApiResourceSecret.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiResourceSecret.cs
rename to src/EntityFramework.Storage/Entities/ApiResourceSecret.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiScope.cs b/src/EntityFramework.Storage/Entities/ApiScope.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiScope.cs
rename to src/EntityFramework.Storage/Entities/ApiScope.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiScopeClaim.cs b/src/EntityFramework.Storage/Entities/ApiScopeClaim.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiScopeClaim.cs
rename to src/EntityFramework.Storage/Entities/ApiScopeClaim.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ApiScopeProperty.cs b/src/EntityFramework.Storage/Entities/ApiScopeProperty.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ApiScopeProperty.cs
rename to src/EntityFramework.Storage/Entities/ApiScopeProperty.cs
diff --git a/src/EntityFramework.Storage/src/Entities/Client.cs b/src/EntityFramework.Storage/Entities/Client.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/Client.cs
rename to src/EntityFramework.Storage/Entities/Client.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientClaim.cs b/src/EntityFramework.Storage/Entities/ClientClaim.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientClaim.cs
rename to src/EntityFramework.Storage/Entities/ClientClaim.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientCorsOrigin.cs b/src/EntityFramework.Storage/Entities/ClientCorsOrigin.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientCorsOrigin.cs
rename to src/EntityFramework.Storage/Entities/ClientCorsOrigin.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientGrantType.cs b/src/EntityFramework.Storage/Entities/ClientGrantType.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientGrantType.cs
rename to src/EntityFramework.Storage/Entities/ClientGrantType.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientIdPRestriction.cs b/src/EntityFramework.Storage/Entities/ClientIdPRestriction.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientIdPRestriction.cs
rename to src/EntityFramework.Storage/Entities/ClientIdPRestriction.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientPostLogoutRedirectUri.cs b/src/EntityFramework.Storage/Entities/ClientPostLogoutRedirectUri.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientPostLogoutRedirectUri.cs
rename to src/EntityFramework.Storage/Entities/ClientPostLogoutRedirectUri.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientProperty.cs b/src/EntityFramework.Storage/Entities/ClientProperty.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientProperty.cs
rename to src/EntityFramework.Storage/Entities/ClientProperty.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientRedirectUri.cs b/src/EntityFramework.Storage/Entities/ClientRedirectUri.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientRedirectUri.cs
rename to src/EntityFramework.Storage/Entities/ClientRedirectUri.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientScope.cs b/src/EntityFramework.Storage/Entities/ClientScope.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientScope.cs
rename to src/EntityFramework.Storage/Entities/ClientScope.cs
diff --git a/src/EntityFramework.Storage/src/Entities/ClientSecret.cs b/src/EntityFramework.Storage/Entities/ClientSecret.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/ClientSecret.cs
rename to src/EntityFramework.Storage/Entities/ClientSecret.cs
diff --git a/src/EntityFramework.Storage/src/Entities/DeviceFlowCodes.cs b/src/EntityFramework.Storage/Entities/DeviceFlowCodes.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/DeviceFlowCodes.cs
rename to src/EntityFramework.Storage/Entities/DeviceFlowCodes.cs
diff --git a/src/EntityFramework.Storage/src/Entities/IdentityResource.cs b/src/EntityFramework.Storage/Entities/IdentityResource.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/IdentityResource.cs
rename to src/EntityFramework.Storage/Entities/IdentityResource.cs
diff --git a/src/EntityFramework.Storage/src/Entities/IdentityResourceClaim.cs b/src/EntityFramework.Storage/Entities/IdentityResourceClaim.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/IdentityResourceClaim.cs
rename to src/EntityFramework.Storage/Entities/IdentityResourceClaim.cs
diff --git a/src/EntityFramework.Storage/src/Entities/IdentityResourceProperty.cs b/src/EntityFramework.Storage/Entities/IdentityResourceProperty.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/IdentityResourceProperty.cs
rename to src/EntityFramework.Storage/Entities/IdentityResourceProperty.cs
diff --git a/src/EntityFramework.Storage/src/Entities/Key.cs b/src/EntityFramework.Storage/Entities/Key.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/Key.cs
rename to src/EntityFramework.Storage/Entities/Key.cs
diff --git a/src/EntityFramework.Storage/src/Entities/PersistedGrant.cs b/src/EntityFramework.Storage/Entities/PersistedGrant.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/PersistedGrant.cs
rename to src/EntityFramework.Storage/Entities/PersistedGrant.cs
diff --git a/src/EntityFramework.Storage/src/Entities/Property.cs b/src/EntityFramework.Storage/Entities/Property.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/Property.cs
rename to src/EntityFramework.Storage/Entities/Property.cs
diff --git a/src/EntityFramework.Storage/src/Entities/Secret.cs b/src/EntityFramework.Storage/Entities/Secret.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/Secret.cs
rename to src/EntityFramework.Storage/Entities/Secret.cs
diff --git a/src/EntityFramework.Storage/src/Entities/UserClaim.cs b/src/EntityFramework.Storage/Entities/UserClaim.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Entities/UserClaim.cs
rename to src/EntityFramework.Storage/Entities/UserClaim.cs
diff --git a/src/EntityFramework.Storage/src/Extensions/ModelBuilderExtensions.cs b/src/EntityFramework.Storage/Extensions/ModelBuilderExtensions.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Extensions/ModelBuilderExtensions.cs
rename to src/EntityFramework.Storage/Extensions/ModelBuilderExtensions.cs
diff --git a/src/EntityFramework.Storage/src/Interfaces/IConfigurationDbContext.cs b/src/EntityFramework.Storage/Interfaces/IConfigurationDbContext.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Interfaces/IConfigurationDbContext.cs
rename to src/EntityFramework.Storage/Interfaces/IConfigurationDbContext.cs
diff --git a/src/EntityFramework.Storage/src/Interfaces/IPersistedGrantDbContext.cs b/src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Interfaces/IPersistedGrantDbContext.cs
rename to src/EntityFramework.Storage/Interfaces/IPersistedGrantDbContext.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/AllowedSigningAlgorithmsConverter.cs b/src/EntityFramework.Storage/Mappers/AllowedSigningAlgorithmsConverter.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/AllowedSigningAlgorithmsConverter.cs
rename to src/EntityFramework.Storage/Mappers/AllowedSigningAlgorithmsConverter.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ApiResourceMapperProfile.cs b/src/EntityFramework.Storage/Mappers/ApiResourceMapperProfile.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ApiResourceMapperProfile.cs
rename to src/EntityFramework.Storage/Mappers/ApiResourceMapperProfile.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ApiResourceMappers.cs b/src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ApiResourceMappers.cs
rename to src/EntityFramework.Storage/Mappers/ApiResourceMappers.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ClientMapperProfile.cs b/src/EntityFramework.Storage/Mappers/ClientMapperProfile.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ClientMapperProfile.cs
rename to src/EntityFramework.Storage/Mappers/ClientMapperProfile.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ClientMappers.cs b/src/EntityFramework.Storage/Mappers/ClientMappers.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ClientMappers.cs
rename to src/EntityFramework.Storage/Mappers/ClientMappers.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/IdentityResourceMapperProfile.cs b/src/EntityFramework.Storage/Mappers/IdentityResourceMapperProfile.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/IdentityResourceMapperProfile.cs
rename to src/EntityFramework.Storage/Mappers/IdentityResourceMapperProfile.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/IdentityResourceMappers.cs b/src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/IdentityResourceMappers.cs
rename to src/EntityFramework.Storage/Mappers/IdentityResourceMappers.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/PersistedGrantMapperProfile.cs b/src/EntityFramework.Storage/Mappers/PersistedGrantMapperProfile.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/PersistedGrantMapperProfile.cs
rename to src/EntityFramework.Storage/Mappers/PersistedGrantMapperProfile.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/PersistedGrantMappers.cs b/src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/PersistedGrantMappers.cs
rename to src/EntityFramework.Storage/Mappers/PersistedGrantMappers.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ScopeMapperProfile.cs b/src/EntityFramework.Storage/Mappers/ScopeMapperProfile.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ScopeMapperProfile.cs
rename to src/EntityFramework.Storage/Mappers/ScopeMapperProfile.cs
diff --git a/src/EntityFramework.Storage/src/Mappers/ScopeMappers.cs b/src/EntityFramework.Storage/Mappers/ScopeMappers.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Mappers/ScopeMappers.cs
rename to src/EntityFramework.Storage/Mappers/ScopeMappers.cs
diff --git a/src/EntityFramework.Storage/src/Options/ConfigurationStoreOptions.cs b/src/EntityFramework.Storage/Options/ConfigurationStoreOptions.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Options/ConfigurationStoreOptions.cs
rename to src/EntityFramework.Storage/Options/ConfigurationStoreOptions.cs
diff --git a/src/EntityFramework.Storage/src/Options/OperationalStoreOptions.cs b/src/EntityFramework.Storage/Options/OperationalStoreOptions.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Options/OperationalStoreOptions.cs
rename to src/EntityFramework.Storage/Options/OperationalStoreOptions.cs
diff --git a/src/EntityFramework.Storage/src/Options/TableConfiguration.cs b/src/EntityFramework.Storage/Options/TableConfiguration.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Options/TableConfiguration.cs
rename to src/EntityFramework.Storage/Options/TableConfiguration.cs
diff --git a/src/EntityFramework.Storage/src/Properties/AssemblyInfo.cs b/src/EntityFramework.Storage/Properties/AssemblyInfo.cs
similarity index 52%
rename from src/EntityFramework.Storage/src/Properties/AssemblyInfo.cs
rename to src/EntityFramework.Storage/Properties/AssemblyInfo.cs
index f7a7b202e..addf6a27e 100644
--- a/src/EntityFramework.Storage/src/Properties/AssemblyInfo.cs
+++ b/src/EntityFramework.Storage/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("UnitTests")]
-[assembly: InternalsVisibleTo("IntegrationTests")]
+[assembly: InternalsVisibleTo("EntityFramework.Storage.IntegrationTests")]
+[assembly: InternalsVisibleTo("EntityFramework.Storage.UnitTests")]
diff --git a/src/EntityFramework.Storage/src/Stores/ClientStore.cs b/src/EntityFramework.Storage/Stores/ClientStore.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Stores/ClientStore.cs
rename to src/EntityFramework.Storage/Stores/ClientStore.cs
diff --git a/src/EntityFramework.Storage/src/Stores/DeviceFlowStore.cs b/src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Stores/DeviceFlowStore.cs
rename to src/EntityFramework.Storage/Stores/DeviceFlowStore.cs
diff --git a/src/EntityFramework.Storage/src/Stores/PersistedGrantStore.cs b/src/EntityFramework.Storage/Stores/PersistedGrantStore.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Stores/PersistedGrantStore.cs
rename to src/EntityFramework.Storage/Stores/PersistedGrantStore.cs
diff --git a/src/EntityFramework.Storage/src/Stores/ResourceStore.cs b/src/EntityFramework.Storage/Stores/ResourceStore.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Stores/ResourceStore.cs
rename to src/EntityFramework.Storage/Stores/ResourceStore.cs
diff --git a/src/EntityFramework.Storage/src/Stores/SigningKeyStore.cs b/src/EntityFramework.Storage/Stores/SigningKeyStore.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/Stores/SigningKeyStore.cs
rename to src/EntityFramework.Storage/Stores/SigningKeyStore.cs
diff --git a/src/EntityFramework.Storage/src/TokenCleanup/IOperationalStoreNotification.cs b/src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/TokenCleanup/IOperationalStoreNotification.cs
rename to src/EntityFramework.Storage/TokenCleanup/IOperationalStoreNotification.cs
diff --git a/src/EntityFramework.Storage/src/TokenCleanup/TokenCleanupService.cs b/src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs
similarity index 100%
rename from src/EntityFramework.Storage/src/TokenCleanup/TokenCleanupService.cs
rename to src/EntityFramework.Storage/TokenCleanup/TokenCleanupService.cs
diff --git a/src/EntityFramework.Storage/build.cmd b/src/EntityFramework.Storage/build.cmd
deleted file mode 100644
index e4cf78f4a..000000000
--- a/src/EntityFramework.Storage/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-dotnet run --project build -- %*
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/build.ps1 b/src/EntityFramework.Storage/build.ps1
deleted file mode 100644
index 8c950bdae..000000000
--- a/src/EntityFramework.Storage/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-$ErrorActionPreference = "Stop";
-dotnet run --project build -- $args
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/build.sh b/src/EntityFramework.Storage/build.sh
deleted file mode 100755
index bb8ef5b20..000000000
--- a/src/EntityFramework.Storage/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-dotnet run --project build -- "$@"
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/build/Program.cs b/src/EntityFramework.Storage/build/Program.cs
deleted file mode 100644
index 2900cf309..000000000
--- a/src/EntityFramework.Storage/build/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace build
-{
- partial class Program
- {
- private const string Prefix = "EntityFramework.Storage";
- }
-}
diff --git a/src/EntityFramework.Storage/build/build.csproj b/src/EntityFramework.Storage/build/build.csproj
deleted file mode 100644
index 43c81aaed..000000000
--- a/src/EntityFramework.Storage/build/build.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj b/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj
deleted file mode 100644
index a8cac0ece..000000000
--- a/src/EntityFramework.Storage/host/ConsoleHost/ConsoleHost.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EntityFramework.Storage/host/ConsoleHost/Program.cs b/src/EntityFramework.Storage/host/ConsoleHost/Program.cs
deleted file mode 100644
index 633f0eb45..000000000
--- a/src/EntityFramework.Storage/host/ConsoleHost/Program.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using Duende.IdentityServer.EntityFramework;
-using Duende.IdentityServer.EntityFramework.Storage;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace ConsoleHost
-{
- class Program
- {
- static void Main(string[] args)
- {
- var connectionString = "server=(localdb)\\mssqllocaldb;database=Duende.EntityFramework-5.0.0;trusted_connection=yes;";
-
- var services = new ServiceCollection();
- services.AddLogging(b => b.AddConsole().SetMinimumLevel(LogLevel.Trace));
- services.AddOperationalDbContext(options =>
- {
- options.ConfigureDbContext = builder => builder.UseSqlServer(connectionString);
-
- // this enables automatic token cleanup. this is optional.
- options.EnableTokenCleanup = false;
- options.TokenCleanupInterval = 5; // interval in seconds, short for testing
- });
-
- var sp = services.BuildServiceProvider();
- using (var scope = sp.CreateScope())
- {
- var svc = scope.ServiceProvider.GetRequiredService();
- svc.RemoveExpiredGrantsAsync().GetAwaiter().GetResult();
- }
- }
- }
-}
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/Properties/launchSettings.json b/src/EntityFramework.Storage/migrations/SqlServer/Properties/launchSettings.json
deleted file mode 100644
index e20360b91..000000000
--- a/src/EntityFramework.Storage/migrations/SqlServer/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:7603/",
- "sslPort": 0
- }
- },
- "profiles": {
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "SqlServer": {
- "commandName": "Project",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "applicationUrl": "http://localhost:7604/"
- }
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj
deleted file mode 100644
index 244fe7a90..000000000
--- a/src/EntityFramework.Storage/migrations/SqlServer/SqlServer.csproj
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/EntityFramework/src/Duende.IdentityServer.EntityFramework.csproj b/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj
similarity index 67%
rename from src/EntityFramework/src/Duende.IdentityServer.EntityFramework.csproj
rename to src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj
index 51c359ed5..bc002bf9c 100644
--- a/src/EntityFramework/src/Duende.IdentityServer.EntityFramework.csproj
+++ b/src/EntityFramework/Duende.IdentityServer.EntityFramework.csproj
@@ -10,9 +10,7 @@
-
-
-
-
+
+
\ No newline at end of file
diff --git a/src/EntityFramework/Duende.IdentityServer.EntityFramework.sln b/src/EntityFramework/Duende.IdentityServer.EntityFramework.sln
deleted file mode 100644
index e551bb32e..000000000
--- a/src/EntityFramework/Duende.IdentityServer.EntityFramework.sln
+++ /dev/null
@@ -1,55 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29230.61
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8BFDA83B-FD73-4776-9C2C-5F7FFE440C1F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.EntityFramework", "src\Duende.IdentityServer.EntityFramework.csproj", "{AB83F911-8B78-4973-A3A9-2A2D85581F25}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host", "host\Host.csproj", "{9E9EE58E-4B98-4495-8E8B-00281B3EABDA}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "seeding", "seeding", "{26921EED-9592-4174-94D6-8A0F604029F1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SqlServer", "migrations\SqlServer\SqlServer.csproj", "{D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19FEB622-0912-4F5E-840F-827B4B9EF026}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "test\Tests\Tests.csproj", "{E3685B06-F135-4318-B841-889C35479D5C}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {AB83F911-8B78-4973-A3A9-2A2D85581F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AB83F911-8B78-4973-A3A9-2A2D85581F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AB83F911-8B78-4973-A3A9-2A2D85581F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AB83F911-8B78-4973-A3A9-2A2D85581F25}.Release|Any CPU.Build.0 = Release|Any CPU
- {9E9EE58E-4B98-4495-8E8B-00281B3EABDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {9E9EE58E-4B98-4495-8E8B-00281B3EABDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {9E9EE58E-4B98-4495-8E8B-00281B3EABDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9E9EE58E-4B98-4495-8E8B-00281B3EABDA}.Release|Any CPU.Build.0 = Release|Any CPU
- {D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69}.Release|Any CPU.Build.0 = Release|Any CPU
- {E3685B06-F135-4318-B841-889C35479D5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E3685B06-F135-4318-B841-889C35479D5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E3685B06-F135-4318-B841-889C35479D5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E3685B06-F135-4318-B841-889C35479D5C}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {AB83F911-8B78-4973-A3A9-2A2D85581F25} = {8BFDA83B-FD73-4776-9C2C-5F7FFE440C1F}
- {9E9EE58E-4B98-4495-8E8B-00281B3EABDA} = {8BFDA83B-FD73-4776-9C2C-5F7FFE440C1F}
- {D9FABEC8-09DC-4B0D-80D7-86FA6C5D9C69} = {26921EED-9592-4174-94D6-8A0F604029F1}
- {E3685B06-F135-4318-B841-889C35479D5C} = {19FEB622-0912-4F5E-840F-827B4B9EF026}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {A023D63E-FDD1-4984-9746-45981BCFBACA}
- EndGlobalSection
-EndGlobal
diff --git a/src/EntityFramework/src/IdentityServerEntityFrameworkBuilderExtensions.cs b/src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs
similarity index 100%
rename from src/EntityFramework/src/IdentityServerEntityFrameworkBuilderExtensions.cs
rename to src/EntityFramework/IdentityServerEntityFrameworkBuilderExtensions.cs
diff --git a/src/EntityFramework/src/Services/CorsPolicyService.cs b/src/EntityFramework/Services/CorsPolicyService.cs
similarity index 100%
rename from src/EntityFramework/src/Services/CorsPolicyService.cs
rename to src/EntityFramework/Services/CorsPolicyService.cs
diff --git a/src/EntityFramework/src/TokenCleanupHost.cs b/src/EntityFramework/TokenCleanupHost.cs
similarity index 100%
rename from src/EntityFramework/src/TokenCleanupHost.cs
rename to src/EntityFramework/TokenCleanupHost.cs
diff --git a/src/EntityFramework/build.cmd b/src/EntityFramework/build.cmd
deleted file mode 100644
index e4cf78f4a..000000000
--- a/src/EntityFramework/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-dotnet run --project build -- %*
\ No newline at end of file
diff --git a/src/EntityFramework/build.ps1 b/src/EntityFramework/build.ps1
deleted file mode 100644
index 8c950bdae..000000000
--- a/src/EntityFramework/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-$ErrorActionPreference = "Stop";
-dotnet run --project build -- $args
\ No newline at end of file
diff --git a/src/EntityFramework/build.sh b/src/EntityFramework/build.sh
deleted file mode 100755
index bb8ef5b20..000000000
--- a/src/EntityFramework/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-dotnet run --project build -- "$@"
\ No newline at end of file
diff --git a/src/EntityFramework/build/Program.cs b/src/EntityFramework/build/Program.cs
deleted file mode 100644
index 2c1d2fe65..000000000
--- a/src/EntityFramework/build/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace build
-{
- partial class Program
- {
- private const string Prefix = "EntityFramework";
- }
-}
diff --git a/src/EntityFramework/build/build.csproj b/src/EntityFramework/build/build.csproj
deleted file mode 100644
index 43c81aaed..000000000
--- a/src/EntityFramework/build/build.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EntityFramework/dropdb.bat b/src/EntityFramework/dropdb.bat
deleted file mode 100644
index bec1590d3..000000000
--- a/src/EntityFramework/dropdb.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-cd src\Host
-dotnet ef database drop -c PersistedGrantDbContext
-dotnet ef database drop -c ConfigurationDbContext
-cd ..\..
diff --git a/src/EntityFramework/migrations.bat b/src/EntityFramework/migrations.bat
deleted file mode 100644
index 31b10286f..000000000
--- a/src/EntityFramework/migrations.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-cd host
-rmdir /S /Q Migrations
-
-dotnet ef migrations add Grants -c PersistedGrantDbContext -o Migrations/IdentityServer/PersistedGrantDb
-dotnet ef migrations add Config -c ConfigurationDbContext -o Migrations/IdentityServer/ConfigurationDb
-dotnet ef migrations script -c PersistedGrantDbContext -o Migrations/IdentityServer/PersistedGrantDb.sql
-dotnet ef migrations script -c ConfigurationDbContext -o Migrations/IdentityServer/ConfigurationDb.sql
-
-cd ..
diff --git a/src/EntityFramework/migrations/SqlServer/Configuration/Clients.cs b/src/EntityFramework/migrations/SqlServer/Configuration/Clients.cs
deleted file mode 100644
index f1e0979eb..000000000
--- a/src/EntityFramework/migrations/SqlServer/Configuration/Clients.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using Duende.IdentityServer.Models;
-using System.Collections.Generic;
-
-namespace IdentityServerHost.Configuration
-{
- public static class Clients
- {
- public static IEnumerable Get()
- {
- var clients = new List();
-
- clients.AddRange(ClientsConsole.Get());
- clients.AddRange(ClientsWeb.Get());
-
- return clients;
- }
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework/migrations/SqlServer/Configuration/ClientsConsole.cs b/src/EntityFramework/migrations/SqlServer/Configuration/ClientsConsole.cs
deleted file mode 100644
index 9ea7fb366..000000000
--- a/src/EntityFramework/migrations/SqlServer/Configuration/ClientsConsole.cs
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public static class ClientsConsole
- {
- public static IEnumerable Get()
- {
- return new List
- {
- ///////////////////////////////////////////////////////////////
- // Console-based Client
- ///////////////////////////////////////////////////////////////
-
-
- ///////////////////////////////////////////
- // Console Client Credentials Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1", IdentityServerConstants.LocalApi.ScopeName}
- },
-
- ///////////////////////////////////////////
- // Console Structured Scope Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "parameterized.client",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "transaction" }
- },
-
- ///////////////////////////////////////////
- // X509 mTLS Client
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mtls",
- ClientSecrets =
- {
- // new Secret(@"CN=mtls.test, OU=ROO\ballen@roo, O=mkcert development certificate", "mtls.test")
- // {
- // Type = SecretTypes.X509CertificateName
- // },
- new Secret("5D9E9B6B333CD42C99D1DE6175CC0F3EF99DDF68", "mtls.test")
- {
- Type = IdentityServerConstants.SecretTypes.X509CertificateThumbprint
- },
- },
-
- AccessTokenType = AccessTokenType.Jwt,
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Console Client Credentials Flow with client JWT assertion
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client.jwt",
- ClientSecrets =
- {
- new Secret
- {
- Type = IdentityServerConstants.SecretTypes.X509CertificateBase64,
- Value =
- "MIIEgTCCAumgAwIBAgIQDMMu7l/umJhfEbzJMpcttzANBgkqhkiG9w0BAQsFADCBkzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMTQwMgYDVQQLDCtkb21pbmlja0Bkb21icDE2LmZyaXR6LmJveCAoRG9taW5pY2sgQmFpZXIpMTswOQYDVQQDDDJta2NlcnQgZG9taW5pY2tAZG9tYnAxNi5mcml0ei5ib3ggKERvbWluaWNrIEJhaWVyKTAeFw0xOTA2MDEwMDAwMDBaFw0zMDAxMDMxMjM0MDdaMHAxJzAlBgNVBAoTHm1rY2VydCBkZXZlbG9wbWVudCBjZXJ0aWZpY2F0ZTE0MDIGA1UECwwrZG9taW5pY2tAZG9tYnAxNi5mcml0ei5ib3ggKERvbWluaWNrIEJhaWVyKTEPMA0GA1UEAxMGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNtpipaS8k1zA6w0Aoy8U4l+8zM4jHhhblExf3PULrMR6RauxniTki8p+P8CsZT4V8A4qo+JwsgpLIHrVQrbt9DEhHfBKzxwHqt+GoHt7byTfTtp8A/5nLhYc/5CW4HiR194gVx5+HAlvt+BriMTb1czvTf+H20dj41yUPsN7nMdyRLF+uXapQYMLYnq2BJIDq83mqGwojHk7d+N6GwoO95jlyas7KSoj8/FvfbaqkRNx0446hqPOzFHKc8er8K5VrLp6tVjh8ZJyY0F0dKgx6yWITsL54ctbj/cCyfuGjWEMbS2XXgc+x/xQMnmpfhK1qQAUn9jg5EzF9n6mQomOwIDAQABo3MwcTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUEMUlw41YsKZQVls3pEG6CrJk4O8wEQYDVR0RBAowCIIGY2xpZW50MA0GCSqGSIb3DQEBCwUAA4IBgQC0TjNY4Q3Wmw7ggamDImV6HUng3WbYGLYbbL2e3myBrjIxGd1Bi8ZyOu8qeUMIRAbZt2YsSX5S8kx0biaVg2zC+aO5eHhEWMwKB66huInXFjI4wtxZ22r+33fg1R0cLuEUePhftOWrbL0MS4YXVyn9HUMWO4WptG9PJdxNw1UbEB8nw3FkVOdAC9RGqiqalSK+E2UT/kUbTIQ1gPSdQ3nh52mre0H/T9+IRqiozJtNK/CQg4NuEV7rUXHnp7Fmigp6RIJ4TCozglspL341y0rV8M7npU1FYZC2UKNr4ed+GOO1n/sF3LbXDlPXwne99CVVn85wjDaevoR7Md0y2KwE9EggLYcViXNehx4YVv/BjfgqxW8NxiKAxP6kPOZE0XdBrZj2rmcDcGOXCzzYpcduKhFyTOpA0K5RNGC3j1KOUjPVlOtLvjASP7udBEYNfH3mgqXAgqNDOEKi2jG9LITv2IyGUsXhTAsKNJ6A6qiDBzDrvPAYDvsfabPq6tRTwjA="
- },
- new Secret
- {
- Type = IdentityServerConstants.SecretTypes.JsonWebKey,
- Value =
- "{'e':'AQAB','kid':'ZzAjSnraU3bkWGnnAqLapYGpTyNfLbjbzgAPbbW2GEA','kty':'RSA','n':'wWwQFtSzeRjjerpEM5Rmqz_DsNaZ9S1Bw6UbZkDLowuuTCjBWUax0vBMMxdy6XjEEK4Oq9lKMvx9JzjmeJf1knoqSNrox3Ka0rnxXpNAz6sATvme8p9mTXyp0cX4lF4U2J54xa2_S9NF5QWvpXvBeC4GAJx7QaSw4zrUkrc6XyaAiFnLhQEwKJCwUw4NOqIuYvYp_IXhw-5Ti_icDlZS-282PcccnBeOcX7vc21pozibIdmZJKqXNsL1Ibx5Nkx1F1jLnekJAmdaACDjYRLL_6n3W4wUp19UvzB1lGtXcJKLLkqB6YDiZNu16OSiSprfmrRXvYmvD8m6Fnl5aetgKw'}"
- }
- },
-
- AllowedGrantTypes = GrantTypes.ClientCredentials,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Custom Grant Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "client.custom",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = {"custom", "custom.nosubject"},
- AllowedScopes = { "resource1.scope1", "resource2.scope1" }
- },
-
- ///////////////////////////////////////////
- // Console Resource Owner Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- "custom.profile",
- "resource1.scope1", "resource2.scope1"
- }
- },
-
- ///////////////////////////////////////////
- // Console Public Resource Owner Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient.public",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
-
- ///////////////////////////////////////////
- // Console with PKCE Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "console.pkce",
- ClientName = "Console with PKCE Sample",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
- RedirectUris = {"http://127.0.0.1"},
- AllowOfflineAccess = true,
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
- ///////////////////////////////////////////
- // WinConsole with PKCE Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "winconsole",
- ClientName = "Windows Console with PKCE Sample",
- RequireClientSecret = false,
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
- RedirectUris = {"sample-windows-client://callback"},
- RequireConsent = false,
- AllowOfflineAccess = true,
- AllowedIdentityTokenSigningAlgorithms = {"ES256"},
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- },
-
-
- ///////////////////////////////////////////
- // Introspection Client Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "roclient.reference",
- ClientSecrets = {new Secret("secret".Sha256())},
- AllowedGrantTypes = GrantTypes.ResourceOwnerPassword,
- AllowedScopes = { "resource1.scope1", "resource2.scope1" },
- AccessTokenType = AccessTokenType.Reference
- },
-
- ///////////////////////////////////////////
- // Device Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "device",
- ClientName = "Device Flow Client",
-
- AllowedGrantTypes = GrantTypes.DeviceFlow,
- RequireClientSecret = false,
-
- AllowOfflineAccess = true,
-
- AllowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1", "resource2.scope1"
- }
- }
- };
- }
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework/migrations/SqlServer/Configuration/ClientsWeb.cs b/src/EntityFramework/migrations/SqlServer/Configuration/ClientsWeb.cs
deleted file mode 100644
index 8b5b48d02..000000000
--- a/src/EntityFramework/migrations/SqlServer/Configuration/ClientsWeb.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.using System.Collections.Generic;
-
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public static class ClientsWeb
- {
- static string[] allowedScopes =
- {
- IdentityServerConstants.StandardScopes.OpenId,
- IdentityServerConstants.StandardScopes.Profile,
- IdentityServerConstants.StandardScopes.Email,
- "resource1.scope1",
- "resource2.scope1",
- "transaction"
- };
-
- public static IEnumerable Get()
- {
- return new List
- {
- ///////////////////////////////////////////
- // JS OIDC Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "js_oidc",
- ClientName = "JavaScript OIDC Client",
- ClientUri = "http://identityserver.io",
-
- AllowedGrantTypes = GrantTypes.Code,
- RequireClientSecret = false,
-
- RedirectUris =
- {
- "https://localhost:44300/index.html",
- "https://localhost:44300/callback.html",
- "https://localhost:44300/silent.html",
- "https://localhost:44300/popup.html"
- },
-
- PostLogoutRedirectUris = { "https://localhost:44300/index.html" },
- AllowedCorsOrigins = { "https://localhost:44300" },
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Automatic Token Management Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.tokenmanagement",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- AllowedGrantTypes = GrantTypes.Code,
- RequirePkce = true,
-
- AccessTokenLifetime = 75,
-
- RedirectUris = { "https://localhost:44301/signin-oidc" },
- FrontChannelLogoutUri = "https://localhost:44301/signout-oidc",
- PostLogoutRedirectUris = { "https://localhost:44301/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Code Flow Sample
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.code",
- ClientName = "MVC Code Flow",
- ClientUri = "http://identityserver.io",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- RequireConsent = true,
- AllowedGrantTypes = GrantTypes.Code,
-
- RedirectUris = { "https://localhost:44302/signin-oidc" },
- FrontChannelLogoutUri = "https://localhost:44302/signout-oidc",
- PostLogoutRedirectUris = { "https://localhost:44302/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- },
-
- ///////////////////////////////////////////
- // MVC Hybrid Flow Sample (Back Channel logout)
- //////////////////////////////////////////
- new Client
- {
- ClientId = "mvc.hybrid.backchannel",
- ClientName = "MVC Hybrid (with BackChannel logout)",
- ClientUri = "http://identityserver.io",
-
- ClientSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- AllowedGrantTypes = GrantTypes.Hybrid,
- RequirePkce = false,
-
- RedirectUris = { "https://localhost:44303/signin-oidc" },
- BackChannelLogoutUri = "https://localhost:44303/logout",
- PostLogoutRedirectUris = { "https://localhost:44303/signout-callback-oidc" },
-
- AllowOfflineAccess = true,
-
- AllowedScopes = allowedScopes
- }
- };
- }
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework/migrations/SqlServer/Configuration/Resources.cs b/src/EntityFramework/migrations/SqlServer/Configuration/Resources.cs
deleted file mode 100644
index bad9802ba..000000000
--- a/src/EntityFramework/migrations/SqlServer/Configuration/Resources.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using IdentityModel;
-using System.Collections.Generic;
-using Duende.IdentityServer;
-using Duende.IdentityServer.Models;
-
-namespace IdentityServerHost.Configuration
-{
- public class Resources
- {
- // identity resources represent identity data about a user that can be requested via the scope parameter (OpenID Connect)
- public static readonly IEnumerable IdentityResources =
- new[]
- {
- // some standard scopes from the OIDC spec
- new IdentityResources.OpenId(),
- new IdentityResources.Profile(),
- new IdentityResources.Email(),
-
- // custom identity resource with some consolidated claims
- new IdentityResource("custom.profile", new[] { JwtClaimTypes.Name, JwtClaimTypes.Email, "location" })
- };
-
- // API scopes represent values that describe scope of access and can be requested by the scope parameter (OAuth)
- public static readonly IEnumerable ApiScopes =
- new[]
- {
- // local API scope
- new ApiScope(IdentityServerConstants.LocalApi.ScopeName),
-
- // resource specific scopes
- new ApiScope("resource1.scope1"),
- new ApiScope("resource2.scope1"),
-
- // a scope without resource association
- new ApiScope("scope3"),
-
- // a scope shared by multiple resources
- new ApiScope("shared.scope"),
-
- // a parameterized scope
- new ApiScope("transaction", "Transaction")
- {
- Description = "Some Transaction"
- }
- };
-
- // API resources are more formal representation of a resource with processing rules and their scopes (if any)
- public static readonly IEnumerable ApiResources =
- new[]
- {
- new ApiResource("resource1", "Resource 1")
- {
- ApiSecrets = { new Secret("secret".Sha256()) },
-
- Scopes = { "resource1.scope1", "shared.scope" }
- },
-
- // expanded version if more control is needed
- new ApiResource("resource2", "Resource 2")
- {
- ApiSecrets =
- {
- new Secret("secret".Sha256())
- },
-
- // additional claims to put into access token
- UserClaims =
- {
- JwtClaimTypes.Name,
- JwtClaimTypes.Email
- },
-
- Scopes = { "resource2.scope1", "shared.scope" }
- }
- };
- }
-}
diff --git a/src/EntityFramework/migrations/SqlServer/Program.cs b/src/EntityFramework/migrations/SqlServer/Program.cs
deleted file mode 100644
index 311326821..000000000
--- a/src/EntityFramework/migrations/SqlServer/Program.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using Microsoft.AspNetCore;
-using Microsoft.AspNetCore.Hosting;
-
-namespace SqlServer
-{
- class Program
- {
- public static void Main(string[] args)
- {
- var host = BuildWebHost(args);
- SeedData.EnsureSeedData(host.Services);
- }
-
- public static IWebHost BuildWebHost(string[] args) =>
- WebHost.CreateDefaultBuilder(args)
- .UseStartup()
- .Build();
- }
-}
diff --git a/src/EntityFramework/migrations/SqlServer/Properties/launchSettings.json b/src/EntityFramework/migrations/SqlServer/Properties/launchSettings.json
deleted file mode 100644
index e20360b91..000000000
--- a/src/EntityFramework/migrations/SqlServer/Properties/launchSettings.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
- "iisSettings": {
- "windowsAuthentication": false,
- "anonymousAuthentication": true,
- "iisExpress": {
- "applicationUrl": "http://localhost:7603/",
- "sslPort": 0
- }
- },
- "profiles": {
- "IIS Express": {
- "commandName": "IISExpress",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- }
- },
- "SqlServer": {
- "commandName": "Project",
- "launchBrowser": true,
- "environmentVariables": {
- "ASPNETCORE_ENVIRONMENT": "Development"
- },
- "applicationUrl": "http://localhost:7604/"
- }
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework/migrations/SqlServer/SeedData.cs b/src/EntityFramework/migrations/SqlServer/SeedData.cs
deleted file mode 100644
index 35e0c9256..000000000
--- a/src/EntityFramework/migrations/SqlServer/SeedData.cs
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using System;
-using System.Linq;
-using Duende.IdentityServer.EntityFramework.DbContexts;
-using Duende.IdentityServer.EntityFramework.Mappers;
-using IdentityServerHost.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace SqlServer
-{
- public class SeedData
- {
- public static void EnsureSeedData(IServiceProvider serviceProvider)
- {
- using (var scope = serviceProvider.GetRequiredService().CreateScope())
- {
- using (var context = scope.ServiceProvider.GetService())
- {
- EnsureSeedData(context);
- }
- }
- }
-
- private static void EnsureSeedData(ConfigurationDbContext context)
- {
- Console.WriteLine("Seeding database...");
-
- if (!context.Clients.Any())
- {
- Console.WriteLine("Clients being populated");
- foreach (var client in Clients.Get())
- {
- context.Clients.Add(client.ToEntity());
- }
- context.SaveChanges();
- }
- else
- {
- Console.WriteLine("Clients already populated");
- }
-
- if (!context.IdentityResources.Any())
- {
- Console.WriteLine("IdentityResources being populated");
- foreach (var resource in Resources.IdentityResources)
- {
- context.IdentityResources.Add(resource.ToEntity());
- }
- context.SaveChanges();
- }
- else
- {
- Console.WriteLine("IdentityResources already populated");
- }
-
- if (!context.ApiResources.Any())
- {
- Console.WriteLine("ApiResources being populated");
- foreach (var resource in Resources.ApiResources)
- {
- context.ApiResources.Add(resource.ToEntity());
- }
- context.SaveChanges();
- }
- else
- {
- Console.WriteLine("ApiResources already populated");
- }
-
- if (!context.ApiScopes.Any())
- {
- Console.WriteLine("Scopes being populated");
- foreach (var resource in Resources.ApiScopes)
- {
- context.ApiScopes.Add(resource.ToEntity());
- }
- context.SaveChanges();
- }
- else
- {
- Console.WriteLine("Scopes already populated");
- }
-
- Console.WriteLine("Done seeding database.");
- Console.WriteLine();
- }
- }
-
-}
diff --git a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj b/src/EntityFramework/migrations/SqlServer/SqlServer.csproj
deleted file mode 100644
index 9b2a65458..000000000
--- a/src/EntityFramework/migrations/SqlServer/SqlServer.csproj
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
diff --git a/src/EntityFramework/migrations/SqlServer/Startup.cs b/src/EntityFramework/migrations/SqlServer/Startup.cs
deleted file mode 100644
index 36cccda51..000000000
--- a/src/EntityFramework/migrations/SqlServer/Startup.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) Duende Software. All rights reserved.
-// See LICENSE in the project root for license information.
-
-
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Configuration;
-using Microsoft.EntityFrameworkCore;
-
-namespace SqlServer
-{
- public class Startup
- {
- public IConfiguration Configuration { get; }
-
- public Startup(IConfiguration config)
- {
- Configuration = config;
- }
-
- public void ConfigureServices(IServiceCollection services)
- {
- var cn = Configuration.GetConnectionString("db");
-
- services.AddIdentityServer()
- .AddConfigurationStore(options => {
- options.ConfigureDbContext = b => b.UseSqlServer(cn);
- })
- .AddOperationalStore(options => {
- options.ConfigureDbContext = b => b.UseSqlServer(cn);
- });
- }
-
- public void Configure(IApplicationBuilder app)
- {
- }
- }
-}
diff --git a/src/EntityFramework/migrations/SqlServer/appsettings.json b/src/EntityFramework/migrations/SqlServer/appsettings.json
deleted file mode 100644
index 033c06404..000000000
--- a/src/EntityFramework/migrations/SqlServer/appsettings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "ConnectionStrings": {
- "db": "server=(localdb)\\mssqllocaldb;database=Duende.EntityFramework-5.0.0;trusted_connection=yes;",
- }
-}
\ No newline at end of file
diff --git a/src/EntityFramework/updatedb.bat b/src/EntityFramework/updatedb.bat
deleted file mode 100644
index 142074378..000000000
--- a/src/EntityFramework/updatedb.bat
+++ /dev/null
@@ -1,5 +0,0 @@
-cd host
-dotnet ef database update -c PersistedGrantDbContext
-dotnet ef database update -c ConfigurationDbContext
-dotnet run /seed
-cd ..
diff --git a/src/IdentityServer/.run/Host (NET5).run.xml b/src/IdentityServer/.run/Host (NET5).run.xml
deleted file mode 100644
index ef91aa275..000000000
--- a/src/IdentityServer/.run/Host (NET5).run.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/IdentityServer/.run/Host (NetCore3.1).run.xml b/src/IdentityServer/.run/Host (NetCore3.1).run.xml
deleted file mode 100644
index 2557e2237..000000000
--- a/src/IdentityServer/.run/Host (NetCore3.1).run.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/IdentityServer/src/Configuration/CryptoHelper.cs b/src/IdentityServer/Configuration/CryptoHelper.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/CryptoHelper.cs
rename to src/IdentityServer/Configuration/CryptoHelper.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Additional.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
rename to src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Additional.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Core.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Core.cs
rename to src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Core.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
rename to src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/Crypto.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs b/src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
rename to src/IdentityServer/Configuration/DependencyInjection/BuilderExtensions/InMemory.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/ConfigureInternalCookieOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/ConfigureInternalCookieOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/ConfigureInternalCookieOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/ConfigureInternalCookieOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/ConfigureOpenIdConnectOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/ConfigureOpenIdConnectOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/ConfigureOpenIdConnectOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/ConfigureOpenIdConnectOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Decorator.cs b/src/IdentityServer/Configuration/DependencyInjection/Decorator.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Decorator.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Decorator.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/IIdentityServerBuilder.cs b/src/IdentityServer/Configuration/DependencyInjection/IIdentityServerBuilder.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/IIdentityServerBuilder.cs
rename to src/IdentityServer/Configuration/DependencyInjection/IIdentityServerBuilder.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/IdentityServerBuilder.cs b/src/IdentityServer/Configuration/DependencyInjection/IdentityServerBuilder.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/IdentityServerBuilder.cs
rename to src/IdentityServer/Configuration/DependencyInjection/IdentityServerBuilder.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs b/src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/IdentityServerServiceCollectionExtensions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/AuthenticationOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/AuthenticationOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/AuthenticationOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/AuthenticationOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/CachingOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/CachingOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/CachingOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/CachingOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/CorsOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/CorsOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/CorsOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/CorsOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/CspOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/CspOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/CspOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/CspOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/DeviceFlowOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/DeviceFlowOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/DeviceFlowOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/DeviceFlowOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/DiscoveryOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/DiscoveryOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/DiscoveryOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/DiscoveryOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/EndpointOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/EndpointOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/EndpointOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/EndpointOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/EventsOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/EventsOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/EventsOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/EventsOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/IdentityServerOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/IdentityServerOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/IdentityServerOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/IdentityServerOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/InputLengthRestrictions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/InputLengthRestrictions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/InputLengthRestrictions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/InputLengthRestrictions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/KeyManagementOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/KeyManagementOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/KeyManagementOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/KeyManagementOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/LoggingOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/LoggingOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/LoggingOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/LoggingOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/MtlsOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/MtlsOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/MtlsOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/MtlsOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/UserInteractionOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/UserInteractionOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/UserInteractionOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/UserInteractionOptions.cs
diff --git a/src/IdentityServer/src/Configuration/DependencyInjection/Options/ValidationOptions.cs b/src/IdentityServer/Configuration/DependencyInjection/Options/ValidationOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/DependencyInjection/Options/ValidationOptions.cs
rename to src/IdentityServer/Configuration/DependencyInjection/Options/ValidationOptions.cs
diff --git a/src/IdentityServer/src/Configuration/IdentityServerApplicationBuilderExtensions.cs b/src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/IdentityServerApplicationBuilderExtensions.cs
rename to src/IdentityServer/Configuration/IdentityServerApplicationBuilderExtensions.cs
diff --git a/src/IdentityServer/src/Configuration/IdentityServerMiddlewareOptions.cs b/src/IdentityServer/Configuration/IdentityServerMiddlewareOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Configuration/IdentityServerMiddlewareOptions.cs
rename to src/IdentityServer/Configuration/IdentityServerMiddlewareOptions.cs
diff --git a/src/IdentityServer/src/Constants.cs b/src/IdentityServer/Constants.cs
similarity index 100%
rename from src/IdentityServer/src/Constants.cs
rename to src/IdentityServer/Constants.cs
diff --git a/src/IdentityServer/src/Duende.IdentityServer.csproj b/src/IdentityServer/Duende.IdentityServer.csproj
similarity index 83%
rename from src/IdentityServer/src/Duende.IdentityServer.csproj
rename to src/IdentityServer/Duende.IdentityServer.csproj
index d56fd160c..a4d9c37f8 100644
--- a/src/IdentityServer/src/Duende.IdentityServer.csproj
+++ b/src/IdentityServer/Duende.IdentityServer.csproj
@@ -14,12 +14,13 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/IdentityServer/Duende.IdentityServer.sln b/src/IdentityServer/Duende.IdentityServer.sln
deleted file mode 100644
index a70c3a47a..000000000
--- a/src/IdentityServer/Duende.IdentityServer.sln
+++ /dev/null
@@ -1,53 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.352
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5461C61B-B06E-46BA-B206-925B660BE727}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{45C22EDD-91B1-4AEF-8620-77F4E3E7C544}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer", "src\Duende.IdentityServer.csproj", "{407C030E-60E6-41F7-AF43-0AC48EDCC17D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Host", "host\Host.csproj", "{784B3C88-30FA-415D-B99E-584063064508}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{4291820C-735F-4776-8BC4-6527433BC683}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegrationTests", "test\IntegrationTests\IntegrationTests.csproj", "{94501373-478A-478D-8C17-6AC52E3438CF}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {407C030E-60E6-41F7-AF43-0AC48EDCC17D}.Release|Any CPU.Build.0 = Release|Any CPU
- {784B3C88-30FA-415D-B99E-584063064508}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {784B3C88-30FA-415D-B99E-584063064508}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {784B3C88-30FA-415D-B99E-584063064508}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {784B3C88-30FA-415D-B99E-584063064508}.Release|Any CPU.Build.0 = Release|Any CPU
- {4291820C-735F-4776-8BC4-6527433BC683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4291820C-735F-4776-8BC4-6527433BC683}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4291820C-735F-4776-8BC4-6527433BC683}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4291820C-735F-4776-8BC4-6527433BC683}.Release|Any CPU.Build.0 = Release|Any CPU
- {94501373-478A-478D-8C17-6AC52E3438CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {94501373-478A-478D-8C17-6AC52E3438CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {94501373-478A-478D-8C17-6AC52E3438CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {94501373-478A-478D-8C17-6AC52E3438CF}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {407C030E-60E6-41F7-AF43-0AC48EDCC17D} = {5461C61B-B06E-46BA-B206-925B660BE727}
- {784B3C88-30FA-415D-B99E-584063064508} = {5461C61B-B06E-46BA-B206-925B660BE727}
- {4291820C-735F-4776-8BC4-6527433BC683} = {45C22EDD-91B1-4AEF-8620-77F4E3E7C544}
- {94501373-478A-478D-8C17-6AC52E3438CF} = {45C22EDD-91B1-4AEF-8620-77F4E3E7C544}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {176723F7-4A9B-4F05-A9F3-3BA715E4BDC3}
- EndGlobalSection
-EndGlobal
diff --git a/src/IdentityServer/src/Endpoints/AuthorizeCallbackEndpoint.cs b/src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/AuthorizeCallbackEndpoint.cs
rename to src/IdentityServer/Endpoints/AuthorizeCallbackEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/AuthorizeEndpoint.cs b/src/IdentityServer/Endpoints/AuthorizeEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/AuthorizeEndpoint.cs
rename to src/IdentityServer/Endpoints/AuthorizeEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/AuthorizeEndpointBase.cs b/src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/AuthorizeEndpointBase.cs
rename to src/IdentityServer/Endpoints/AuthorizeEndpointBase.cs
diff --git a/src/IdentityServer/src/Endpoints/CheckSessionEndpoint.cs b/src/IdentityServer/Endpoints/CheckSessionEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/CheckSessionEndpoint.cs
rename to src/IdentityServer/Endpoints/CheckSessionEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/DeviceAuthorizationEndpoint.cs b/src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/DeviceAuthorizationEndpoint.cs
rename to src/IdentityServer/Endpoints/DeviceAuthorizationEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/DiscoveryEndpoint.cs b/src/IdentityServer/Endpoints/DiscoveryEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/DiscoveryEndpoint.cs
rename to src/IdentityServer/Endpoints/DiscoveryEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/DiscoveryKeyEndpoint.cs b/src/IdentityServer/Endpoints/DiscoveryKeyEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/DiscoveryKeyEndpoint.cs
rename to src/IdentityServer/Endpoints/DiscoveryKeyEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/EndSessionCallbackEndpoint.cs b/src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/EndSessionCallbackEndpoint.cs
rename to src/IdentityServer/Endpoints/EndSessionCallbackEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/EndSessionEndpoint.cs b/src/IdentityServer/Endpoints/EndSessionEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/EndSessionEndpoint.cs
rename to src/IdentityServer/Endpoints/EndSessionEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/IntrospectionEndpoint.cs b/src/IdentityServer/Endpoints/IntrospectionEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/IntrospectionEndpoint.cs
rename to src/IdentityServer/Endpoints/IntrospectionEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/AuthorizeResult.cs b/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/AuthorizeResult.cs
rename to src/IdentityServer/Endpoints/Results/AuthorizeResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/BadRequestResult.cs b/src/IdentityServer/Endpoints/Results/BadRequestResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/BadRequestResult.cs
rename to src/IdentityServer/Endpoints/Results/BadRequestResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/CheckSessionResult.cs b/src/IdentityServer/Endpoints/Results/CheckSessionResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/CheckSessionResult.cs
rename to src/IdentityServer/Endpoints/Results/CheckSessionResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/ConsentPageResult.cs b/src/IdentityServer/Endpoints/Results/ConsentPageResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/ConsentPageResult.cs
rename to src/IdentityServer/Endpoints/Results/ConsentPageResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/CustomRedirectResult.cs b/src/IdentityServer/Endpoints/Results/CustomRedirectResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/CustomRedirectResult.cs
rename to src/IdentityServer/Endpoints/Results/CustomRedirectResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/DeviceAuthorizationResult.cs b/src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/DeviceAuthorizationResult.cs
rename to src/IdentityServer/Endpoints/Results/DeviceAuthorizationResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/DiscoveryDocumentResult.cs b/src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/DiscoveryDocumentResult.cs
rename to src/IdentityServer/Endpoints/Results/DiscoveryDocumentResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/EndSessionCallbackResult.cs b/src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/EndSessionCallbackResult.cs
rename to src/IdentityServer/Endpoints/Results/EndSessionCallbackResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/EndSessionResult.cs b/src/IdentityServer/Endpoints/Results/EndSessionResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/EndSessionResult.cs
rename to src/IdentityServer/Endpoints/Results/EndSessionResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/IntrospectionResult.cs b/src/IdentityServer/Endpoints/Results/IntrospectionResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/IntrospectionResult.cs
rename to src/IdentityServer/Endpoints/Results/IntrospectionResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/JsonWebKeysResult.cs b/src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/JsonWebKeysResult.cs
rename to src/IdentityServer/Endpoints/Results/JsonWebKeysResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/LoginPageResult.cs b/src/IdentityServer/Endpoints/Results/LoginPageResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/LoginPageResult.cs
rename to src/IdentityServer/Endpoints/Results/LoginPageResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/ProtectedResourceErrorResult.cs b/src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/ProtectedResourceErrorResult.cs
rename to src/IdentityServer/Endpoints/Results/ProtectedResourceErrorResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/StatusCodeResult.cs b/src/IdentityServer/Endpoints/Results/StatusCodeResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/StatusCodeResult.cs
rename to src/IdentityServer/Endpoints/Results/StatusCodeResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/TokenErrorResult.cs b/src/IdentityServer/Endpoints/Results/TokenErrorResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/TokenErrorResult.cs
rename to src/IdentityServer/Endpoints/Results/TokenErrorResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/TokenResult.cs b/src/IdentityServer/Endpoints/Results/TokenResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/TokenResult.cs
rename to src/IdentityServer/Endpoints/Results/TokenResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/TokenRevocationErrorResult.cs b/src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/TokenRevocationErrorResult.cs
rename to src/IdentityServer/Endpoints/Results/TokenRevocationErrorResult.cs
diff --git a/src/IdentityServer/src/Endpoints/Results/UserInfoResult.cs b/src/IdentityServer/Endpoints/Results/UserInfoResult.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/Results/UserInfoResult.cs
rename to src/IdentityServer/Endpoints/Results/UserInfoResult.cs
diff --git a/src/IdentityServer/src/Endpoints/TokenEndpoint.cs b/src/IdentityServer/Endpoints/TokenEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/TokenEndpoint.cs
rename to src/IdentityServer/Endpoints/TokenEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/TokenRevocationEndpoint.cs b/src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/TokenRevocationEndpoint.cs
rename to src/IdentityServer/Endpoints/TokenRevocationEndpoint.cs
diff --git a/src/IdentityServer/src/Endpoints/UserInfoEndpoint.cs b/src/IdentityServer/Endpoints/UserInfoEndpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Endpoints/UserInfoEndpoint.cs
rename to src/IdentityServer/Endpoints/UserInfoEndpoint.cs
diff --git a/src/IdentityServer/src/Events/ApiAuthenticationFailureEvent.cs b/src/IdentityServer/Events/ApiAuthenticationFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ApiAuthenticationFailureEvent.cs
rename to src/IdentityServer/Events/ApiAuthenticationFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/ApiAuthenticationSuccessEvent.cs b/src/IdentityServer/Events/ApiAuthenticationSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ApiAuthenticationSuccessEvent.cs
rename to src/IdentityServer/Events/ApiAuthenticationSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/ClientAuthenticationFailureEvent.cs b/src/IdentityServer/Events/ClientAuthenticationFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ClientAuthenticationFailureEvent.cs
rename to src/IdentityServer/Events/ClientAuthenticationFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/ClientAuthenticationSuccessEvent.cs b/src/IdentityServer/Events/ClientAuthenticationSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ClientAuthenticationSuccessEvent.cs
rename to src/IdentityServer/Events/ClientAuthenticationSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/ConsentDeniedEvent.cs b/src/IdentityServer/Events/ConsentDeniedEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ConsentDeniedEvent.cs
rename to src/IdentityServer/Events/ConsentDeniedEvent.cs
diff --git a/src/IdentityServer/src/Events/ConsentGrantedEvent.cs b/src/IdentityServer/Events/ConsentGrantedEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/ConsentGrantedEvent.cs
rename to src/IdentityServer/Events/ConsentGrantedEvent.cs
diff --git a/src/IdentityServer/src/Events/DeviceAuthorizationFailureEvent.cs b/src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/DeviceAuthorizationFailureEvent.cs
rename to src/IdentityServer/Events/DeviceAuthorizationFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/DeviceAuthorizationSuccessEvent.cs b/src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/DeviceAuthorizationSuccessEvent.cs
rename to src/IdentityServer/Events/DeviceAuthorizationSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/GrantsRevokedEvent.cs b/src/IdentityServer/Events/GrantsRevokedEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/GrantsRevokedEvent.cs
rename to src/IdentityServer/Events/GrantsRevokedEvent.cs
diff --git a/src/IdentityServer/src/Events/Infrastructure/Event.cs b/src/IdentityServer/Events/Infrastructure/Event.cs
similarity index 100%
rename from src/IdentityServer/src/Events/Infrastructure/Event.cs
rename to src/IdentityServer/Events/Infrastructure/Event.cs
diff --git a/src/IdentityServer/src/Events/Infrastructure/EventCategories.cs b/src/IdentityServer/Events/Infrastructure/EventCategories.cs
similarity index 100%
rename from src/IdentityServer/src/Events/Infrastructure/EventCategories.cs
rename to src/IdentityServer/Events/Infrastructure/EventCategories.cs
diff --git a/src/IdentityServer/src/Events/Infrastructure/EventIds.cs b/src/IdentityServer/Events/Infrastructure/EventIds.cs
similarity index 100%
rename from src/IdentityServer/src/Events/Infrastructure/EventIds.cs
rename to src/IdentityServer/Events/Infrastructure/EventIds.cs
diff --git a/src/IdentityServer/src/Events/Infrastructure/EventType.cs b/src/IdentityServer/Events/Infrastructure/EventType.cs
similarity index 100%
rename from src/IdentityServer/src/Events/Infrastructure/EventType.cs
rename to src/IdentityServer/Events/Infrastructure/EventType.cs
diff --git a/src/IdentityServer/src/Events/InvalidClientConfiguration.cs b/src/IdentityServer/Events/InvalidClientConfiguration.cs
similarity index 100%
rename from src/IdentityServer/src/Events/InvalidClientConfiguration.cs
rename to src/IdentityServer/Events/InvalidClientConfiguration.cs
diff --git a/src/IdentityServer/src/Events/TokenIntrospectionFailureEvent.cs b/src/IdentityServer/Events/TokenIntrospectionFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/TokenIntrospectionFailureEvent.cs
rename to src/IdentityServer/Events/TokenIntrospectionFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/TokenIntrospectionSuccessEvent.cs b/src/IdentityServer/Events/TokenIntrospectionSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/TokenIntrospectionSuccessEvent.cs
rename to src/IdentityServer/Events/TokenIntrospectionSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/TokenIssuedFailureEvent.cs b/src/IdentityServer/Events/TokenIssuedFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/TokenIssuedFailureEvent.cs
rename to src/IdentityServer/Events/TokenIssuedFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/TokenIssuedSuccessEvent.cs b/src/IdentityServer/Events/TokenIssuedSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/TokenIssuedSuccessEvent.cs
rename to src/IdentityServer/Events/TokenIssuedSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/TokenRevokedSuccessEvent.cs b/src/IdentityServer/Events/TokenRevokedSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/TokenRevokedSuccessEvent.cs
rename to src/IdentityServer/Events/TokenRevokedSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/UnhandledExceptionEvent.cs b/src/IdentityServer/Events/UnhandledExceptionEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/UnhandledExceptionEvent.cs
rename to src/IdentityServer/Events/UnhandledExceptionEvent.cs
diff --git a/src/IdentityServer/src/Events/UserLoginFailureEvent.cs b/src/IdentityServer/Events/UserLoginFailureEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/UserLoginFailureEvent.cs
rename to src/IdentityServer/Events/UserLoginFailureEvent.cs
diff --git a/src/IdentityServer/src/Events/UserLoginSuccessEvent.cs b/src/IdentityServer/Events/UserLoginSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/UserLoginSuccessEvent.cs
rename to src/IdentityServer/Events/UserLoginSuccessEvent.cs
diff --git a/src/IdentityServer/src/Events/UserLogoutSuccessEvent.cs b/src/IdentityServer/Events/UserLogoutSuccessEvent.cs
similarity index 100%
rename from src/IdentityServer/src/Events/UserLogoutSuccessEvent.cs
rename to src/IdentityServer/Events/UserLogoutSuccessEvent.cs
diff --git a/src/IdentityServer/src/Extensions/AuthenticationPropertiesExtensions.cs b/src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/AuthenticationPropertiesExtensions.cs
rename to src/IdentityServer/Extensions/AuthenticationPropertiesExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/AuthorizeResponseExtensions.cs b/src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/AuthorizeResponseExtensions.cs
rename to src/IdentityServer/Extensions/AuthorizeResponseExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ClaimsExtensions.cs b/src/IdentityServer/Extensions/ClaimsExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ClaimsExtensions.cs
rename to src/IdentityServer/Extensions/ClaimsExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ClientExtensions.cs b/src/IdentityServer/Extensions/ClientExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ClientExtensions.cs
rename to src/IdentityServer/Extensions/ClientExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/DateTimeExtensions.cs b/src/IdentityServer/Extensions/DateTimeExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/DateTimeExtensions.cs
rename to src/IdentityServer/Extensions/DateTimeExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/EndpointOptionsExtensions.cs b/src/IdentityServer/Extensions/EndpointOptionsExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/EndpointOptionsExtensions.cs
rename to src/IdentityServer/Extensions/EndpointOptionsExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/HashExtensions.cs b/src/IdentityServer/Extensions/HashExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/HashExtensions.cs
rename to src/IdentityServer/Extensions/HashExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/HttpContextAuthenticationExtensions.cs b/src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/HttpContextAuthenticationExtensions.cs
rename to src/IdentityServer/Extensions/HttpContextAuthenticationExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/HttpContextExtensions.cs b/src/IdentityServer/Extensions/HttpContextExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/HttpContextExtensions.cs
rename to src/IdentityServer/Extensions/HttpContextExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/HttpRequestExtensions.cs b/src/IdentityServer/Extensions/HttpRequestExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/HttpRequestExtensions.cs
rename to src/IdentityServer/Extensions/HttpRequestExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/HttpResponseExtensions.cs b/src/IdentityServer/Extensions/HttpResponseExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/HttpResponseExtensions.cs
rename to src/IdentityServer/Extensions/HttpResponseExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ICacheExtensions.cs b/src/IdentityServer/Extensions/ICacheExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ICacheExtensions.cs
rename to src/IdentityServer/Extensions/ICacheExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IClientStoreExtensions.cs b/src/IdentityServer/Extensions/IClientStoreExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IClientStoreExtensions.cs
rename to src/IdentityServer/Extensions/IClientStoreExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IEnumerableExtensions.cs b/src/IdentityServer/Extensions/IEnumerableExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IEnumerableExtensions.cs
rename to src/IdentityServer/Extensions/IEnumerableExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IReadableStringCollectionExtensions.cs b/src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IReadableStringCollectionExtensions.cs
rename to src/IdentityServer/Extensions/IReadableStringCollectionExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IResourceStoreExtensions.cs b/src/IdentityServer/Extensions/IResourceStoreExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IResourceStoreExtensions.cs
rename to src/IdentityServer/Extensions/IResourceStoreExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IUserSessionExtensions.cs b/src/IdentityServer/Extensions/IUserSessionExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IUserSessionExtensions.cs
rename to src/IdentityServer/Extensions/IUserSessionExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/IdentityServerToolsExtensions.cs b/src/IdentityServer/Extensions/IdentityServerToolsExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/IdentityServerToolsExtensions.cs
rename to src/IdentityServer/Extensions/IdentityServerToolsExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/KeyManagementExtensions.cs b/src/IdentityServer/Extensions/KeyManagementExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/KeyManagementExtensions.cs
rename to src/IdentityServer/Extensions/KeyManagementExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/NameValueCollectionExtensions.cs b/src/IdentityServer/Extensions/NameValueCollectionExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/NameValueCollectionExtensions.cs
rename to src/IdentityServer/Extensions/NameValueCollectionExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/PrincipalExtensions.cs b/src/IdentityServer/Extensions/PrincipalExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/PrincipalExtensions.cs
rename to src/IdentityServer/Extensions/PrincipalExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ProfileDataRequestContextExtensions.cs b/src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ProfileDataRequestContextExtensions.cs
rename to src/IdentityServer/Extensions/ProfileDataRequestContextExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ResourceExtensions.cs b/src/IdentityServer/Extensions/ResourceExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ResourceExtensions.cs
rename to src/IdentityServer/Extensions/ResourceExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ScopeExtensions.cs b/src/IdentityServer/Extensions/ScopeExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ScopeExtensions.cs
rename to src/IdentityServer/Extensions/ScopeExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/StringsExtensions.cs b/src/IdentityServer/Extensions/StringsExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/StringsExtensions.cs
rename to src/IdentityServer/Extensions/StringsExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/TokenExtensions.cs b/src/IdentityServer/Extensions/TokenExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/TokenExtensions.cs
rename to src/IdentityServer/Extensions/TokenExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/ValidatedAuthorizeRequestExtensions.cs b/src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/ValidatedAuthorizeRequestExtensions.cs
rename to src/IdentityServer/Extensions/ValidatedAuthorizeRequestExtensions.cs
diff --git a/src/IdentityServer/src/Extensions/X509CertificateExtensions.cs b/src/IdentityServer/Extensions/X509CertificateExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Extensions/X509CertificateExtensions.cs
rename to src/IdentityServer/Extensions/X509CertificateExtensions.cs
diff --git a/src/IdentityServer/src/Hosting/BaseUrlMiddleware.cs b/src/IdentityServer/Hosting/BaseUrlMiddleware.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/BaseUrlMiddleware.cs
rename to src/IdentityServer/Hosting/BaseUrlMiddleware.cs
diff --git a/src/IdentityServer/src/Hosting/CorsMiddleware.cs b/src/IdentityServer/Hosting/CorsMiddleware.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/CorsMiddleware.cs
rename to src/IdentityServer/Hosting/CorsMiddleware.cs
diff --git a/src/IdentityServer/src/Hosting/CorsPolicyProvider.cs b/src/IdentityServer/Hosting/CorsPolicyProvider.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/CorsPolicyProvider.cs
rename to src/IdentityServer/Hosting/CorsPolicyProvider.cs
diff --git a/src/IdentityServer/src/Hosting/Endpoint.cs b/src/IdentityServer/Hosting/Endpoint.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/Endpoint.cs
rename to src/IdentityServer/Hosting/Endpoint.cs
diff --git a/src/IdentityServer/src/Hosting/EndpointRouter.cs b/src/IdentityServer/Hosting/EndpointRouter.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/EndpointRouter.cs
rename to src/IdentityServer/Hosting/EndpointRouter.cs
diff --git a/src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs b/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs
rename to src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestHandlerWrapper.cs
diff --git a/src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestSignInHandlerWrapper.cs b/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestSignInHandlerWrapper.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestSignInHandlerWrapper.cs
rename to src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestSignInHandlerWrapper.cs
diff --git a/src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestSignOutHandlerWrapper.cs b/src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestSignOutHandlerWrapper.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/FederatedSignOut/AuthenticationRequestSignOutHandlerWrapper.cs
rename to src/IdentityServer/Hosting/FederatedSignOut/AuthenticationRequestSignOutHandlerWrapper.cs
diff --git a/src/IdentityServer/src/Hosting/FederatedSignOut/FederatedSignoutAuthenticationHandlerProvider.cs b/src/IdentityServer/Hosting/FederatedSignOut/FederatedSignoutAuthenticationHandlerProvider.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/FederatedSignOut/FederatedSignoutAuthenticationHandlerProvider.cs
rename to src/IdentityServer/Hosting/FederatedSignOut/FederatedSignoutAuthenticationHandlerProvider.cs
diff --git a/src/IdentityServer/src/Hosting/IEndpointHandler.cs b/src/IdentityServer/Hosting/IEndpointHandler.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/IEndpointHandler.cs
rename to src/IdentityServer/Hosting/IEndpointHandler.cs
diff --git a/src/IdentityServer/src/Hosting/IEndpointResult.cs b/src/IdentityServer/Hosting/IEndpointResult.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/IEndpointResult.cs
rename to src/IdentityServer/Hosting/IEndpointResult.cs
diff --git a/src/IdentityServer/src/Hosting/IEndpointRouter.cs b/src/IdentityServer/Hosting/IEndpointRouter.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/IEndpointRouter.cs
rename to src/IdentityServer/Hosting/IEndpointRouter.cs
diff --git a/src/IdentityServer/src/Hosting/IdentityServerAuthenticationService.cs b/src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/IdentityServerAuthenticationService.cs
rename to src/IdentityServer/Hosting/IdentityServerAuthenticationService.cs
diff --git a/src/IdentityServer/src/Hosting/IdentityServerMiddleware.cs b/src/IdentityServer/Hosting/IdentityServerMiddleware.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/IdentityServerMiddleware.cs
rename to src/IdentityServer/Hosting/IdentityServerMiddleware.cs
diff --git a/src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs
rename to src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationEvents.cs
diff --git a/src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
rename to src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationExtensions.cs
diff --git a/src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs
rename to src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationHandler.cs
diff --git a/src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationOptions.cs b/src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationOptions.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/LocalApiAuthentication/LocalApiAuthenticationOptions.cs
rename to src/IdentityServer/Hosting/LocalApiAuthentication/LocalApiAuthenticationOptions.cs
diff --git a/src/IdentityServer/src/Hosting/MutualTlsEndpointMiddleware.cs b/src/IdentityServer/Hosting/MutualTlsEndpointMiddleware.cs
similarity index 100%
rename from src/IdentityServer/src/Hosting/MutualTlsEndpointMiddleware.cs
rename to src/IdentityServer/Hosting/MutualTlsEndpointMiddleware.cs
diff --git a/src/IdentityServer/src/IdentityServerConstants.cs b/src/IdentityServer/IdentityServerConstants.cs
similarity index 100%
rename from src/IdentityServer/src/IdentityServerConstants.cs
rename to src/IdentityServer/IdentityServerConstants.cs
diff --git a/src/IdentityServer/src/IdentityServerTools.cs b/src/IdentityServer/IdentityServerTools.cs
similarity index 100%
rename from src/IdentityServer/src/IdentityServerTools.cs
rename to src/IdentityServer/IdentityServerTools.cs
diff --git a/src/IdentityServer/src/IdentityServerUser.cs b/src/IdentityServer/IdentityServerUser.cs
similarity index 100%
rename from src/IdentityServer/src/IdentityServerUser.cs
rename to src/IdentityServer/IdentityServerUser.cs
diff --git a/src/IdentityServer/src/Infrastructure/DistributedCacheStateDataFormatter.cs b/src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs
similarity index 100%
rename from src/IdentityServer/src/Infrastructure/DistributedCacheStateDataFormatter.cs
rename to src/IdentityServer/Infrastructure/DistributedCacheStateDataFormatter.cs
diff --git a/src/IdentityServer/src/Infrastructure/MessageCookie.cs b/src/IdentityServer/Infrastructure/MessageCookie.cs
similarity index 100%
rename from src/IdentityServer/src/Infrastructure/MessageCookie.cs
rename to src/IdentityServer/Infrastructure/MessageCookie.cs
diff --git a/src/IdentityServer/src/Infrastructure/ObjectSerializer.cs b/src/IdentityServer/Infrastructure/ObjectSerializer.cs
similarity index 100%
rename from src/IdentityServer/src/Infrastructure/ObjectSerializer.cs
rename to src/IdentityServer/Infrastructure/ObjectSerializer.cs
diff --git a/src/IdentityServer/src/Logging/LogSerializer.cs b/src/IdentityServer/Logging/LogSerializer.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/LogSerializer.cs
rename to src/IdentityServer/Logging/LogSerializer.cs
diff --git a/src/IdentityServer/src/Logging/Models/AuthorizeRequestValidationLog.cs b/src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/AuthorizeRequestValidationLog.cs
rename to src/IdentityServer/Logging/Models/AuthorizeRequestValidationLog.cs
diff --git a/src/IdentityServer/src/Logging/Models/AuthorizeResponseLog.cs b/src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/AuthorizeResponseLog.cs
rename to src/IdentityServer/Logging/Models/AuthorizeResponseLog.cs
diff --git a/src/IdentityServer/src/Logging/Models/DeviceAuthorizationRequestValidationLog.cs b/src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/DeviceAuthorizationRequestValidationLog.cs
rename to src/IdentityServer/Logging/Models/DeviceAuthorizationRequestValidationLog.cs
diff --git a/src/IdentityServer/src/Logging/Models/EndSessionRequestValidationLog.cs b/src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/EndSessionRequestValidationLog.cs
rename to src/IdentityServer/Logging/Models/EndSessionRequestValidationLog.cs
diff --git a/src/IdentityServer/src/Logging/Models/TokenRequestValidationLog.cs b/src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/TokenRequestValidationLog.cs
rename to src/IdentityServer/Logging/Models/TokenRequestValidationLog.cs
diff --git a/src/IdentityServer/src/Logging/Models/TokenValidationLog.cs b/src/IdentityServer/Logging/Models/TokenValidationLog.cs
similarity index 100%
rename from src/IdentityServer/src/Logging/Models/TokenValidationLog.cs
rename to src/IdentityServer/Logging/Models/TokenValidationLog.cs
diff --git a/src/IdentityServer/src/Models/Contexts/IsActiveContext.cs b/src/IdentityServer/Models/Contexts/IsActiveContext.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Contexts/IsActiveContext.cs
rename to src/IdentityServer/Models/Contexts/IsActiveContext.cs
diff --git a/src/IdentityServer/src/Models/Contexts/LogoutNotificationContext.cs b/src/IdentityServer/Models/Contexts/LogoutNotificationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Contexts/LogoutNotificationContext.cs
rename to src/IdentityServer/Models/Contexts/LogoutNotificationContext.cs
diff --git a/src/IdentityServer/src/Models/Contexts/ProfileDataRequestContext.cs b/src/IdentityServer/Models/Contexts/ProfileDataRequestContext.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Contexts/ProfileDataRequestContext.cs
rename to src/IdentityServer/Models/Contexts/ProfileDataRequestContext.cs
diff --git a/src/IdentityServer/src/Models/DeviceFlowAuthorizationRequest.cs b/src/IdentityServer/Models/DeviceFlowAuthorizationRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Models/DeviceFlowAuthorizationRequest.cs
rename to src/IdentityServer/Models/DeviceFlowAuthorizationRequest.cs
diff --git a/src/IdentityServer/src/Models/DeviceFlowInteractionResult.cs b/src/IdentityServer/Models/DeviceFlowInteractionResult.cs
similarity index 100%
rename from src/IdentityServer/src/Models/DeviceFlowInteractionResult.cs
rename to src/IdentityServer/Models/DeviceFlowInteractionResult.cs
diff --git a/src/IdentityServer/src/Models/DiscoveryDocument.cs b/src/IdentityServer/Models/DiscoveryDocument.cs
similarity index 100%
rename from src/IdentityServer/src/Models/DiscoveryDocument.cs
rename to src/IdentityServer/Models/DiscoveryDocument.cs
diff --git a/src/IdentityServer/src/Models/Grant.cs b/src/IdentityServer/Models/Grant.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Grant.cs
rename to src/IdentityServer/Models/Grant.cs
diff --git a/src/IdentityServer/src/Models/GrantTypes.cs b/src/IdentityServer/Models/GrantTypes.cs
similarity index 100%
rename from src/IdentityServer/src/Models/GrantTypes.cs
rename to src/IdentityServer/Models/GrantTypes.cs
diff --git a/src/IdentityServer/src/Models/IdentityResources.cs b/src/IdentityServer/Models/IdentityResources.cs
similarity index 100%
rename from src/IdentityServer/src/Models/IdentityResources.cs
rename to src/IdentityServer/Models/IdentityResources.cs
diff --git a/src/IdentityServer/src/Models/JsonWebKey.cs b/src/IdentityServer/Models/JsonWebKey.cs
similarity index 100%
rename from src/IdentityServer/src/Models/JsonWebKey.cs
rename to src/IdentityServer/Models/JsonWebKey.cs
diff --git a/src/IdentityServer/src/Models/Messages/AuthorizationRequest.cs b/src/IdentityServer/Models/Messages/AuthorizationRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/AuthorizationRequest.cs
rename to src/IdentityServer/Models/Messages/AuthorizationRequest.cs
diff --git a/src/IdentityServer/src/Models/Messages/ConsentRequest.cs b/src/IdentityServer/Models/Messages/ConsentRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/ConsentRequest.cs
rename to src/IdentityServer/Models/Messages/ConsentRequest.cs
diff --git a/src/IdentityServer/src/Models/Messages/ConsentResponse.cs b/src/IdentityServer/Models/Messages/ConsentResponse.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/ConsentResponse.cs
rename to src/IdentityServer/Models/Messages/ConsentResponse.cs
diff --git a/src/IdentityServer/src/Models/Messages/ErrorMessage.cs b/src/IdentityServer/Models/Messages/ErrorMessage.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/ErrorMessage.cs
rename to src/IdentityServer/Models/Messages/ErrorMessage.cs
diff --git a/src/IdentityServer/src/Models/Messages/LogoutRequest.cs b/src/IdentityServer/Models/Messages/LogoutRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/LogoutRequest.cs
rename to src/IdentityServer/Models/Messages/LogoutRequest.cs
diff --git a/src/IdentityServer/src/Models/Messages/Message.cs b/src/IdentityServer/Models/Messages/Message.cs
similarity index 100%
rename from src/IdentityServer/src/Models/Messages/Message.cs
rename to src/IdentityServer/Models/Messages/Message.cs
diff --git a/src/IdentityServer/src/Models/ParsedSecret.cs b/src/IdentityServer/Models/ParsedSecret.cs
similarity index 100%
rename from src/IdentityServer/src/Models/ParsedSecret.cs
rename to src/IdentityServer/Models/ParsedSecret.cs
diff --git a/src/IdentityServer/src/Models/SecurityKeyInfo.cs b/src/IdentityServer/Models/SecurityKeyInfo.cs
similarity index 100%
rename from src/IdentityServer/src/Models/SecurityKeyInfo.cs
rename to src/IdentityServer/Models/SecurityKeyInfo.cs
diff --git a/src/IdentityServer/src/Models/TokenCreationRequest.cs b/src/IdentityServer/Models/TokenCreationRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Models/TokenCreationRequest.cs
rename to src/IdentityServer/Models/TokenCreationRequest.cs
diff --git a/src/IdentityServer/src/Models/TokenRequestErrors.cs b/src/IdentityServer/Models/TokenRequestErrors.cs
similarity index 100%
rename from src/IdentityServer/src/Models/TokenRequestErrors.cs
rename to src/IdentityServer/Models/TokenRequestErrors.cs
diff --git a/src/IdentityServer/src/Properties/AssemblyInfo.cs b/src/IdentityServer/Properties/AssemblyInfo.cs
similarity index 55%
rename from src/IdentityServer/src/Properties/AssemblyInfo.cs
rename to src/IdentityServer/Properties/AssemblyInfo.cs
index 256faaf6e..52450d58e 100644
--- a/src/IdentityServer/src/Properties/AssemblyInfo.cs
+++ b/src/IdentityServer/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("UnitTests")]
-[assembly: InternalsVisibleTo("IntegrationTests")]
\ No newline at end of file
+[assembly: InternalsVisibleTo("IdentityServer.UnitTests")]
+[assembly: InternalsVisibleTo("IdentityServer.IntegrationTests")]
\ No newline at end of file
diff --git a/src/IdentityServer/src/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/AuthorizeInteractionResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/AuthorizeResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/AuthorizeResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/AuthorizeResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/DeviceAuthorizationResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/DiscoveryResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/DiscoveryResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/IntrospectionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/IntrospectionResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/IntrospectionResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/TokenResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/TokenResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/TokenResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/TokenRevocationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/TokenRevocationResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Default/UserInfoResponseGenerator.cs b/src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Default/UserInfoResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/Default/UserInfoResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IAuthorizeInteractionResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IAuthorizeResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IAuthorizeResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IAuthorizeResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IDeviceAuthorizationResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IDiscoveryResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IDiscoveryResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IDiscoveryResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IDiscoveryResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IIntrospectionResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IIntrospectionResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IIntrospectionResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/ITokenResponseGenerator.cs b/src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/ITokenResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/ITokenResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/ITokenRevocationResponseGenerator.cs b/src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/ITokenRevocationResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/ITokenRevocationResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/IUserInfoResponseGenerator.cs b/src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/IUserInfoResponseGenerator.cs
rename to src/IdentityServer/ResponseHandling/IUserInfoResponseGenerator.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/AuthorizeResponse.cs b/src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/AuthorizeResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/AuthorizeResponse.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/DeviceAuthorizationResponse.cs b/src/IdentityServer/ResponseHandling/Models/DeviceAuthorizationResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/DeviceAuthorizationResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/DeviceAuthorizationResponse.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/InteractionResponse.cs b/src/IdentityServer/ResponseHandling/Models/InteractionResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/InteractionResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/InteractionResponse.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/TokenErrorResponse.cs b/src/IdentityServer/ResponseHandling/Models/TokenErrorResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/TokenErrorResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/TokenErrorResponse.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/TokenResponse.cs b/src/IdentityServer/ResponseHandling/Models/TokenResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/TokenResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/TokenResponse.cs
diff --git a/src/IdentityServer/src/ResponseHandling/Models/TokenRevocationResponse.cs b/src/IdentityServer/ResponseHandling/Models/TokenRevocationResponse.cs
similarity index 100%
rename from src/IdentityServer/src/ResponseHandling/Models/TokenRevocationResponse.cs
rename to src/IdentityServer/ResponseHandling/Models/TokenRevocationResponse.cs
diff --git a/src/IdentityServer/src/Services/Default/BackChannelLogoutHttpClient.cs b/src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/BackChannelLogoutHttpClient.cs
rename to src/IdentityServer/Services/Default/BackChannelLogoutHttpClient.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultBackChannelLogoutService.cs b/src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultBackChannelLogoutService.cs
rename to src/IdentityServer/Services/Default/DefaultBackChannelLogoutService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultCache.cs b/src/IdentityServer/Services/Default/DefaultCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultCache.cs
rename to src/IdentityServer/Services/Default/DefaultCache.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultClaimsService.cs b/src/IdentityServer/Services/Default/DefaultClaimsService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultClaimsService.cs
rename to src/IdentityServer/Services/Default/DefaultClaimsService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultConsentService.cs b/src/IdentityServer/Services/Default/DefaultConsentService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultConsentService.cs
rename to src/IdentityServer/Services/Default/DefaultConsentService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultCorsPolicyService.cs b/src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultCorsPolicyService.cs
rename to src/IdentityServer/Services/Default/DefaultCorsPolicyService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultDeviceFlowCodeService.cs b/src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultDeviceFlowCodeService.cs
rename to src/IdentityServer/Services/Default/DefaultDeviceFlowCodeService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultDeviceFlowInteractionService.cs b/src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultDeviceFlowInteractionService.cs
rename to src/IdentityServer/Services/Default/DefaultDeviceFlowInteractionService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultEventService.cs b/src/IdentityServer/Services/Default/DefaultEventService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultEventService.cs
rename to src/IdentityServer/Services/Default/DefaultEventService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultEventSink.cs b/src/IdentityServer/Services/Default/DefaultEventSink.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultEventSink.cs
rename to src/IdentityServer/Services/Default/DefaultEventSink.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultHandleGenerationService.cs b/src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultHandleGenerationService.cs
rename to src/IdentityServer/Services/Default/DefaultHandleGenerationService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultIdentityServerInteractionService.cs b/src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultIdentityServerInteractionService.cs
rename to src/IdentityServer/Services/Default/DefaultIdentityServerInteractionService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultJwtRequestUriHttpClient.cs b/src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultJwtRequestUriHttpClient.cs
rename to src/IdentityServer/Services/Default/DefaultJwtRequestUriHttpClient.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultKeyMaterialService.cs b/src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultKeyMaterialService.cs
rename to src/IdentityServer/Services/Default/DefaultKeyMaterialService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultPersistedGrantService.cs b/src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultPersistedGrantService.cs
rename to src/IdentityServer/Services/Default/DefaultPersistedGrantService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultProfileService.cs b/src/IdentityServer/Services/Default/DefaultProfileService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultProfileService.cs
rename to src/IdentityServer/Services/Default/DefaultProfileService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultRefreshTokenService.cs b/src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultRefreshTokenService.cs
rename to src/IdentityServer/Services/Default/DefaultRefreshTokenService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultReplayCache.cs b/src/IdentityServer/Services/Default/DefaultReplayCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultReplayCache.cs
rename to src/IdentityServer/Services/Default/DefaultReplayCache.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultTokenCreationService.cs b/src/IdentityServer/Services/Default/DefaultTokenCreationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultTokenCreationService.cs
rename to src/IdentityServer/Services/Default/DefaultTokenCreationService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultTokenService.cs b/src/IdentityServer/Services/Default/DefaultTokenService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultTokenService.cs
rename to src/IdentityServer/Services/Default/DefaultTokenService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultUserCodeService.cs b/src/IdentityServer/Services/Default/DefaultUserCodeService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultUserCodeService.cs
rename to src/IdentityServer/Services/Default/DefaultUserCodeService.cs
diff --git a/src/IdentityServer/src/Services/Default/DefaultUserSession.cs b/src/IdentityServer/Services/Default/DefaultUserSession.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DefaultUserSession.cs
rename to src/IdentityServer/Services/Default/DefaultUserSession.cs
diff --git a/src/IdentityServer/src/Services/Default/DistributedDeviceFlowThrottlingService.cs b/src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/DistributedDeviceFlowThrottlingService.cs
rename to src/IdentityServer/Services/Default/DistributedDeviceFlowThrottlingService.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs b/src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
rename to src/IdentityServer/Services/Default/KeyManagement/AutomaticKeyManagerKeyStore.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/ClientConfigurationValidator.cs b/src/IdentityServer/Services/Default/KeyManagement/ClientConfigurationValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/ClientConfigurationValidator.cs
rename to src/IdentityServer/Services/Default/KeyManagement/ClientConfigurationValidator.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/DataProtectionKeyProtector.cs b/src/IdentityServer/Services/Default/KeyManagement/DataProtectionKeyProtector.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/DataProtectionKeyProtector.cs
rename to src/IdentityServer/Services/Default/KeyManagement/DataProtectionKeyProtector.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/DefaultKeyLock.cs b/src/IdentityServer/Services/Default/KeyManagement/DefaultKeyLock.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/DefaultKeyLock.cs
rename to src/IdentityServer/Services/Default/KeyManagement/DefaultKeyLock.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/EcKeyContainer.cs b/src/IdentityServer/Services/Default/KeyManagement/EcKeyContainer.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/EcKeyContainer.cs
rename to src/IdentityServer/Services/Default/KeyManagement/EcKeyContainer.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/FileSystemKeyStore.cs b/src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/FileSystemKeyStore.cs
rename to src/IdentityServer/Services/Default/KeyManagement/FileSystemKeyStore.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/IKeyManager.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/IKeyManager.cs
rename to src/IdentityServer/Services/Default/KeyManagement/IKeyManager.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/IKeyProtector.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/IKeyProtector.cs
rename to src/IdentityServer/Services/Default/KeyManagement/IKeyProtector.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/IKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/IKeyStoreCache.cs
rename to src/IdentityServer/Services/Default/KeyManagement/IKeyStoreCache.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/INewKeyLock.cs b/src/IdentityServer/Services/Default/KeyManagement/INewKeyLock.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/INewKeyLock.cs
rename to src/IdentityServer/Services/Default/KeyManagement/INewKeyLock.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
rename to src/IdentityServer/Services/Default/KeyManagement/InMemoryKeyStoreCache.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/KeyContainer.cs b/src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/KeyContainer.cs
rename to src/IdentityServer/Services/Default/KeyManagement/KeyContainer.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/KeyManager.cs b/src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/KeyManager.cs
rename to src/IdentityServer/Services/Default/KeyManagement/KeyManager.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/KeySerializer.cs b/src/IdentityServer/Services/Default/KeyManagement/KeySerializer.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/KeySerializer.cs
rename to src/IdentityServer/Services/Default/KeyManagement/KeySerializer.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/NopKeyLock.cs b/src/IdentityServer/Services/Default/KeyManagement/NopKeyLock.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/NopKeyLock.cs
rename to src/IdentityServer/Services/Default/KeyManagement/NopKeyLock.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/NopKeyStoreCache.cs b/src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/NopKeyStoreCache.cs
rename to src/IdentityServer/Services/Default/KeyManagement/NopKeyStoreCache.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/RsaKeyContainer.cs b/src/IdentityServer/Services/Default/KeyManagement/RsaKeyContainer.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/RsaKeyContainer.cs
rename to src/IdentityServer/Services/Default/KeyManagement/RsaKeyContainer.cs
diff --git a/src/IdentityServer/src/Services/Default/KeyManagement/X509KeyContainer.cs b/src/IdentityServer/Services/Default/KeyManagement/X509KeyContainer.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/KeyManagement/X509KeyContainer.cs
rename to src/IdentityServer/Services/Default/KeyManagement/X509KeyContainer.cs
diff --git a/src/IdentityServer/src/Services/Default/LogoutNotificationService.cs b/src/IdentityServer/Services/Default/LogoutNotificationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/LogoutNotificationService.cs
rename to src/IdentityServer/Services/Default/LogoutNotificationService.cs
diff --git a/src/IdentityServer/src/Services/Default/NumericUserCodeGenerator.cs b/src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/NumericUserCodeGenerator.cs
rename to src/IdentityServer/Services/Default/NumericUserCodeGenerator.cs
diff --git a/src/IdentityServer/src/Services/Default/OidcReturnUrlParser.cs b/src/IdentityServer/Services/Default/OidcReturnUrlParser.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/OidcReturnUrlParser.cs
rename to src/IdentityServer/Services/Default/OidcReturnUrlParser.cs
diff --git a/src/IdentityServer/src/Services/Default/ReturnUrlParser.cs b/src/IdentityServer/Services/Default/ReturnUrlParser.cs
similarity index 100%
rename from src/IdentityServer/src/Services/Default/ReturnUrlParser.cs
rename to src/IdentityServer/Services/Default/ReturnUrlParser.cs
diff --git a/src/IdentityServer/src/Services/IBackChannelLogoutHttpClient.cs b/src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IBackChannelLogoutHttpClient.cs
rename to src/IdentityServer/Services/IBackChannelLogoutHttpClient.cs
diff --git a/src/IdentityServer/src/Services/IBackChannelLogoutService.cs b/src/IdentityServer/Services/IBackChannelLogoutService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IBackChannelLogoutService.cs
rename to src/IdentityServer/Services/IBackChannelLogoutService.cs
diff --git a/src/IdentityServer/src/Services/ICache.cs b/src/IdentityServer/Services/ICache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/ICache.cs
rename to src/IdentityServer/Services/ICache.cs
diff --git a/src/IdentityServer/src/Services/IClaimsService.cs b/src/IdentityServer/Services/IClaimsService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IClaimsService.cs
rename to src/IdentityServer/Services/IClaimsService.cs
diff --git a/src/IdentityServer/src/Services/IConsentService.cs b/src/IdentityServer/Services/IConsentService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IConsentService.cs
rename to src/IdentityServer/Services/IConsentService.cs
diff --git a/src/IdentityServer/src/Services/IDeviceFlowCodeService.cs b/src/IdentityServer/Services/IDeviceFlowCodeService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IDeviceFlowCodeService.cs
rename to src/IdentityServer/Services/IDeviceFlowCodeService.cs
diff --git a/src/IdentityServer/src/Services/IDeviceFlowInteractionService.cs b/src/IdentityServer/Services/IDeviceFlowInteractionService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IDeviceFlowInteractionService.cs
rename to src/IdentityServer/Services/IDeviceFlowInteractionService.cs
diff --git a/src/IdentityServer/src/Services/IDeviceFlowThrottlingService.cs b/src/IdentityServer/Services/IDeviceFlowThrottlingService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IDeviceFlowThrottlingService.cs
rename to src/IdentityServer/Services/IDeviceFlowThrottlingService.cs
diff --git a/src/IdentityServer/src/Services/IEventService.cs b/src/IdentityServer/Services/IEventService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IEventService.cs
rename to src/IdentityServer/Services/IEventService.cs
diff --git a/src/IdentityServer/src/Services/IEventSink.cs b/src/IdentityServer/Services/IEventSink.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IEventSink.cs
rename to src/IdentityServer/Services/IEventSink.cs
diff --git a/src/IdentityServer/src/Services/IHandleGenerationService.cs b/src/IdentityServer/Services/IHandleGenerationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IHandleGenerationService.cs
rename to src/IdentityServer/Services/IHandleGenerationService.cs
diff --git a/src/IdentityServer/src/Services/IIdentityServerInteractionService.cs b/src/IdentityServer/Services/IIdentityServerInteractionService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IIdentityServerInteractionService.cs
rename to src/IdentityServer/Services/IIdentityServerInteractionService.cs
diff --git a/src/IdentityServer/src/Services/IJwtRequestUriHttpClient.cs b/src/IdentityServer/Services/IJwtRequestUriHttpClient.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IJwtRequestUriHttpClient.cs
rename to src/IdentityServer/Services/IJwtRequestUriHttpClient.cs
diff --git a/src/IdentityServer/src/Services/IKeyMaterialService.cs b/src/IdentityServer/Services/IKeyMaterialService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IKeyMaterialService.cs
rename to src/IdentityServer/Services/IKeyMaterialService.cs
diff --git a/src/IdentityServer/src/Services/ILogoutNotificationService.cs b/src/IdentityServer/Services/ILogoutNotificationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/ILogoutNotificationService.cs
rename to src/IdentityServer/Services/ILogoutNotificationService.cs
diff --git a/src/IdentityServer/src/Services/IPersistedGrantService.cs b/src/IdentityServer/Services/IPersistedGrantService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IPersistedGrantService.cs
rename to src/IdentityServer/Services/IPersistedGrantService.cs
diff --git a/src/IdentityServer/src/Services/IProfileService.cs b/src/IdentityServer/Services/IProfileService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IProfileService.cs
rename to src/IdentityServer/Services/IProfileService.cs
diff --git a/src/IdentityServer/src/Services/IRefreshTokenService.cs b/src/IdentityServer/Services/IRefreshTokenService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IRefreshTokenService.cs
rename to src/IdentityServer/Services/IRefreshTokenService.cs
diff --git a/src/IdentityServer/src/Services/IReplayCache.cs b/src/IdentityServer/Services/IReplayCache.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IReplayCache.cs
rename to src/IdentityServer/Services/IReplayCache.cs
diff --git a/src/IdentityServer/src/Services/IReturnUrlParser.cs b/src/IdentityServer/Services/IReturnUrlParser.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IReturnUrlParser.cs
rename to src/IdentityServer/Services/IReturnUrlParser.cs
diff --git a/src/IdentityServer/src/Services/ITokenCreationService.cs b/src/IdentityServer/Services/ITokenCreationService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/ITokenCreationService.cs
rename to src/IdentityServer/Services/ITokenCreationService.cs
diff --git a/src/IdentityServer/src/Services/ITokenService.cs b/src/IdentityServer/Services/ITokenService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/ITokenService.cs
rename to src/IdentityServer/Services/ITokenService.cs
diff --git a/src/IdentityServer/src/Services/IUserCodeGenerator.cs b/src/IdentityServer/Services/IUserCodeGenerator.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IUserCodeGenerator.cs
rename to src/IdentityServer/Services/IUserCodeGenerator.cs
diff --git a/src/IdentityServer/src/Services/IUserCodeService.cs b/src/IdentityServer/Services/IUserCodeService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IUserCodeService.cs
rename to src/IdentityServer/Services/IUserCodeService.cs
diff --git a/src/IdentityServer/src/Services/IUserSession.cs b/src/IdentityServer/Services/IUserSession.cs
similarity index 100%
rename from src/IdentityServer/src/Services/IUserSession.cs
rename to src/IdentityServer/Services/IUserSession.cs
diff --git a/src/IdentityServer/src/Services/InMemory/InMemoryCorsPolicyService.cs b/src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs
similarity index 100%
rename from src/IdentityServer/src/Services/InMemory/InMemoryCorsPolicyService.cs
rename to src/IdentityServer/Services/InMemory/InMemoryCorsPolicyService.cs
diff --git a/src/IdentityServer/src/Stores/Caching/CachingClientStore.cs b/src/IdentityServer/Stores/Caching/CachingClientStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Caching/CachingClientStore.cs
rename to src/IdentityServer/Stores/Caching/CachingClientStore.cs
diff --git a/src/IdentityServer/src/Stores/Caching/CachingCorsPolicyService.cs b/src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Caching/CachingCorsPolicyService.cs
rename to src/IdentityServer/Stores/Caching/CachingCorsPolicyService.cs
diff --git a/src/IdentityServer/src/Stores/Caching/CachingResourceStore.cs b/src/IdentityServer/Stores/Caching/CachingResourceStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Caching/CachingResourceStore.cs
rename to src/IdentityServer/Stores/Caching/CachingResourceStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/ConsentMessageStore.cs b/src/IdentityServer/Stores/Default/ConsentMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/ConsentMessageStore.cs
rename to src/IdentityServer/Stores/Default/ConsentMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DefaultAuthorizationCodeStore.cs b/src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DefaultAuthorizationCodeStore.cs
rename to src/IdentityServer/Stores/Default/DefaultAuthorizationCodeStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DefaultGrantStore.cs b/src/IdentityServer/Stores/Default/DefaultGrantStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DefaultGrantStore.cs
rename to src/IdentityServer/Stores/Default/DefaultGrantStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DefaultReferenceTokenStore.cs b/src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DefaultReferenceTokenStore.cs
rename to src/IdentityServer/Stores/Default/DefaultReferenceTokenStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DefaultRefreshTokenStore.cs b/src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DefaultRefreshTokenStore.cs
rename to src/IdentityServer/Stores/Default/DefaultRefreshTokenStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DefaultUserConsentStore.cs b/src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DefaultUserConsentStore.cs
rename to src/IdentityServer/Stores/Default/DefaultUserConsentStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs b/src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs
rename to src/IdentityServer/Stores/Default/DistributedCacheAuthorizationParametersMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/ProtectedDataMessageStore.cs b/src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/ProtectedDataMessageStore.cs
rename to src/IdentityServer/Stores/Default/ProtectedDataMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs b/src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs
rename to src/IdentityServer/Stores/Default/QueryStringAuthorizationParametersMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/IAuthorizationParametersMessageStore.cs b/src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/IAuthorizationParametersMessageStore.cs
rename to src/IdentityServer/Stores/IAuthorizationParametersMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/IConsentMessageStore.cs b/src/IdentityServer/Stores/IConsentMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/IConsentMessageStore.cs
rename to src/IdentityServer/Stores/IConsentMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/IMessageStore.cs b/src/IdentityServer/Stores/IMessageStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/IMessageStore.cs
rename to src/IdentityServer/Stores/IMessageStore.cs
diff --git a/src/IdentityServer/src/Stores/ISigningCredentialStore.cs b/src/IdentityServer/Stores/ISigningCredentialStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/ISigningCredentialStore.cs
rename to src/IdentityServer/Stores/ISigningCredentialStore.cs
diff --git a/src/IdentityServer/src/Stores/IValidationKeysStore.cs b/src/IdentityServer/Stores/IValidationKeysStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/IValidationKeysStore.cs
rename to src/IdentityServer/Stores/IValidationKeysStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemoryClientStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryClientStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemoryClientStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemoryClientStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemoryDeviceFlowStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemoryDeviceFlowStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemoryDeviceFlowStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemoryPersistedGrantStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemoryPersistedGrantStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemoryPersistedGrantStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemoryResourcesStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryResourcesStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemoryResourcesStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemoryResourcesStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemorySigningCredentialsStore.cs b/src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemorySigningCredentialsStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemorySigningCredentialsStore.cs
diff --git a/src/IdentityServer/src/Stores/InMemory/InMemoryValidationKeysStore.cs b/src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/InMemory/InMemoryValidationKeysStore.cs
rename to src/IdentityServer/Stores/InMemory/InMemoryValidationKeysStore.cs
diff --git a/src/IdentityServer/src/Stores/ValidatingClientStore.cs b/src/IdentityServer/Stores/ValidatingClientStore.cs
similarity index 100%
rename from src/IdentityServer/src/Stores/ValidatingClientStore.cs
rename to src/IdentityServer/Stores/ValidatingClientStore.cs
diff --git a/src/IdentityServer/src/Test/IdentityServerBuilderExtensions.cs b/src/IdentityServer/Test/IdentityServerBuilderExtensions.cs
similarity index 100%
rename from src/IdentityServer/src/Test/IdentityServerBuilderExtensions.cs
rename to src/IdentityServer/Test/IdentityServerBuilderExtensions.cs
diff --git a/src/IdentityServer/src/Test/TestUser.cs b/src/IdentityServer/Test/TestUser.cs
similarity index 100%
rename from src/IdentityServer/src/Test/TestUser.cs
rename to src/IdentityServer/Test/TestUser.cs
diff --git a/src/IdentityServer/src/Test/TestUserProfileService.cs b/src/IdentityServer/Test/TestUserProfileService.cs
similarity index 100%
rename from src/IdentityServer/src/Test/TestUserProfileService.cs
rename to src/IdentityServer/Test/TestUserProfileService.cs
diff --git a/src/IdentityServer/src/Test/TestUserResourceOwnerPasswordValidator.cs b/src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Test/TestUserResourceOwnerPasswordValidator.cs
rename to src/IdentityServer/Test/TestUserResourceOwnerPasswordValidator.cs
diff --git a/src/IdentityServer/src/Test/TestUserStore.cs b/src/IdentityServer/Test/TestUserStore.cs
similarity index 100%
rename from src/IdentityServer/src/Test/TestUserStore.cs
rename to src/IdentityServer/Test/TestUserStore.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/ClientConfigurationValidationContext.cs b/src/IdentityServer/Validation/Contexts/ClientConfigurationValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/ClientConfigurationValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/ClientConfigurationValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/CustomAuthorizeRequestValidationContext.cs b/src/IdentityServer/Validation/Contexts/CustomAuthorizeRequestValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/CustomAuthorizeRequestValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/CustomAuthorizeRequestValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/CustomTokenRequestValidationContext.cs b/src/IdentityServer/Validation/Contexts/CustomTokenRequestValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/CustomTokenRequestValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/CustomTokenRequestValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/ExtensionGrantValidationContext.cs b/src/IdentityServer/Validation/Contexts/ExtensionGrantValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/ExtensionGrantValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/ExtensionGrantValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/ResourceOwnerPasswordValidationContext.cs b/src/IdentityServer/Validation/Contexts/ResourceOwnerPasswordValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/ResourceOwnerPasswordValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/ResourceOwnerPasswordValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Contexts/ResourceValidationContext.cs b/src/IdentityServer/Validation/Contexts/ResourceValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Contexts/ResourceValidationContext.cs
rename to src/IdentityServer/Validation/Contexts/ResourceValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Default/ApiSecretValidator.cs b/src/IdentityServer/Validation/Default/ApiSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/ApiSecretValidator.cs
rename to src/IdentityServer/Validation/Default/ApiSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/AuthorizeRequestValidator.cs b/src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/AuthorizeRequestValidator.cs
rename to src/IdentityServer/Validation/Default/AuthorizeRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/BasicAuthenticationSecretParser.cs b/src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/BasicAuthenticationSecretParser.cs
rename to src/IdentityServer/Validation/Default/BasicAuthenticationSecretParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/BearerTokenUsageValidator.cs b/src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/BearerTokenUsageValidator.cs
rename to src/IdentityServer/Validation/Default/BearerTokenUsageValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/ClientSecretValidator.cs b/src/IdentityServer/Validation/Default/ClientSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/ClientSecretValidator.cs
rename to src/IdentityServer/Validation/Default/ClientSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultClientConfigurationValidator.cs b/src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultClientConfigurationValidator.cs
rename to src/IdentityServer/Validation/Default/DefaultClientConfigurationValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultCustomAuthorizeRequestValidator.cs b/src/IdentityServer/Validation/Default/DefaultCustomAuthorizeRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultCustomAuthorizeRequestValidator.cs
rename to src/IdentityServer/Validation/Default/DefaultCustomAuthorizeRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultCustomTokenRequestValidator.cs b/src/IdentityServer/Validation/Default/DefaultCustomTokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultCustomTokenRequestValidator.cs
rename to src/IdentityServer/Validation/Default/DefaultCustomTokenRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultCustomTokenValidator.cs b/src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultCustomTokenValidator.cs
rename to src/IdentityServer/Validation/Default/DefaultCustomTokenValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultResourceValidator.cs b/src/IdentityServer/Validation/Default/DefaultResourceValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultResourceValidator.cs
rename to src/IdentityServer/Validation/Default/DefaultResourceValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DefaultScopeParser.cs b/src/IdentityServer/Validation/Default/DefaultScopeParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DefaultScopeParser.cs
rename to src/IdentityServer/Validation/Default/DefaultScopeParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/DeviceAuthorizationRequestValidator.cs b/src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DeviceAuthorizationRequestValidator.cs
rename to src/IdentityServer/Validation/Default/DeviceAuthorizationRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/DeviceCodeValidator.cs b/src/IdentityServer/Validation/Default/DeviceCodeValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/DeviceCodeValidator.cs
rename to src/IdentityServer/Validation/Default/DeviceCodeValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/EndSessionRequestValidator.cs b/src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/EndSessionRequestValidator.cs
rename to src/IdentityServer/Validation/Default/EndSessionRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/ExtensionGrantValidator.cs b/src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/ExtensionGrantValidator.cs
rename to src/IdentityServer/Validation/Default/ExtensionGrantValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/HashedSharedSecretValidator.cs b/src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/HashedSharedSecretValidator.cs
rename to src/IdentityServer/Validation/Default/HashedSharedSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/IntrospectionRequestValidator.cs b/src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/IntrospectionRequestValidator.cs
rename to src/IdentityServer/Validation/Default/IntrospectionRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/JwtBearerClientAssertionSecretParser.cs b/src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/JwtBearerClientAssertionSecretParser.cs
rename to src/IdentityServer/Validation/Default/JwtBearerClientAssertionSecretParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/JwtRequestValidator.cs b/src/IdentityServer/Validation/Default/JwtRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/JwtRequestValidator.cs
rename to src/IdentityServer/Validation/Default/JwtRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/MutualTlsSecretParser.cs b/src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/MutualTlsSecretParser.cs
rename to src/IdentityServer/Validation/Default/MutualTlsSecretParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/NopClientConfigurationValidator.cs b/src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/NopClientConfigurationValidator.cs
rename to src/IdentityServer/Validation/Default/NopClientConfigurationValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs b/src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
rename to src/IdentityServer/Validation/Default/NotSupportedResouceOwnerCredentialValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/PlainTextSharedSecretValidator.cs b/src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/PlainTextSharedSecretValidator.cs
rename to src/IdentityServer/Validation/Default/PlainTextSharedSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/PostBodySecretParser.cs b/src/IdentityServer/Validation/Default/PostBodySecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/PostBodySecretParser.cs
rename to src/IdentityServer/Validation/Default/PostBodySecretParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/PrivateKeyJwtSecretValidator.cs b/src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/PrivateKeyJwtSecretValidator.cs
rename to src/IdentityServer/Validation/Default/PrivateKeyJwtSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/ResponseTypeEqualityComparer.cs b/src/IdentityServer/Validation/Default/ResponseTypeEqualityComparer.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/ResponseTypeEqualityComparer.cs
rename to src/IdentityServer/Validation/Default/ResponseTypeEqualityComparer.cs
diff --git a/src/IdentityServer/src/Validation/Default/SecretParser.cs b/src/IdentityServer/Validation/Default/SecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/SecretParser.cs
rename to src/IdentityServer/Validation/Default/SecretParser.cs
diff --git a/src/IdentityServer/src/Validation/Default/SecretValidator.cs b/src/IdentityServer/Validation/Default/SecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/SecretValidator.cs
rename to src/IdentityServer/Validation/Default/SecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/StrictRedirectUriValidator.cs b/src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/StrictRedirectUriValidator.cs
rename to src/IdentityServer/Validation/Default/StrictRedirectUriValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/StrictRedirectUriValidatorAppAuth.cs b/src/IdentityServer/Validation/Default/StrictRedirectUriValidatorAppAuth.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/StrictRedirectUriValidatorAppAuth.cs
rename to src/IdentityServer/Validation/Default/StrictRedirectUriValidatorAppAuth.cs
diff --git a/src/IdentityServer/src/Validation/Default/TokenRequestValidator.cs b/src/IdentityServer/Validation/Default/TokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/TokenRequestValidator.cs
rename to src/IdentityServer/Validation/Default/TokenRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/TokenRevocationRequestValidator.cs b/src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/TokenRevocationRequestValidator.cs
rename to src/IdentityServer/Validation/Default/TokenRevocationRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/TokenValidator.cs b/src/IdentityServer/Validation/Default/TokenValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/TokenValidator.cs
rename to src/IdentityServer/Validation/Default/TokenValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/UserInfoRequestValidator.cs b/src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/UserInfoRequestValidator.cs
rename to src/IdentityServer/Validation/Default/UserInfoRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/X509NameSecretValidator.cs b/src/IdentityServer/Validation/Default/X509NameSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/X509NameSecretValidator.cs
rename to src/IdentityServer/Validation/Default/X509NameSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/Default/X509ThumbprintSecretValidator.cs b/src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Default/X509ThumbprintSecretValidator.cs
rename to src/IdentityServer/Validation/Default/X509ThumbprintSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/IApiSecretValidator.cs b/src/IdentityServer/Validation/IApiSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IApiSecretValidator.cs
rename to src/IdentityServer/Validation/IApiSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/IAuthorizeRequestValidator.cs b/src/IdentityServer/Validation/IAuthorizeRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IAuthorizeRequestValidator.cs
rename to src/IdentityServer/Validation/IAuthorizeRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/IClientConfigurationValidator.cs b/src/IdentityServer/Validation/IClientConfigurationValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IClientConfigurationValidator.cs
rename to src/IdentityServer/Validation/IClientConfigurationValidator.cs
diff --git a/src/IdentityServer/src/Validation/IClientSecretValidator.cs b/src/IdentityServer/Validation/IClientSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IClientSecretValidator.cs
rename to src/IdentityServer/Validation/IClientSecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/ICustomAuthorizeRequestValidator.cs b/src/IdentityServer/Validation/ICustomAuthorizeRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ICustomAuthorizeRequestValidator.cs
rename to src/IdentityServer/Validation/ICustomAuthorizeRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/ICustomTokenRequestValidator.cs b/src/IdentityServer/Validation/ICustomTokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ICustomTokenRequestValidator.cs
rename to src/IdentityServer/Validation/ICustomTokenRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/ICustomTokenValidator.cs b/src/IdentityServer/Validation/ICustomTokenValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ICustomTokenValidator.cs
rename to src/IdentityServer/Validation/ICustomTokenValidator.cs
diff --git a/src/IdentityServer/src/Validation/IDeviceAuthorizationRequestValidator.cs b/src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IDeviceAuthorizationRequestValidator.cs
rename to src/IdentityServer/Validation/IDeviceAuthorizationRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/IDeviceCodeValidator.cs b/src/IdentityServer/Validation/IDeviceCodeValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IDeviceCodeValidator.cs
rename to src/IdentityServer/Validation/IDeviceCodeValidator.cs
diff --git a/src/IdentityServer/src/Validation/IEndSessionRequestValidator.cs b/src/IdentityServer/Validation/IEndSessionRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IEndSessionRequestValidator.cs
rename to src/IdentityServer/Validation/IEndSessionRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/IExtensionGrantValidator.cs b/src/IdentityServer/Validation/IExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IExtensionGrantValidator.cs
rename to src/IdentityServer/Validation/IExtensionGrantValidator.cs
diff --git a/src/IdentityServer/src/Validation/IIntrospectionRequestValidator.cs b/src/IdentityServer/Validation/IIntrospectionRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IIntrospectionRequestValidator.cs
rename to src/IdentityServer/Validation/IIntrospectionRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/IRedirectUriValidator.cs b/src/IdentityServer/Validation/IRedirectUriValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IRedirectUriValidator.cs
rename to src/IdentityServer/Validation/IRedirectUriValidator.cs
diff --git a/src/IdentityServer/src/Validation/IResourceOwnerPasswordValidator.cs b/src/IdentityServer/Validation/IResourceOwnerPasswordValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IResourceOwnerPasswordValidator.cs
rename to src/IdentityServer/Validation/IResourceOwnerPasswordValidator.cs
diff --git a/src/IdentityServer/src/Validation/IResourceValidator.cs b/src/IdentityServer/Validation/IResourceValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IResourceValidator.cs
rename to src/IdentityServer/Validation/IResourceValidator.cs
diff --git a/src/IdentityServer/src/Validation/IScopeParser.cs b/src/IdentityServer/Validation/IScopeParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IScopeParser.cs
rename to src/IdentityServer/Validation/IScopeParser.cs
diff --git a/src/IdentityServer/src/Validation/ISecretParser.cs b/src/IdentityServer/Validation/ISecretParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ISecretParser.cs
rename to src/IdentityServer/Validation/ISecretParser.cs
diff --git a/src/IdentityServer/src/Validation/ISecretValidator.cs b/src/IdentityServer/Validation/ISecretValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ISecretValidator.cs
rename to src/IdentityServer/Validation/ISecretValidator.cs
diff --git a/src/IdentityServer/src/Validation/ISecretsListParser.cs b/src/IdentityServer/Validation/ISecretsListParser.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ISecretsListParser.cs
rename to src/IdentityServer/Validation/ISecretsListParser.cs
diff --git a/src/IdentityServer/src/Validation/ISecretsListValidator.cs b/src/IdentityServer/Validation/ISecretsListValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ISecretsListValidator.cs
rename to src/IdentityServer/Validation/ISecretsListValidator.cs
diff --git a/src/IdentityServer/src/Validation/ITokenRequestValidator.cs b/src/IdentityServer/Validation/ITokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ITokenRequestValidator.cs
rename to src/IdentityServer/Validation/ITokenRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/ITokenRevocationRequestValidator.cs b/src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ITokenRevocationRequestValidator.cs
rename to src/IdentityServer/Validation/ITokenRevocationRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/ITokenValidator.cs b/src/IdentityServer/Validation/ITokenValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/ITokenValidator.cs
rename to src/IdentityServer/Validation/ITokenValidator.cs
diff --git a/src/IdentityServer/src/Validation/IUserInfoRequestValidator.cs b/src/IdentityServer/Validation/IUserInfoRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/IUserInfoRequestValidator.cs
rename to src/IdentityServer/Validation/IUserInfoRequestValidator.cs
diff --git a/src/IdentityServer/src/Validation/Models/AuthorizeRequestValidationResult.cs b/src/IdentityServer/Validation/Models/AuthorizeRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/AuthorizeRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/AuthorizeRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/BearerTokenUsageType.cs b/src/IdentityServer/Validation/Models/BearerTokenUsageType.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/BearerTokenUsageType.cs
rename to src/IdentityServer/Validation/Models/BearerTokenUsageType.cs
diff --git a/src/IdentityServer/src/Validation/Models/BearerTokenUsageValidationResult.cs b/src/IdentityServer/Validation/Models/BearerTokenUsageValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/BearerTokenUsageValidationResult.cs
rename to src/IdentityServer/Validation/Models/BearerTokenUsageValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/ClientSecretValidationResult.cs b/src/IdentityServer/Validation/Models/ClientSecretValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ClientSecretValidationResult.cs
rename to src/IdentityServer/Validation/Models/ClientSecretValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/DeviceAuthorizationRequestValidationResult.cs b/src/IdentityServer/Validation/Models/DeviceAuthorizationRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/DeviceAuthorizationRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/DeviceAuthorizationRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/DeviceCodeValidationContext.cs b/src/IdentityServer/Validation/Models/DeviceCodeValidationContext.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/DeviceCodeValidationContext.cs
rename to src/IdentityServer/Validation/Models/DeviceCodeValidationContext.cs
diff --git a/src/IdentityServer/src/Validation/Models/EndSessionCallbackValidationResult.cs b/src/IdentityServer/Validation/Models/EndSessionCallbackValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/EndSessionCallbackValidationResult.cs
rename to src/IdentityServer/Validation/Models/EndSessionCallbackValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/EndSessionValidationResult.cs b/src/IdentityServer/Validation/Models/EndSessionValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/EndSessionValidationResult.cs
rename to src/IdentityServer/Validation/Models/EndSessionValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/GrantValidationResult.cs b/src/IdentityServer/Validation/Models/GrantValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/GrantValidationResult.cs
rename to src/IdentityServer/Validation/Models/GrantValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/IntrospectionRequestValidationResult.cs b/src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/IntrospectionRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/IntrospectionRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/JwtRequestValidationResult.cs b/src/IdentityServer/Validation/Models/JwtRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/JwtRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/JwtRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/ParsedScopeValidationError.cs b/src/IdentityServer/Validation/Models/ParsedScopeValidationError.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ParsedScopeValidationError.cs
rename to src/IdentityServer/Validation/Models/ParsedScopeValidationError.cs
diff --git a/src/IdentityServer/src/Validation/Models/ParsedScopeValue.cs b/src/IdentityServer/Validation/Models/ParsedScopeValue.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ParsedScopeValue.cs
rename to src/IdentityServer/Validation/Models/ParsedScopeValue.cs
diff --git a/src/IdentityServer/src/Validation/Models/ParsedScopesResult.cs b/src/IdentityServer/Validation/Models/ParsedScopesResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ParsedScopesResult.cs
rename to src/IdentityServer/Validation/Models/ParsedScopesResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/ResourceValidationRequest.cs b/src/IdentityServer/Validation/Models/ResourceValidationRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ResourceValidationRequest.cs
rename to src/IdentityServer/Validation/Models/ResourceValidationRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ResourceValidationResult.cs b/src/IdentityServer/Validation/Models/ResourceValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ResourceValidationResult.cs
rename to src/IdentityServer/Validation/Models/ResourceValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/ScopeSecretValidationResult.cs b/src/IdentityServer/Validation/Models/ScopeSecretValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ScopeSecretValidationResult.cs
rename to src/IdentityServer/Validation/Models/ScopeSecretValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/SecretValidationResult.cs b/src/IdentityServer/Validation/Models/SecretValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/SecretValidationResult.cs
rename to src/IdentityServer/Validation/Models/SecretValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/TokenRequestValidationResult.cs b/src/IdentityServer/Validation/Models/TokenRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/TokenRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/TokenRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/TokenRevocationRequestValidationResult.cs b/src/IdentityServer/Validation/Models/TokenRevocationRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/TokenRevocationRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/TokenRevocationRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/TokenValidationResult.cs b/src/IdentityServer/Validation/Models/TokenValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/TokenValidationResult.cs
rename to src/IdentityServer/Validation/Models/TokenValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/UserInfoRequestValidationResult.cs b/src/IdentityServer/Validation/Models/UserInfoRequestValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/UserInfoRequestValidationResult.cs
rename to src/IdentityServer/Validation/Models/UserInfoRequestValidationResult.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidatedAuthorizeRequest.cs b/src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidatedAuthorizeRequest.cs
rename to src/IdentityServer/Validation/Models/ValidatedAuthorizeRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidatedDeviceAuthorizationRequest.cs b/src/IdentityServer/Validation/Models/ValidatedDeviceAuthorizationRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidatedDeviceAuthorizationRequest.cs
rename to src/IdentityServer/Validation/Models/ValidatedDeviceAuthorizationRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidatedEndSessionRequest.cs b/src/IdentityServer/Validation/Models/ValidatedEndSessionRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidatedEndSessionRequest.cs
rename to src/IdentityServer/Validation/Models/ValidatedEndSessionRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidatedRequest.cs b/src/IdentityServer/Validation/Models/ValidatedRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidatedRequest.cs
rename to src/IdentityServer/Validation/Models/ValidatedRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidatedTokenRequest.cs b/src/IdentityServer/Validation/Models/ValidatedTokenRequest.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidatedTokenRequest.cs
rename to src/IdentityServer/Validation/Models/ValidatedTokenRequest.cs
diff --git a/src/IdentityServer/src/Validation/Models/ValidationResult.cs b/src/IdentityServer/Validation/Models/ValidationResult.cs
similarity index 100%
rename from src/IdentityServer/src/Validation/Models/ValidationResult.cs
rename to src/IdentityServer/Validation/Models/ValidationResult.cs
diff --git a/src/IdentityServer/build.cmd b/src/IdentityServer/build.cmd
deleted file mode 100644
index e4cf78f4a..000000000
--- a/src/IdentityServer/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-dotnet run --project build -- %*
\ No newline at end of file
diff --git a/src/IdentityServer/build.ps1 b/src/IdentityServer/build.ps1
deleted file mode 100644
index 8c950bdae..000000000
--- a/src/IdentityServer/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-$ErrorActionPreference = "Stop";
-dotnet run --project build -- $args
\ No newline at end of file
diff --git a/src/IdentityServer/build.sh b/src/IdentityServer/build.sh
deleted file mode 100755
index bb8ef5b20..000000000
--- a/src/IdentityServer/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-dotnet run --project build -- "$@"
\ No newline at end of file
diff --git a/src/IdentityServer/build/Program.cs b/src/IdentityServer/build/Program.cs
deleted file mode 100644
index 46ec54fa3..000000000
--- a/src/IdentityServer/build/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace build
-{
- partial class Program
- {
- private const string Prefix = "IdentityServer";
- }
-}
diff --git a/src/IdentityServer/build/build.csproj b/src/IdentityServer/build/build.csproj
deleted file mode 100644
index 43c81aaed..000000000
--- a/src/IdentityServer/build/build.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/IdentityServer/host/Host.csproj b/src/IdentityServer/host/Host.csproj
deleted file mode 100644
index 95e5a62db..000000000
--- a/src/IdentityServer/host/Host.csproj
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
- netcoreapp3.1;net5.0
- InProcess
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/Storage/src/Constants.cs b/src/Storage/Constants.cs
similarity index 100%
rename from src/Storage/src/Constants.cs
rename to src/Storage/Constants.cs
diff --git a/src/Storage/src/Duende.IdentityServer.Storage.csproj b/src/Storage/Duende.IdentityServer.Storage.csproj
similarity index 84%
rename from src/Storage/src/Duende.IdentityServer.Storage.csproj
rename to src/Storage/Duende.IdentityServer.Storage.csproj
index 9237fe775..de503ffff 100644
--- a/src/Storage/src/Duende.IdentityServer.Storage.csproj
+++ b/src/Storage/Duende.IdentityServer.Storage.csproj
@@ -10,7 +10,6 @@
-
\ No newline at end of file
diff --git a/src/Storage/Duende.IdentityServer.Storage.sln b/src/Storage/Duende.IdentityServer.Storage.sln
deleted file mode 100644
index e6f86df80..000000000
--- a/src/Storage/Duende.IdentityServer.Storage.sln
+++ /dev/null
@@ -1,42 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26124.0
-MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2EEC146C-3C96-4871-BBAF-8341719BD533}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Duende.IdentityServer.Storage", "src\Duende.IdentityServer.Storage.csproj", "{A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}"
-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
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|x64.ActiveCfg = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|x64.Build.0 = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Debug|x86.Build.0 = Debug|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|Any CPU.Build.0 = Release|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|x64.ActiveCfg = Release|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|x64.Build.0 = Release|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|x86.ActiveCfg = Release|Any CPU
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7}.Release|x86.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {A5E2B0DD-9C88-42B5-BCEC-7ED701504FF7} = {2EEC146C-3C96-4871-BBAF-8341719BD533}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {AFF22F24-FEA5-4A1D-AFE6-942789486D59}
- EndGlobalSection
-EndGlobal
diff --git a/src/Storage/src/Extensions/IEnumerableExtensions.cs b/src/Storage/Extensions/IEnumerableExtensions.cs
similarity index 100%
rename from src/Storage/src/Extensions/IEnumerableExtensions.cs
rename to src/Storage/Extensions/IEnumerableExtensions.cs
diff --git a/src/Storage/src/Extensions/PersistedGrantFilterExtensions.cs b/src/Storage/Extensions/PersistedGrantFilterExtensions.cs
similarity index 100%
rename from src/Storage/src/Extensions/PersistedGrantFilterExtensions.cs
rename to src/Storage/Extensions/PersistedGrantFilterExtensions.cs
diff --git a/src/Storage/src/Extensions/StringsExtensions.cs b/src/Storage/Extensions/StringsExtensions.cs
similarity index 100%
rename from src/Storage/src/Extensions/StringsExtensions.cs
rename to src/Storage/Extensions/StringsExtensions.cs
diff --git a/src/Storage/src/IdentityServerConstants.cs b/src/Storage/IdentityServerConstants.cs
similarity index 100%
rename from src/Storage/src/IdentityServerConstants.cs
rename to src/Storage/IdentityServerConstants.cs
diff --git a/src/Storage/src/IdentityServerUser.cs b/src/Storage/IdentityServerUser.cs
similarity index 100%
rename from src/Storage/src/IdentityServerUser.cs
rename to src/Storage/IdentityServerUser.cs
diff --git a/src/Storage/src/Models/ApiResource.cs b/src/Storage/Models/ApiResource.cs
similarity index 100%
rename from src/Storage/src/Models/ApiResource.cs
rename to src/Storage/Models/ApiResource.cs
diff --git a/src/Storage/src/Models/ApiScope.cs b/src/Storage/Models/ApiScope.cs
similarity index 100%
rename from src/Storage/src/Models/ApiScope.cs
rename to src/Storage/Models/ApiScope.cs
diff --git a/src/Storage/src/Models/AuthorizationCode.cs b/src/Storage/Models/AuthorizationCode.cs
similarity index 100%
rename from src/Storage/src/Models/AuthorizationCode.cs
rename to src/Storage/Models/AuthorizationCode.cs
diff --git a/src/Storage/src/Models/Client.cs b/src/Storage/Models/Client.cs
similarity index 100%
rename from src/Storage/src/Models/Client.cs
rename to src/Storage/Models/Client.cs
diff --git a/src/Storage/src/Models/ClientClaim.cs b/src/Storage/Models/ClientClaim.cs
similarity index 100%
rename from src/Storage/src/Models/ClientClaim.cs
rename to src/Storage/Models/ClientClaim.cs
diff --git a/src/Storage/src/Models/Consent.cs b/src/Storage/Models/Consent.cs
similarity index 100%
rename from src/Storage/src/Models/Consent.cs
rename to src/Storage/Models/Consent.cs
diff --git a/src/Storage/src/Models/DeviceCode.cs b/src/Storage/Models/DeviceCode.cs
similarity index 100%
rename from src/Storage/src/Models/DeviceCode.cs
rename to src/Storage/Models/DeviceCode.cs
diff --git a/src/Storage/src/Models/Enums.cs b/src/Storage/Models/Enums.cs
similarity index 100%
rename from src/Storage/src/Models/Enums.cs
rename to src/Storage/Models/Enums.cs
diff --git a/src/Storage/src/Models/GrantType.cs b/src/Storage/Models/GrantType.cs
similarity index 100%
rename from src/Storage/src/Models/GrantType.cs
rename to src/Storage/Models/GrantType.cs
diff --git a/src/Storage/src/Models/IdentityResource.cs b/src/Storage/Models/IdentityResource.cs
similarity index 100%
rename from src/Storage/src/Models/IdentityResource.cs
rename to src/Storage/Models/IdentityResource.cs
diff --git a/src/Storage/src/Models/PersistedGrant.cs b/src/Storage/Models/PersistedGrant.cs
similarity index 100%
rename from src/Storage/src/Models/PersistedGrant.cs
rename to src/Storage/Models/PersistedGrant.cs
diff --git a/src/Storage/src/Models/RefreshToken.cs b/src/Storage/Models/RefreshToken.cs
similarity index 100%
rename from src/Storage/src/Models/RefreshToken.cs
rename to src/Storage/Models/RefreshToken.cs
diff --git a/src/Storage/src/Models/Resource.cs b/src/Storage/Models/Resource.cs
similarity index 100%
rename from src/Storage/src/Models/Resource.cs
rename to src/Storage/Models/Resource.cs
diff --git a/src/Storage/src/Models/Resources.cs b/src/Storage/Models/Resources.cs
similarity index 100%
rename from src/Storage/src/Models/Resources.cs
rename to src/Storage/Models/Resources.cs
diff --git a/src/Storage/src/Models/Secret.cs b/src/Storage/Models/Secret.cs
similarity index 100%
rename from src/Storage/src/Models/Secret.cs
rename to src/Storage/Models/Secret.cs
diff --git a/src/Storage/src/Models/SerializedKey.cs b/src/Storage/Models/SerializedKey.cs
similarity index 100%
rename from src/Storage/src/Models/SerializedKey.cs
rename to src/Storage/Models/SerializedKey.cs
diff --git a/src/Storage/src/Models/Token.cs b/src/Storage/Models/Token.cs
similarity index 100%
rename from src/Storage/src/Models/Token.cs
rename to src/Storage/Models/Token.cs
diff --git a/src/Storage/README.md b/src/Storage/README.md
deleted file mode 100644
index 45cb24af2..000000000
--- a/src/Storage/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# IdentityServer4.Storage
-
-IdentityServer4.Storage contains all the models and storage interfaces for IdentityServer 4 configuration data.
\ No newline at end of file
diff --git a/src/Storage/src/Services/ICorsPolicyService.cs b/src/Storage/Services/ICorsPolicyService.cs
similarity index 100%
rename from src/Storage/src/Services/ICorsPolicyService.cs
rename to src/Storage/Services/ICorsPolicyService.cs
diff --git a/src/Storage/src/Stores/IAuthorizationCodeStore.cs b/src/Storage/Stores/IAuthorizationCodeStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IAuthorizationCodeStore.cs
rename to src/Storage/Stores/IAuthorizationCodeStore.cs
diff --git a/src/Storage/src/Stores/IClientStore.cs b/src/Storage/Stores/IClientStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IClientStore.cs
rename to src/Storage/Stores/IClientStore.cs
diff --git a/src/Storage/src/Stores/IDeviceFlowStore.cs b/src/Storage/Stores/IDeviceFlowStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IDeviceFlowStore.cs
rename to src/Storage/Stores/IDeviceFlowStore.cs
diff --git a/src/Storage/src/Stores/IPersistedGrantStore.cs b/src/Storage/Stores/IPersistedGrantStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IPersistedGrantStore.cs
rename to src/Storage/Stores/IPersistedGrantStore.cs
diff --git a/src/Storage/src/Stores/IReferenceTokenStore.cs b/src/Storage/Stores/IReferenceTokenStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IReferenceTokenStore.cs
rename to src/Storage/Stores/IReferenceTokenStore.cs
diff --git a/src/Storage/src/Stores/IRefreshTokenStore.cs b/src/Storage/Stores/IRefreshTokenStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IRefreshTokenStore.cs
rename to src/Storage/Stores/IRefreshTokenStore.cs
diff --git a/src/Storage/src/Stores/IResourceStore.cs b/src/Storage/Stores/IResourceStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IResourceStore.cs
rename to src/Storage/Stores/IResourceStore.cs
diff --git a/src/Storage/src/Stores/ISigningKeyStore.cs b/src/Storage/Stores/ISigningKeyStore.cs
similarity index 100%
rename from src/Storage/src/Stores/ISigningKeyStore.cs
rename to src/Storage/Stores/ISigningKeyStore.cs
diff --git a/src/Storage/src/Stores/IUserConsentStore.cs b/src/Storage/Stores/IUserConsentStore.cs
similarity index 100%
rename from src/Storage/src/Stores/IUserConsentStore.cs
rename to src/Storage/Stores/IUserConsentStore.cs
diff --git a/src/Storage/src/Stores/PersistedGrantFilter.cs b/src/Storage/Stores/PersistedGrantFilter.cs
similarity index 100%
rename from src/Storage/src/Stores/PersistedGrantFilter.cs
rename to src/Storage/Stores/PersistedGrantFilter.cs
diff --git a/src/Storage/src/Stores/Serialization/ClaimConverter.cs b/src/Storage/Stores/Serialization/ClaimConverter.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/ClaimConverter.cs
rename to src/Storage/Stores/Serialization/ClaimConverter.cs
diff --git a/src/Storage/src/Stores/Serialization/ClaimLite.cs b/src/Storage/Stores/Serialization/ClaimLite.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/ClaimLite.cs
rename to src/Storage/Stores/Serialization/ClaimLite.cs
diff --git a/src/Storage/src/Stores/Serialization/ClaimsPrincipalConverter.cs b/src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/ClaimsPrincipalConverter.cs
rename to src/Storage/Stores/Serialization/ClaimsPrincipalConverter.cs
diff --git a/src/Storage/src/Stores/Serialization/ClaimsPrincipalLite.cs b/src/Storage/Stores/Serialization/ClaimsPrincipalLite.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/ClaimsPrincipalLite.cs
rename to src/Storage/Stores/Serialization/ClaimsPrincipalLite.cs
diff --git a/src/Storage/src/Stores/Serialization/CustomContractResolver.cs b/src/Storage/Stores/Serialization/CustomContractResolver.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/CustomContractResolver.cs
rename to src/Storage/Stores/Serialization/CustomContractResolver.cs
diff --git a/src/Storage/src/Stores/Serialization/IPersistentGrantSerializer.cs b/src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/IPersistentGrantSerializer.cs
rename to src/Storage/Stores/Serialization/IPersistentGrantSerializer.cs
diff --git a/src/Storage/src/Stores/Serialization/PersistentGrantSerializer.cs b/src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
similarity index 100%
rename from src/Storage/src/Stores/Serialization/PersistentGrantSerializer.cs
rename to src/Storage/Stores/Serialization/PersistentGrantSerializer.cs
diff --git a/src/Storage/build.cmd b/src/Storage/build.cmd
deleted file mode 100644
index e4cf78f4a..000000000
--- a/src/Storage/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@echo off
-dotnet run --project build -- %*
\ No newline at end of file
diff --git a/src/Storage/build.ps1 b/src/Storage/build.ps1
deleted file mode 100644
index 8c950bdae..000000000
--- a/src/Storage/build.ps1
+++ /dev/null
@@ -1,2 +0,0 @@
-$ErrorActionPreference = "Stop";
-dotnet run --project build -- $args
\ No newline at end of file
diff --git a/src/Storage/build.sh b/src/Storage/build.sh
deleted file mode 100755
index bb8ef5b20..000000000
--- a/src/Storage/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-dotnet run --project build -- "$@"
\ No newline at end of file
diff --git a/src/Storage/build/Program.cs b/src/Storage/build/Program.cs
deleted file mode 100644
index de9c5bd51..000000000
--- a/src/Storage/build/Program.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace build
-{
- partial class Program
- {
- private const string Prefix = "Storage";
- }
-}
diff --git a/src/Storage/build/build.csproj b/src/Storage/build/build.csproj
deleted file mode 100644
index 43c81aaed..000000000
--- a/src/Storage/build/build.csproj
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
- Exe
- netcoreapp3.1
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/DatabaseProviderBuilder.cs b/test/EntityFramework.Storage.IntegrationTests/DatabaseProviderBuilder.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/DatabaseProviderBuilder.cs
rename to test/EntityFramework.Storage.IntegrationTests/DatabaseProviderBuilder.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/DatabaseProviderFixture.cs b/test/EntityFramework.Storage.IntegrationTests/DatabaseProviderFixture.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/DatabaseProviderFixture.cs
rename to test/EntityFramework.Storage.IntegrationTests/DatabaseProviderFixture.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/DbContexts/ClientDbContextTests.cs b/test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/DbContexts/ClientDbContextTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/DbContexts/ClientDbContextTests.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/IntegrationTests.csproj b/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj
similarity index 70%
rename from src/EntityFramework.Storage/test/IntegrationTests/IntegrationTests.csproj
rename to test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj
index e87f24a59..d44e96136 100644
--- a/src/EntityFramework.Storage/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/EntityFramework.Storage.IntegrationTests/EntityFramework.Storage.IntegrationTests.csproj
@@ -9,13 +9,6 @@
-
-
-
-
-
-
-
@@ -25,4 +18,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/FakeLogger.cs b/test/EntityFramework.Storage.IntegrationTests/FakeLogger.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/FakeLogger.cs
rename to test/EntityFramework.Storage.IntegrationTests/FakeLogger.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/IntegrationTest.cs b/test/EntityFramework.Storage.IntegrationTests/IntegrationTest.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/IntegrationTest.cs
rename to test/EntityFramework.Storage.IntegrationTests/IntegrationTest.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/ClientStoreTests.cs b/test/EntityFramework.Storage.IntegrationTests/Stores/ClientStoreTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/Stores/ClientStoreTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/Stores/ClientStoreTests.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/DeviceFlowStoreTests.cs b/test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/Stores/DeviceFlowStoreTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/Stores/DeviceFlowStoreTests.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs b/test/EntityFramework.Storage.IntegrationTests/Stores/PersistedGrantStoreTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/Stores/PersistedGrantStoreTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/Stores/PersistedGrantStoreTests.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/Stores/ResourceStoreTests.cs b/test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/Stores/ResourceStoreTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/Stores/ResourceStoreTests.cs
diff --git a/src/EntityFramework.Storage/test/IntegrationTests/TokenCleanup/TokenCleanupTests.cs b/test/EntityFramework.Storage.IntegrationTests/TokenCleanup/TokenCleanupTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/IntegrationTests/TokenCleanup/TokenCleanupTests.cs
rename to test/EntityFramework.Storage.IntegrationTests/TokenCleanup/TokenCleanupTests.cs
diff --git a/src/EntityFramework.Storage/test/UnitTests/UnitTests.csproj b/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj
similarity index 78%
rename from src/EntityFramework.Storage/test/UnitTests/UnitTests.csproj
rename to test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj
index 0ec514e29..2c98fd15b 100644
--- a/src/EntityFramework.Storage/test/UnitTests/UnitTests.csproj
+++ b/test/EntityFramework.Storage.UnitTests/EntityFramework.Storage.UnitTests.csproj
@@ -3,11 +3,7 @@
netcoreapp3.1;net5.0
-
-
-
-
-
+
@@ -16,5 +12,9 @@
+
+
+
+
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs b/test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/UnitTests/Mappers/ApiResourceMappersTests.cs
rename to test/EntityFramework.Storage.UnitTests/Mappers/ApiResourceMappersTests.cs
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs b/test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/UnitTests/Mappers/ClientMappersTests.cs
rename to test/EntityFramework.Storage.UnitTests/Mappers/ClientMappersTests.cs
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs b/test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/UnitTests/Mappers/IdentityResourcesMappersTests.cs
rename to test/EntityFramework.Storage.UnitTests/Mappers/IdentityResourcesMappersTests.cs
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs b/test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/UnitTests/Mappers/PersistedGrantMappersTests.cs
rename to test/EntityFramework.Storage.UnitTests/Mappers/PersistedGrantMappersTests.cs
diff --git a/src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs b/test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs
similarity index 100%
rename from src/EntityFramework.Storage/test/UnitTests/Mappers/ScopeMappersTests.cs
rename to test/EntityFramework.Storage.UnitTests/Mappers/ScopeMappersTests.cs
diff --git a/src/EntityFramework/test/Tests/DatabaseProviderBuilder.cs b/test/EntityFramework.Tests/DatabaseProviderBuilder.cs
similarity index 100%
rename from src/EntityFramework/test/Tests/DatabaseProviderBuilder.cs
rename to test/EntityFramework.Tests/DatabaseProviderBuilder.cs
diff --git a/src/EntityFramework/test/Tests/DatabaseProviderFixture.cs b/test/EntityFramework.Tests/DatabaseProviderFixture.cs
similarity index 100%
rename from src/EntityFramework/test/Tests/DatabaseProviderFixture.cs
rename to test/EntityFramework.Tests/DatabaseProviderFixture.cs
diff --git a/src/EntityFramework/test/Tests/Tests.csproj b/test/EntityFramework.Tests/EntityFramework.Tests.csproj
similarity index 86%
rename from src/EntityFramework/test/Tests/Tests.csproj
rename to test/EntityFramework.Tests/EntityFramework.Tests.csproj
index 35fbea362..3395f5a37 100644
--- a/src/EntityFramework/test/Tests/Tests.csproj
+++ b/test/EntityFramework.Tests/EntityFramework.Tests.csproj
@@ -18,6 +18,6 @@
-
+
diff --git a/src/EntityFramework/test/Tests/FakeLogger.cs b/test/EntityFramework.Tests/FakeLogger.cs
similarity index 100%
rename from src/EntityFramework/test/Tests/FakeLogger.cs
rename to test/EntityFramework.Tests/FakeLogger.cs
diff --git a/src/EntityFramework/test/Tests/IntegrationTest.cs b/test/EntityFramework.Tests/IntegrationTest.cs
similarity index 100%
rename from src/EntityFramework/test/Tests/IntegrationTest.cs
rename to test/EntityFramework.Tests/IntegrationTest.cs
diff --git a/src/EntityFramework/test/Tests/Services/CorsPolicyServiceTests.cs b/test/EntityFramework.Tests/Services/CorsPolicyServiceTests.cs
similarity index 100%
rename from src/EntityFramework/test/Tests/Services/CorsPolicyServiceTests.cs
rename to test/EntityFramework.Tests/Services/CorsPolicyServiceTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/ClientAssertionClient.cs b/test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/ClientAssertionClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/ClientAssertionClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/ClientCredentialsAndResourceOwnerClient.cs b/test/IdentityServer.IntegrationTests/Clients/ClientCredentialsAndResourceOwnerClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/ClientCredentialsAndResourceOwnerClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/ClientCredentialsAndResourceOwnerClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/ClientCredentialsClient.cs b/test/IdentityServer.IntegrationTests/Clients/ClientCredentialsClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/ClientCredentialsClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/ClientCredentialsClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs b/test/IdentityServer.IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/CustomTokenRequestValidatorClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/CustomTokenResponseClients.cs b/test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/CustomTokenResponseClients.cs
rename to test/IdentityServer.IntegrationTests/Clients/CustomTokenResponseClients.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/DiscoveryClient.cs b/test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/DiscoveryClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/DiscoveryClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/ExtensionGrantClient.cs b/test/IdentityServer.IntegrationTests/Clients/ExtensionGrantClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/ExtensionGrantClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/ExtensionGrantClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/RefreshTokenClient.cs b/test/IdentityServer.IntegrationTests/Clients/RefreshTokenClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/RefreshTokenClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/RefreshTokenClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/ResourceOwnerClient.cs b/test/IdentityServer.IntegrationTests/Clients/ResourceOwnerClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/ResourceOwnerClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/ResourceOwnerClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/RevocationClient.cs b/test/IdentityServer.IntegrationTests/Clients/RevocationClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/RevocationClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/RevocationClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/Clients.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/Clients.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/Clients.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/Clients.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/ConfirmationSecretValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/ConfirmationSecretValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/ConfirmationSecretValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/ConfirmationSecretValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomProfileService.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/CustomProfileService.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomProfileService.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/CustomProfileService.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseDto.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseDto.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseDto.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseDto.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseExtensionGrantValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseExtensionGrantValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseExtensionGrantValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseResourceOwnerValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseResourceOwnerValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/CustomResponseResourceOwnerValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/CustomResponseResourceOwnerValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/DynamicParameterExtensionGrantValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/DynamicParameterExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/DynamicParameterExtensionGrantValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/DynamicParameterExtensionGrantValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/ExtensionGrantValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/ExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/ExtensionGrantValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/ExtensionGrantValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/ExtensionGrantValidator2.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/ExtensionGrantValidator2.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/ExtensionGrantValidator2.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/ExtensionGrantValidator2.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/NoSubjectExtensionGrantValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/NoSubjectExtensionGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/NoSubjectExtensionGrantValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/NoSubjectExtensionGrantValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/Scopes.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/Scopes.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/Scopes.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/Scopes.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/Startup.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/Startup.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/Startup.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/Startup.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/StartupWithCustomTokenResponses.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/StartupWithCustomTokenResponses.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/StartupWithCustomTokenResponses.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/StartupWithCustomTokenResponses.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/TestCustomTokenRequestValidator.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/TestCustomTokenRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/TestCustomTokenRequestValidator.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/TestCustomTokenRequestValidator.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/Setup/Users.cs b/test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/Setup/Users.cs
rename to test/IdentityServer.IntegrationTests/Clients/Setup/Users.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Clients/UserInfoClient.cs b/test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Clients/UserInfoClient.cs
rename to test/IdentityServer.IntegrationTests/Clients/UserInfoClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/BrowserClient.cs b/test/IdentityServer.IntegrationTests/Common/BrowserClient.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/BrowserClient.cs
rename to test/IdentityServer.IntegrationTests/Common/BrowserClient.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/BrowserHandler.cs b/test/IdentityServer.IntegrationTests/Common/BrowserHandler.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/BrowserHandler.cs
rename to test/IdentityServer.IntegrationTests/Common/BrowserHandler.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/IdentityServerPipeline.cs b/test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/IdentityServerPipeline.cs
rename to test/IdentityServer.IntegrationTests/Common/IdentityServerPipeline.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/MessageHandlerWrapper.cs b/test/IdentityServer.IntegrationTests/Common/MessageHandlerWrapper.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/MessageHandlerWrapper.cs
rename to test/IdentityServer.IntegrationTests/Common/MessageHandlerWrapper.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/NetworkHandler.cs b/test/IdentityServer.IntegrationTests/Common/NetworkHandler.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/NetworkHandler.cs
rename to test/IdentityServer.IntegrationTests/Common/NetworkHandler.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Common/TestCert.cs b/test/IdentityServer.IntegrationTests/Common/TestCert.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Common/TestCert.cs
rename to test/IdentityServer.IntegrationTests/Common/TestCert.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs b/test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs
rename to test/IdentityServer.IntegrationTests/Conformance/Basic/ClientAuthenticationTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Conformance/Basic/CodeFlowTests.cs b/test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Conformance/Basic/CodeFlowTests.cs
rename to test/IdentityServer.IntegrationTests/Conformance/Basic/CodeFlowTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Conformance/Basic/RedirectUriTests.cs b/test/IdentityServer.IntegrationTests/Conformance/Basic/RedirectUriTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Conformance/Basic/RedirectUriTests.cs
rename to test/IdentityServer.IntegrationTests/Conformance/Basic/RedirectUriTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs b/test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs
rename to test/IdentityServer.IntegrationTests/Conformance/Basic/ResponseTypeResponseModeTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Conformance/Pkce/PkceTests.cs b/test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Conformance/Pkce/PkceTests.cs
rename to test/IdentityServer.IntegrationTests/Conformance/Pkce/PkceTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Authorize/AuthorizeTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/ConsentTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Authorize/ConsentTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/ConsentTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Authorize/ConsentTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Authorize/JwtRequestAuthorizeTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Authorize/RestrictAccessTokenViaBrowserTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/SessionIdTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Authorize/SessionIdTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Authorize/SessionIdTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Authorize/SessionIdTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/CheckSession/CheckSessionTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/CheckSession/CheckSessionTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/CheckSession/CheckSessionTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/CheckSession/CheckSessionTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/DeviceAuthorization/DeviceAuthorizationTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Discovery/DiscoveryEndpointTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/EndSession/EndSessionTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/EndSession/EndSessionTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/EndSession/EndSessionTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Introspection/IntrospectionTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Clients.cs b/test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Clients.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Clients.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Clients.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Scopes.cs b/test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Scopes.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Scopes.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Scopes.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Startup.cs b/test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Startup.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Startup.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Startup.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Users.cs b/test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Users.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Introspection/Setup/Users.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Introspection/Setup/Users.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Revocation/RevocationTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Revocation/RevocationTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Revocation/RevocationTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Endpoints/Token/TokenEndpointTests.cs b/test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Endpoints/Token/TokenEndpointTests.cs
rename to test/IdentityServer.IntegrationTests/Endpoints/Token/TokenEndpointTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Extensibility/CustomProfileServiceTests.cs b/test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Extensibility/CustomProfileServiceTests.cs
rename to test/IdentityServer.IntegrationTests/Extensibility/CustomProfileServiceTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/IntegrationTests.csproj b/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj
similarity index 92%
rename from src/IdentityServer/test/IntegrationTests/IntegrationTests.csproj
rename to test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj
index 9dc5ecf70..2045b8532 100644
--- a/src/IdentityServer/test/IntegrationTests/IntegrationTests.csproj
+++ b/test/IdentityServer.IntegrationTests/IdentityServer.IntegrationTests.csproj
@@ -31,7 +31,6 @@
-
+
-
\ No newline at end of file
diff --git a/src/IdentityServer/test/IntegrationTests/Pipeline/CorsTests.cs b/test/IdentityServer.IntegrationTests/Pipeline/CorsTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Pipeline/CorsTests.cs
rename to test/IdentityServer.IntegrationTests/Pipeline/CorsTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Pipeline/FederatedSignoutTests.cs b/test/IdentityServer.IntegrationTests/Pipeline/FederatedSignoutTests.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Pipeline/FederatedSignoutTests.cs
rename to test/IdentityServer.IntegrationTests/Pipeline/FederatedSignoutTests.cs
diff --git a/src/IdentityServer/test/IntegrationTests/Pipeline/SubpathHosting.cs b/test/IdentityServer.IntegrationTests/Pipeline/SubpathHosting.cs
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/Pipeline/SubpathHosting.cs
rename to test/IdentityServer.IntegrationTests/Pipeline/SubpathHosting.cs
diff --git a/src/IdentityServer/test/IntegrationTests/identityserver_testing.cer b/test/IdentityServer.IntegrationTests/identityserver_testing.cer
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/identityserver_testing.cer
rename to test/IdentityServer.IntegrationTests/identityserver_testing.cer
diff --git a/src/IdentityServer/test/IntegrationTests/identityserver_testing.pfx b/test/IdentityServer.IntegrationTests/identityserver_testing.pfx
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/identityserver_testing.pfx
rename to test/IdentityServer.IntegrationTests/identityserver_testing.pfx
diff --git a/src/IdentityServer/test/IntegrationTests/xunit.runner.json b/test/IdentityServer.IntegrationTests/xunit.runner.json
similarity index 100%
rename from src/IdentityServer/test/IntegrationTests/xunit.runner.json
rename to test/IdentityServer.IntegrationTests/xunit.runner.json
diff --git a/src/IdentityServer/test/UnitTests/Common/IAuthenticationSchemeHandler.cs b/test/IdentityServer.UnitTests/Common/IAuthenticationSchemeHandler.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/IAuthenticationSchemeHandler.cs
rename to test/IdentityServer.UnitTests/Common/IAuthenticationSchemeHandler.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockAuthenticationHandler.cs b/test/IdentityServer.UnitTests/Common/MockAuthenticationHandler.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockAuthenticationHandler.cs
rename to test/IdentityServer.UnitTests/Common/MockAuthenticationHandler.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockAuthenticationHandlerProvider.cs b/test/IdentityServer.UnitTests/Common/MockAuthenticationHandlerProvider.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockAuthenticationHandlerProvider.cs
rename to test/IdentityServer.UnitTests/Common/MockAuthenticationHandlerProvider.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockAuthenticationSchemeProvider.cs b/test/IdentityServer.UnitTests/Common/MockAuthenticationSchemeProvider.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockAuthenticationSchemeProvider.cs
rename to test/IdentityServer.UnitTests/Common/MockAuthenticationSchemeProvider.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockAuthenticationService.cs b/test/IdentityServer.UnitTests/Common/MockAuthenticationService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockAuthenticationService.cs
rename to test/IdentityServer.UnitTests/Common/MockAuthenticationService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockClaimsService.cs b/test/IdentityServer.UnitTests/Common/MockClaimsService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockClaimsService.cs
rename to test/IdentityServer.UnitTests/Common/MockClaimsService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockClientSessionService.cs b/test/IdentityServer.UnitTests/Common/MockClientSessionService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockClientSessionService.cs
rename to test/IdentityServer.UnitTests/Common/MockClientSessionService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockConsentMessageStore.cs b/test/IdentityServer.UnitTests/Common/MockConsentMessageStore.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockConsentMessageStore.cs
rename to test/IdentityServer.UnitTests/Common/MockConsentMessageStore.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockConsentService.cs b/test/IdentityServer.UnitTests/Common/MockConsentService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockConsentService.cs
rename to test/IdentityServer.UnitTests/Common/MockConsentService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockHttpContextAccessor.cs b/test/IdentityServer.UnitTests/Common/MockHttpContextAccessor.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockHttpContextAccessor.cs
rename to test/IdentityServer.UnitTests/Common/MockHttpContextAccessor.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockKeyMaterialService.cs b/test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockKeyMaterialService.cs
rename to test/IdentityServer.UnitTests/Common/MockKeyMaterialService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockLogoutNotificationService.cs b/test/IdentityServer.UnitTests/Common/MockLogoutNotificationService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockLogoutNotificationService.cs
rename to test/IdentityServer.UnitTests/Common/MockLogoutNotificationService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockMessageStore.cs b/test/IdentityServer.UnitTests/Common/MockMessageStore.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockMessageStore.cs
rename to test/IdentityServer.UnitTests/Common/MockMessageStore.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockPersistedGrantService.cs b/test/IdentityServer.UnitTests/Common/MockPersistedGrantService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockPersistedGrantService.cs
rename to test/IdentityServer.UnitTests/Common/MockPersistedGrantService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockProfileService.cs b/test/IdentityServer.UnitTests/Common/MockProfileService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockProfileService.cs
rename to test/IdentityServer.UnitTests/Common/MockProfileService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockReferenceTokenStore.cs b/test/IdentityServer.UnitTests/Common/MockReferenceTokenStore.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockReferenceTokenStore.cs
rename to test/IdentityServer.UnitTests/Common/MockReferenceTokenStore.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockResourceValidator.cs b/test/IdentityServer.UnitTests/Common/MockResourceValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockResourceValidator.cs
rename to test/IdentityServer.UnitTests/Common/MockResourceValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockReturnUrlParser.cs b/test/IdentityServer.UnitTests/Common/MockReturnUrlParser.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockReturnUrlParser.cs
rename to test/IdentityServer.UnitTests/Common/MockReturnUrlParser.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockSessionIdService.cs b/test/IdentityServer.UnitTests/Common/MockSessionIdService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockSessionIdService.cs
rename to test/IdentityServer.UnitTests/Common/MockSessionIdService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockSystemClock.cs b/test/IdentityServer.UnitTests/Common/MockSystemClock.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockSystemClock.cs
rename to test/IdentityServer.UnitTests/Common/MockSystemClock.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockTokenCreationService.cs b/test/IdentityServer.UnitTests/Common/MockTokenCreationService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockTokenCreationService.cs
rename to test/IdentityServer.UnitTests/Common/MockTokenCreationService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/MockUserSession.cs b/test/IdentityServer.UnitTests/Common/MockUserSession.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/MockUserSession.cs
rename to test/IdentityServer.UnitTests/Common/MockUserSession.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/NetworkHandler.cs b/test/IdentityServer.UnitTests/Common/NetworkHandler.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/NetworkHandler.cs
rename to test/IdentityServer.UnitTests/Common/NetworkHandler.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/StubAuthorizeResponseGenerator.cs b/test/IdentityServer.UnitTests/Common/StubAuthorizeResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/StubAuthorizeResponseGenerator.cs
rename to test/IdentityServer.UnitTests/Common/StubAuthorizeResponseGenerator.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/StubClock.cs b/test/IdentityServer.UnitTests/Common/StubClock.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/StubClock.cs
rename to test/IdentityServer.UnitTests/Common/StubClock.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/StubHandleGenerationService.cs b/test/IdentityServer.UnitTests/Common/StubHandleGenerationService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/StubHandleGenerationService.cs
rename to test/IdentityServer.UnitTests/Common/StubHandleGenerationService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestCert.cs b/test/IdentityServer.UnitTests/Common/TestCert.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestCert.cs
rename to test/IdentityServer.UnitTests/Common/TestCert.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestEventService.cs b/test/IdentityServer.UnitTests/Common/TestEventService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestEventService.cs
rename to test/IdentityServer.UnitTests/Common/TestEventService.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestExtensions.cs b/test/IdentityServer.UnitTests/Common/TestExtensions.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestExtensions.cs
rename to test/IdentityServer.UnitTests/Common/TestExtensions.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestIdentityServerOptions.cs b/test/IdentityServer.UnitTests/Common/TestIdentityServerOptions.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestIdentityServerOptions.cs
rename to test/IdentityServer.UnitTests/Common/TestIdentityServerOptions.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestLogger.cs b/test/IdentityServer.UnitTests/Common/TestLogger.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestLogger.cs
rename to test/IdentityServer.UnitTests/Common/TestLogger.cs
diff --git a/src/IdentityServer/test/UnitTests/Common/TestUserConsentStore.cs b/test/IdentityServer.UnitTests/Common/TestUserConsentStore.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Common/TestUserConsentStore.cs
rename to test/IdentityServer.UnitTests/Common/TestUserConsentStore.cs
diff --git a/src/IdentityServer/test/UnitTests/Cors/MockCorsPolicyProvider.cs b/test/IdentityServer.UnitTests/Cors/MockCorsPolicyProvider.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Cors/MockCorsPolicyProvider.cs
rename to test/IdentityServer.UnitTests/Cors/MockCorsPolicyProvider.cs
diff --git a/src/IdentityServer/test/UnitTests/Cors/MockCorsPolicyService.cs b/test/IdentityServer.UnitTests/Cors/MockCorsPolicyService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Cors/MockCorsPolicyService.cs
rename to test/IdentityServer.UnitTests/Cors/MockCorsPolicyService.cs
diff --git a/src/IdentityServer/test/UnitTests/Cors/PolicyProviderTests.cs b/test/IdentityServer.UnitTests/Cors/PolicyProviderTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Cors/PolicyProviderTests.cs
rename to test/IdentityServer.UnitTests/Cors/PolicyProviderTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs b/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeCallbackEndpointTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs b/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointBaseTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs b/test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Authorize/AuthorizeEndpointTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Authorize/StubAuthorizeInteractionResponseGenerator.cs b/test/IdentityServer.UnitTests/Endpoints/Authorize/StubAuthorizeInteractionResponseGenerator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Authorize/StubAuthorizeInteractionResponseGenerator.cs
rename to test/IdentityServer.UnitTests/Endpoints/Authorize/StubAuthorizeInteractionResponseGenerator.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Authorize/StubAuthorizeRequestValidator.cs b/test/IdentityServer.UnitTests/Endpoints/Authorize/StubAuthorizeRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Authorize/StubAuthorizeRequestValidator.cs
rename to test/IdentityServer.UnitTests/Endpoints/Authorize/StubAuthorizeRequestValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs b/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackEndpointTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs b/test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/EndSession/EndSessionCallbackResultTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/EndSession/StubBackChannelLogoutClient.cs b/test/IdentityServer.UnitTests/Endpoints/EndSession/StubBackChannelLogoutClient.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/EndSession/StubBackChannelLogoutClient.cs
rename to test/IdentityServer.UnitTests/Endpoints/EndSession/StubBackChannelLogoutClient.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/EndSession/StubEndSessionRequestValidator.cs b/test/IdentityServer.UnitTests/Endpoints/EndSession/StubEndSessionRequestValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/EndSession/StubEndSessionRequestValidator.cs
rename to test/IdentityServer.UnitTests/Endpoints/EndSession/StubEndSessionRequestValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Results/AuthorizeResultTests.cs b/test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Results/AuthorizeResultTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Results/AuthorizeResultTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Results/CheckSessionResultTests.cs b/test/IdentityServer.UnitTests/Endpoints/Results/CheckSessionResultTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Results/CheckSessionResultTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Results/CheckSessionResultTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs b/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Results/EndSessionCallbackResultTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Endpoints/Results/EndSessionResultTests.cs b/test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Endpoints/Results/EndSessionResultTests.cs
rename to test/IdentityServer.UnitTests/Endpoints/Results/EndSessionResultTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/ApiResourceSigningAlgorithmSelectionTests.cs b/test/IdentityServer.UnitTests/Extensions/ApiResourceSigningAlgorithmSelectionTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/ApiResourceSigningAlgorithmSelectionTests.cs
rename to test/IdentityServer.UnitTests/Extensions/ApiResourceSigningAlgorithmSelectionTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/EndpointOptionsExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/EndpointOptionsExtensionsTests.cs
rename to test/IdentityServer.UnitTests/Extensions/EndpointOptionsExtensionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/HttpRequestExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/HttpRequestExtensionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/HttpRequestExtensionsTests.cs
rename to test/IdentityServer.UnitTests/Extensions/HttpRequestExtensionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/IResourceStoreExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/IResourceStoreExtensionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/IResourceStoreExtensionsTests.cs
rename to test/IdentityServer.UnitTests/Extensions/IResourceStoreExtensionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/IdentityServerBuilderExtensionsCacheStoreTests.cs b/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCacheStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/IdentityServerBuilderExtensionsCacheStoreTests.cs
rename to test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCacheStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs b/test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs
rename to test/IdentityServer.UnitTests/Extensions/IdentityServerBuilderExtensionsCryptoTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/StringExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/StringExtensionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/StringExtensionsTests.cs
rename to test/IdentityServer.UnitTests/Extensions/StringExtensionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs b/test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs
rename to test/IdentityServer.UnitTests/Extensions/ValidatedAuthorizeRequestExtensionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Hosting/EndpointRouterTests.cs b/test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Hosting/EndpointRouterTests.cs
rename to test/IdentityServer.UnitTests/Hosting/EndpointRouterTests.cs
diff --git a/src/IdentityServer/test/UnitTests/UnitTests.csproj b/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj
similarity index 89%
rename from src/IdentityServer/test/UnitTests/UnitTests.csproj
rename to test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj
index e080049fa..b6aef05cd 100644
--- a/src/IdentityServer/test/UnitTests/UnitTests.csproj
+++ b/test/IdentityServer.UnitTests/IdentityServer.UnitTests.csproj
@@ -26,6 +26,8 @@
-
+
+
+
diff --git a/src/IdentityServer/test/UnitTests/Infrastructure/ObjectSerializerTests.cs b/test/IdentityServer.UnitTests/Infrastructure/ObjectSerializerTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Infrastructure/ObjectSerializerTests.cs
rename to test/IdentityServer.UnitTests/Infrastructure/ObjectSerializerTests.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests.cs b/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs b/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Consent.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs b/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Custom.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs b/test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/AuthorizeInteractionResponseGenerator/AuthorizeInteractionResponseGeneratorTests_Login.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs b/test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/DeviceAuthorizationResponseGeneratorTests.cs
diff --git a/src/IdentityServer/test/UnitTests/ResponseHandling/UserInfoResponseGeneratorTests.cs b/test/IdentityServer.UnitTests/ResponseHandling/UserInfoResponseGeneratorTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/ResponseHandling/UserInfoResponseGeneratorTests.cs
rename to test/IdentityServer.UnitTests/ResponseHandling/UserInfoResponseGeneratorTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultClaimsServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultClaimsServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultClaimsServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultConsentServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultConsentServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultConsentServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultCorsPolicyServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultCorsPolicyServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultCorsPolicyServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultCorsPolicyServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultIdentityServerInteractionServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultIdentityServerInteractionServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultIdentityServerInteractionServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultIdentityServerInteractionServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultPersistedGrantServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultPersistedGrantServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultPersistedGrantServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultPersistedGrantServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultRefreshTokenServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultTokenServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultTokenServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultTokenServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DefaultUserSessionTests.cs b/test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DefaultUserSessionTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DefaultUserSessionTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/DistributedDeviceFlowThrottlingServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/InMemoryKeyStoreCacheTests.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/InMemoryKeyStoreCacheTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/InMemoryKeyStoreCacheTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/InMemoryKeyStoreCacheTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/KeyManagerOptionsTests.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/KeyManagerOptionsTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/KeyManagerOptionsTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/KeyManagerOptionsTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/KeyManagerTests.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/KeyManagerTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/KeyManagerTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/KeyManagerTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockClock.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockClock.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockClock.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockClock.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyProtector.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyProtector.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyProtector.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyProtector.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyStore.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyStore.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyStore.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyStore.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyStoreCache.cs b/test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyStoreCache.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/KeyManagement/MockSigningKeyStoreCache.cs
rename to test/IdentityServer.UnitTests/Services/Default/KeyManagement/MockSigningKeyStoreCache.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/Default/NumericUserCodeServiceTests.cs b/test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/Default/NumericUserCodeServiceTests.cs
rename to test/IdentityServer.UnitTests/Services/Default/NumericUserCodeServiceTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Services/InMemory/InMemoryCorsPolicyService.cs b/test/IdentityServer.UnitTests/Services/InMemory/InMemoryCorsPolicyService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Services/InMemory/InMemoryCorsPolicyService.cs
rename to test/IdentityServer.UnitTests/Services/InMemory/InMemoryCorsPolicyService.cs
diff --git a/src/IdentityServer/test/UnitTests/Stores/Default/DefaultPersistedGrantStoreTests.cs b/test/IdentityServer.UnitTests/Stores/Default/DefaultPersistedGrantStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Stores/Default/DefaultPersistedGrantStoreTests.cs
rename to test/IdentityServer.UnitTests/Stores/Default/DefaultPersistedGrantStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Stores/InMemoryClientStoreTests.cs b/test/IdentityServer.UnitTests/Stores/InMemoryClientStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Stores/InMemoryClientStoreTests.cs
rename to test/IdentityServer.UnitTests/Stores/InMemoryClientStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Stores/InMemoryDeviceFlowStoreTests.cs b/test/IdentityServer.UnitTests/Stores/InMemoryDeviceFlowStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Stores/InMemoryDeviceFlowStoreTests.cs
rename to test/IdentityServer.UnitTests/Stores/InMemoryDeviceFlowStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Stores/InMemoryPersistedGrantStoreTests.cs b/test/IdentityServer.UnitTests/Stores/InMemoryPersistedGrantStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Stores/InMemoryPersistedGrantStoreTests.cs
rename to test/IdentityServer.UnitTests/Stores/InMemoryPersistedGrantStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Stores/InMemoryResourcesStoreTests.cs b/test/IdentityServer.UnitTests/Stores/InMemoryResourcesStoreTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Stores/InMemoryResourcesStoreTests.cs
rename to test/IdentityServer.UnitTests/Stores/InMemoryResourcesStoreTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AccessTokenValidation.cs b/test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AccessTokenValidation.cs
rename to test/IdentityServer.UnitTests/Validation/AccessTokenValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Code.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_IdToken.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Token.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ClientValidation_Valid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_CustomValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_PKCE.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs b/test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs
rename to test/IdentityServer.UnitTests/Validation/AuthorizeRequest Validation/Authorize_ProtocolValidation_Valid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/BearerTokenUsageValidation.cs b/test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/BearerTokenUsageValidation.cs
rename to test/IdentityServer.UnitTests/Validation/BearerTokenUsageValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/ClientConfigurationValidation.cs b/test/IdentityServer.UnitTests/Validation/ClientConfigurationValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/ClientConfigurationValidation.cs
rename to test/IdentityServer.UnitTests/Validation/ClientConfigurationValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/DeviceAuthorizationRequestValidation.cs b/test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/DeviceAuthorizationRequestValidation.cs
rename to test/IdentityServer.UnitTests/Validation/DeviceAuthorizationRequestValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/DeviceCodeValidation.cs b/test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/DeviceCodeValidation.cs
rename to test/IdentityServer.UnitTests/Validation/DeviceCodeValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs b/test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs
rename to test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/EndSessionRequestValidatorTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/StubRedirectUriValidator.cs b/test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/StubRedirectUriValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/StubRedirectUriValidator.cs
rename to test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/StubRedirectUriValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/StubTokenValidator.cs b/test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/StubTokenValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/EndSessionRequestValidation/StubTokenValidator.cs
rename to test/IdentityServer.UnitTests/Validation/EndSessionRequestValidation/StubTokenValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/GrantTypesValidation.cs b/test/IdentityServer.UnitTests/Validation/GrantTypesValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/GrantTypesValidation.cs
rename to test/IdentityServer.UnitTests/Validation/GrantTypesValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/IdentityTokenValidation.cs b/test/IdentityServer.UnitTests/Validation/IdentityTokenValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/IdentityTokenValidation.cs
rename to test/IdentityServer.UnitTests/Validation/IdentityTokenValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/IntrospectionRequestValidatorTests.cs b/test/IdentityServer.UnitTests/Validation/IntrospectionRequestValidatorTests.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/IntrospectionRequestValidatorTests.cs
rename to test/IdentityServer.UnitTests/Validation/IntrospectionRequestValidatorTests.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/ResourceValidation.cs b/test/IdentityServer.UnitTests/Validation/ResourceValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/ResourceValidation.cs
rename to test/IdentityServer.UnitTests/Validation/ResourceValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/ResponseTypeEqualityComparison.cs b/test/IdentityServer.UnitTests/Validation/ResponseTypeEqualityComparison.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/ResponseTypeEqualityComparison.cs
rename to test/IdentityServer.UnitTests/Validation/ResponseTypeEqualityComparison.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/RevocationRequestValidation.cs b/test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/RevocationRequestValidation.cs
rename to test/IdentityServer.UnitTests/Validation/RevocationRequestValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs b/test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/BasicAuthenticationCredentialParsing.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs b/test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/ClientAssertionSecretParsing.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/ClientSecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/ClientSecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/ClientSecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/FormPostCredentialParsing.cs b/test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/FormPostCredentialParsing.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/FormPostCredentialParsing.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/HashedSharedSecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/MutualTlsSecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/PlainTextClientSecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/PrivateKeyJwtSecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Secrets/SecretValidation.cs b/test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Secrets/SecretValidation.cs
rename to test/IdentityServer.UnitTests/Validation/Secrets/SecretValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/ClientValidationTestClients.cs b/test/IdentityServer.UnitTests/Validation/Setup/ClientValidationTestClients.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/ClientValidationTestClients.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/ClientValidationTestClients.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/Factory.cs b/test/IdentityServer.UnitTests/Validation/Setup/Factory.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/Factory.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/Factory.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestClients.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestClients.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestClients.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestClients.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestDeviceCodeValidator.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestDeviceCodeValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestDeviceCodeValidator.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestDeviceCodeValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestDeviceFlowThrottlingService.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestDeviceFlowThrottlingService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestDeviceFlowThrottlingService.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestDeviceFlowThrottlingService.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestGrantValidator.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestGrantValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestGrantValidator.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestGrantValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestProfileService.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestProfileService.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestProfileService.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestProfileService.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestResourceOwnerPasswordValidator.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestResourceOwnerPasswordValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestResourceOwnerPasswordValidator.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestResourceOwnerPasswordValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestScopes.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestScopes.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestScopes.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestScopes.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TestTokenValidator.cs b/test/IdentityServer.UnitTests/Validation/Setup/TestTokenValidator.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TestTokenValidator.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TestTokenValidator.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/TokenFactory.cs b/test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/TokenFactory.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/TokenFactory.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/Setup/ValidationExtensions.cs b/test/IdentityServer.UnitTests/Validation/Setup/ValidationExtensions.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/Setup/ValidationExtensions.cs
rename to test/IdentityServer.UnitTests/Validation/Setup/ValidationExtensions.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs b/test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs
rename to test/IdentityServer.UnitTests/Validation/StrictRedirectUriValidatorAppAuthValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ClientCredentials_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Code_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_DeviceCode_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ExtensionGrants_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_General_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_PKCE.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_RefreshToken_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_ResourceOwner_Invalid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs b/test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs
rename to test/IdentityServer.UnitTests/Validation/TokenRequest Validation/TokenRequestValidation_Valid.cs
diff --git a/src/IdentityServer/test/UnitTests/Validation/UserInfoRequestValidation.cs b/test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs
similarity index 100%
rename from src/IdentityServer/test/UnitTests/Validation/UserInfoRequestValidation.cs
rename to test/IdentityServer.UnitTests/Validation/UserInfoRequestValidation.cs
diff --git a/src/IdentityServer/test/UnitTests/identityserver_testing.cer b/test/IdentityServer.UnitTests/identityserver_testing.cer
similarity index 100%
rename from src/IdentityServer/test/UnitTests/identityserver_testing.cer
rename to test/IdentityServer.UnitTests/identityserver_testing.cer
diff --git a/src/IdentityServer/test/UnitTests/identityserver_testing.pfx b/test/IdentityServer.UnitTests/identityserver_testing.pfx
similarity index 100%
rename from src/IdentityServer/test/UnitTests/identityserver_testing.pfx
rename to test/IdentityServer.UnitTests/identityserver_testing.pfx
diff --git a/src/IdentityServer/test/UnitTests/xunit.runner.json b/test/IdentityServer.UnitTests/xunit.runner.json
similarity index 100%
rename from src/IdentityServer/test/UnitTests/xunit.runner.json
rename to test/IdentityServer.UnitTests/xunit.runner.json
diff --git a/version++.sh b/version++.sh
deleted file mode 100755
index d7dc80156..000000000
--- a/version++.sh
+++ /dev/null
@@ -1 +0,0 @@
-git commit -m "empty" --allow-empty
\ No newline at end of file