Rename projects and folders

DuendeSoftware · Oct 5, 2024 · 366d852 · 366d852
1 parent 496dd83
commit 366d852
Show file tree

Hide file tree

Showing 90 changed files with 69 additions and 55 deletions.
diff --git a/.github/workflows/access-token-management-ci.yml b/.github/workflows/access-token-management-ci.yml
@@ -1,4 +1,4 @@
-name: access-token-management-ci
+name: access-token-management\ci
 
 permissions:
   contents: read
@@ -41,10 +41,7 @@ jobs:
         dotnet-version: |
           8.0.x
 
-    - name: Build and test
-      run: ./build.ps1
-
-    - name: Sign packages
+    - name: Build
       run: ./build.ps1 sign
 
     - name: Push packages to MyGet

diff --git a/.github/workflows/access-token-management-codeql.yml b/.github/workflows/access-token-management-codeql.yml
@@ -1,4 +1,4 @@
-name: acces-token-management-codeql"
+name: acces-token-management\codeql
 
 on:
   push:

diff --git a/...nagement/Duende.AccessTokenManagement.sln → ...oken-management/AccessTokenManagement.sln b/...nagement/Duende.AccessTokenManagement.sln → ...oken-management/AccessTokenManagement.sln
@@ -1,47 +1,40 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# 17
+VisualStudioVersion = 17.11.35312.102
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.AccessTokenManagement", "src\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj", "{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{FC05DC37-5F54-4171-97F9-4AC2A64E3E14}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duende.AccessTokenManagement.OpenIdConnect", "src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj", "{9C1ED189-33A1-430C-899E-78C2458C25FC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Worker", "samples\Worker\Worker.csproj", "{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Worker", "samples\Worker\Worker.csproj", "{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "samples\Web\Web.csproj", "{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web", "samples\Web\Web.csproj", "{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F65AC342-86DC-4548-883A-61DB34626203}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0B14DE7B-43BD-4570-B6AB-37EDA32032FF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "test\Tests\Tests.csproj", "{11D9707F-E9AB-47BC-82E0-699AA0C49211}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{AB15F574-FDF0-4117-9E4F-9D35EEA65125}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJarJwt", "samples\WebJarJwt\WebJarJwt.csproj", "{C73469D2-5461-4E65-A1CE-6FE83B0FCA85}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkerDI", "samples\WorkerDI\WorkerDI.csproj", "{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorServer", "samples\BlazorServer\BlazorServer.csproj", "{AB15F574-FDF0-4117-9E4F-9D35EEA65125}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement", "src\AccessTokenManagement\AccessTokenManagement.csproj", "{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJarJwt", "samples\WebJarJwt\WebJarJwt.csproj", "{C73469D2-5461-4E65-A1CE-6FE83B0FCA85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement.OpenIdConnect", "src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj", "{57A698CF-67A1-46CB-B1AB-902FFFEADB89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkerDI", "samples\WorkerDI\WorkerDI.csproj", "{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AccessTokenManagement.Tests", "test\AccessTokenManagement.Tests\AccessTokenManagement.Tests.csproj", "{93554316-F7D2-426F-A3D2-95C120A7A04D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{CF071876-039F-4DF7-92A3-B0209A7CD27F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "build", "build\build.csproj", "{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC6D6275-1096-40DD-8D5B-D04FD9C261E2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C1ED189-33A1-430C-899E-78C2458C25FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C1ED189-33A1-430C-899E-78C2458C25FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C1ED189-33A1-430C-899E-78C2458C25FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C1ED189-33A1-430C-899E-78C2458C25FC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -50,10 +43,6 @@ Global
 		{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11D9707F-E9AB-47BC-82E0-699AA0C49211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11D9707F-E9AB-47BC-82E0-699AA0C49211}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11D9707F-E9AB-47BC-82E0-699AA0C49211}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11D9707F-E9AB-47BC-82E0-699AA0C49211}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AB15F574-FDF0-4117-9E4F-9D35EEA65125}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -66,15 +55,38 @@ Global
 		{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D97D77F-4ADF-4769-AA84-4247D9C53FD9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{57A698CF-67A1-46CB-B1AB-902FFFEADB89}.Release|Any CPU.Build.0 = Release|Any CPU
+		{93554316-F7D2-426F-A3D2-95C120A7A04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{93554316-F7D2-426F-A3D2-95C120A7A04D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{93554316-F7D2-426F-A3D2-95C120A7A04D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{93554316-F7D2-426F-A3D2-95C120A7A04D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{84AA3924-23EF-4E6B-91E9-6D9F9118AAFF} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14}
 		{FB70E5D8-B185-4DA3-9BA9-2CE69D4775FF} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14}
-		{BC6D6275-1096-40DD-8D5B-D04FD9C261E2} = {F65AC342-86DC-4548-883A-61DB34626203}
-		{9C1ED189-33A1-430C-899E-78C2458C25FC} = {F65AC342-86DC-4548-883A-61DB34626203}
-		{11D9707F-E9AB-47BC-82E0-699AA0C49211} = {0B14DE7B-43BD-4570-B6AB-37EDA32032FF}
 		{AB15F574-FDF0-4117-9E4F-9D35EEA65125} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14}
 		{C73469D2-5461-4E65-A1CE-6FE83B0FCA85} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14}
 		{22D7B959-CC06-4CDC-8A13-E51E2A94EEE5} = {FC05DC37-5F54-4171-97F9-4AC2A64E3E14}
+		{9D97D77F-4ADF-4769-AA84-4247D9C53FD9} = {F65AC342-86DC-4548-883A-61DB34626203}
+		{57A698CF-67A1-46CB-B1AB-902FFFEADB89} = {F65AC342-86DC-4548-883A-61DB34626203}
+		{93554316-F7D2-426F-A3D2-95C120A7A04D} = {0B14DE7B-43BD-4570-B6AB-37EDA32032FF}
+		{3EE4C5AF-7DC5-42DC-93F7-C9F8BEF2E5C8} = {CF071876-039F-4DF7-92A3-B0209A7CD27F}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A8AE52DE-E234-417E-8152-95C30CD71A7A}
 	EndGlobalSection
 EndGlobal
diff --git a/access-token-management/build/Program.cs b/access-token-management/build/Program.cs
@@ -44,7 +44,7 @@ internal static async Task Main(string[] args)
             Target(Targets.Test, DependsOn(Targets.Build), () =>
             {
                 Run("dotnet",
-                    $"test test/Tests -c Release --nologo "
+                    $"test test/AccessTokenManagement -c Release --nologo "
                     + $"--blame-hang "
                     + $"--blame-hang-timeout=120sec "
                     + $"--logger \"console;verbosity=normal\" --logger \"trx;LogFileName=Test.trx\"");
@@ -60,8 +60,8 @@ internal static async Task Main(string[] args)
 
             Target(Targets.Pack, DependsOn(Targets.Build, Targets.CleanPackOutput), () =>
             {
-                Run("dotnet", $"pack src/Duende.AccessTokenManagement/Duende.AccessTokenManagement.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
-                Run("dotnet", $"pack src/Duende.AccessTokenManagement.OpenIdConnect/Duende.AccessTokenManagement.OpenIdConnect.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack src/AccessTokenManagement/AccessTokenManagement.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
+                Run("dotnet", $"pack src/AccessTokenManagement.OpenIdConnect/AccessTokenManagement.OpenIdConnect.csproj -c Release -o {Directory.CreateDirectory(packOutput).FullName} --no-build --nologo");
             });
 
             Target(Targets.SignPackage, DependsOn(Targets.Pack, Targets.RestoreTools), () =>

diff --git a/access-token-management/samples/BlazorServer/BlazorServer.csproj b/access-token-management/samples/BlazorServer/BlazorServer.csproj
@@ -13,7 +13,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj" />
+      <ProjectReference Include="..\..\src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/access-token-management/samples/Web/Web.csproj b/access-token-management/samples/Web/Web.csproj
@@ -9,9 +9,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj" />
+    <ProjectReference Include="..\..\src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/access-token-management/samples/WebJarJwt/WebJarJwt.csproj b/access-token-management/samples/WebJarJwt/WebJarJwt.csproj
@@ -9,8 +9,8 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
     <PackageReference Include="Serilog.AspNetCore" Version="8.0.2" />
   </ItemGroup>
-
+  
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj" />
+    <ProjectReference Include="..\..\src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj" />
   </ItemGroup>
 </Project>
diff --git a/access-token-management/samples/Worker/Worker.csproj b/access-token-management/samples/Worker/Worker.csproj
@@ -11,6 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj" />
+    <ProjectReference Include="..\..\src\AccessTokenManagement\AccessTokenManagement.csproj" />
   </ItemGroup>
 </Project>
diff --git a/access-token-management/samples/WorkerDI/WorkerDI.csproj b/access-token-management/samples/WorkerDI/WorkerDI.csproj
@@ -11,6 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj" />
+    <ProjectReference Include="..\..\src\AccessTokenManagement\AccessTokenManagement.csproj" />
   </ItemGroup>
 </Project>
diff --git a/...ccessTokenManagement.OpenIdConnect.csproj → ...ccessTokenManagement.OpenIdConnect.csproj b/...ccessTokenManagement.OpenIdConnect.csproj → ...ccessTokenManagement.OpenIdConnect.csproj
@@ -6,11 +6,13 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageId>Duende.AccessTokenManagement.OpenIdConnect</PackageId>
+        <AssemblyName>$(PackageId)</AssemblyName>
+        <RootNamespace>$(PackageId)</RootNamespace>
         <Description>Automatic access token management for interactive OpenIdConnect-based ASP.NET Core applications</Description>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="README.md" Pack="true" PackagePath=""/>
+        <None Include="README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
     <ItemGroup>
@@ -20,8 +22,10 @@
 
         <PackageReference Include="MinVer" Version="5.0.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-
-        <ProjectReference Include="..\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\AccessTokenManagement\AccessTokenManagement.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...ct/AuthenticationSessionUserTokenStore.cs → ...ct/AuthenticationSessionUserTokenStore.cs b/...ct/AuthenticationSessionUserTokenStore.cs → ...ct/AuthenticationSessionUserTokenStore.cs
diff --git a/...Connect/AuthorizationServerDPoPHandler.cs → ...Connect/AuthorizationServerDPoPHandler.cs b/...Connect/AuthorizationServerDPoPHandler.cs → ...Connect/AuthorizationServerDPoPHandler.cs
diff --git a/...dConnect/BlazorServerPrincipalAccessor.cs → ...dConnect/BlazorServerPrincipalAccessor.cs b/...dConnect/BlazorServerPrincipalAccessor.cs → ...dConnect/BlazorServerPrincipalAccessor.cs
diff --git a/....OpenIdConnect/CircuitServicesAccessor.cs → ....OpenIdConnect/CircuitServicesAccessor.cs b/....OpenIdConnect/CircuitServicesAccessor.cs → ....OpenIdConnect/CircuitServicesAccessor.cs
diff --git a/...eOpenIdConnectClientCredentialsOptions.cs → ...eOpenIdConnectClientCredentialsOptions.cs b/...eOpenIdConnectClientCredentialsOptions.cs → ...eOpenIdConnectClientCredentialsOptions.cs
diff --git a/...dConnect/ConfigureOpenIdConnectOptions.cs → ...dConnect/ConfigureOpenIdConnectOptions.cs b/...dConnect/ConfigureOpenIdConnectOptions.cs → ...dConnect/ConfigureOpenIdConnectOptions.cs
diff --git a/...IdConnect/HttpContextPrincipalAccessor.cs → ...IdConnect/HttpContextPrincipalAccessor.cs b/...IdConnect/HttpContextPrincipalAccessor.cs → ...IdConnect/HttpContextPrincipalAccessor.cs
diff --git a/...ement.OpenIdConnect/IPrincipalAccessor.cs → ...ement.OpenIdConnect/IPrincipalAccessor.cs b/...ement.OpenIdConnect/IPrincipalAccessor.cs → ...ement.OpenIdConnect/IPrincipalAccessor.cs
diff --git a/...IStoreTokensInAuthenticationProperties.cs → ...IStoreTokensInAuthenticationProperties.cs b/...IStoreTokensInAuthenticationProperties.cs → ...IStoreTokensInAuthenticationProperties.cs
diff --git a/...ces/IOpenIdConnectConfigurationService.cs → ...ces/IOpenIdConnectConfigurationService.cs b/...ces/IOpenIdConnectConfigurationService.cs → ...ces/IOpenIdConnectConfigurationService.cs
diff --git a/...t/Interfaces/IUserTokenEndpointService.cs → ...t/Interfaces/IUserTokenEndpointService.cs b/...t/Interfaces/IUserTokenEndpointService.cs → ...t/Interfaces/IUserTokenEndpointService.cs
diff --git a/...Interfaces/IUserTokenManagementService.cs → ...Interfaces/IUserTokenManagementService.cs b/...Interfaces/IUserTokenManagementService.cs → ...Interfaces/IUserTokenManagementService.cs
diff --git a/...faces/IUserTokenRequestSynchronization.cs → ...faces/IUserTokenRequestSynchronization.cs b/...faces/IUserTokenRequestSynchronization.cs → ...faces/IUserTokenRequestSynchronization.cs
diff --git a/...enIdConnect/Interfaces/IUserTokenStore.cs → ...enIdConnect/Interfaces/IUserTokenStore.cs b/...enIdConnect/Interfaces/IUserTokenStore.cs → ...enIdConnect/Interfaces/IUserTokenStore.cs
diff --git a/.../OpenIdConnectClientAccessTokenHandler.cs → .../OpenIdConnectClientAccessTokenHandler.cs b/.../OpenIdConnectClientAccessTokenHandler.cs → .../OpenIdConnectClientAccessTokenHandler.cs
diff --git a/...nnect/OpenIdConnectClientConfiguration.cs → ...nnect/OpenIdConnectClientConfiguration.cs b/...nnect/OpenIdConnectClientConfiguration.cs → ...nnect/OpenIdConnectClientConfiguration.cs
diff --git a/...nect/OpenIdConnectConfigurationService.cs → ...nect/OpenIdConnectConfigurationService.cs b/...nect/OpenIdConnectConfigurationService.cs → ...nect/OpenIdConnectConfigurationService.cs
diff --git a/...t/OpenIdConnectTokenManagementDefaults.cs → ...t/OpenIdConnectTokenManagementDefaults.cs b/...t/OpenIdConnectTokenManagementDefaults.cs → ...t/OpenIdConnectTokenManagementDefaults.cs
diff --git a/...nManagementServiceCollectionExtensions.cs → ...nManagementServiceCollectionExtensions.cs b/...nManagementServiceCollectionExtensions.cs → ...nManagementServiceCollectionExtensions.cs
diff --git a/...ct/OpenIdConnectUserAccessTokenHandler.cs → ...ct/OpenIdConnectUserAccessTokenHandler.cs b/...ct/OpenIdConnectUserAccessTokenHandler.cs → ...ct/OpenIdConnectUserAccessTokenHandler.cs
diff --git a/...ssTokenManagement.OpenIdConnect/README.md → ...ssTokenManagement.OpenIdConnect/README.md b/...ssTokenManagement.OpenIdConnect/README.md → ...ssTokenManagement.OpenIdConnect/README.md
diff --git a/.../StoreTokensInAuthenticationProperties.cs → .../StoreTokensInAuthenticationProperties.cs b/.../StoreTokensInAuthenticationProperties.cs → .../StoreTokensInAuthenticationProperties.cs
diff --git a/...agement.OpenIdConnect/StringExtensions.cs → ...agement.OpenIdConnect/StringExtensions.cs b/...agement.OpenIdConnect/StringExtensions.cs → ...agement.OpenIdConnect/StringExtensions.cs
diff --git a/...t/TokenManagementHttpContextExtensions.cs → ...t/TokenManagementHttpContextExtensions.cs b/...t/TokenManagementHttpContextExtensions.cs → ...t/TokenManagementHttpContextExtensions.cs
diff --git a/...nnect/UserAccessTokenManagementService.cs → ...nnect/UserAccessTokenManagementService.cs b/...nnect/UserAccessTokenManagementService.cs → ...nnect/UserAccessTokenManagementService.cs
diff --git a/...okenManagement.OpenIdConnect/UserToken.cs → ...okenManagement.OpenIdConnect/UserToken.cs b/...okenManagement.OpenIdConnect/UserToken.cs → ...okenManagement.OpenIdConnect/UserToken.cs
diff --git a/...OpenIdConnect/UserTokenEndpointService.cs → ...OpenIdConnect/UserTokenEndpointService.cs b/...OpenIdConnect/UserTokenEndpointService.cs → ...OpenIdConnect/UserTokenEndpointService.cs
diff --git a/...enIdConnect/UserTokenManagementOptions.cs → ...enIdConnect/UserTokenManagementOptions.cs b/...enIdConnect/UserTokenManagementOptions.cs → ...enIdConnect/UserTokenManagementOptions.cs
diff --git a/...enIdConnect/UserTokenRequestParameters.cs → ...enIdConnect/UserTokenRequestParameters.cs b/...enIdConnect/UserTokenRequestParameters.cs → ...enIdConnect/UserTokenRequestParameters.cs
diff --git a/...onnect/UserTokenRequestSynchronization.cs → ...onnect/UserTokenRequestSynchronization.cs b/...onnect/UserTokenRequestSynchronization.cs → ...onnect/UserTokenRequestSynchronization.cs
diff --git a/...cessTokenManagement/AccessTokenHandler.cs → ...cessTokenManagement/AccessTokenHandler.cs b/...cessTokenManagement/AccessTokenHandler.cs → ...cessTokenManagement/AccessTokenHandler.cs
diff --git a/...ement/Duende.AccessTokenManagement.csproj → ...enManagement/AccessTokenManagement.csproj b/...ement/Duende.AccessTokenManagement.csproj → ...enManagement/AccessTokenManagement.csproj
@@ -6,6 +6,8 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageId>Duende.AccessTokenManagement</PackageId>
+        <AssemblyName>$(PackageId)</AssemblyName>
+        <RootNamespace>$(PackageId)</RootNamespace>
         <Description>Automatic access token management for OAuth client credential flows</Description>
     </PropertyGroup>
 

diff --git a/...okenManagement/ClientCredentialsClient.cs → ...okenManagement/ClientCredentialsClient.cs b/...okenManagement/ClientCredentialsClient.cs → ...okenManagement/ClientCredentialsClient.cs
diff --git a/...TokenManagement/ClientCredentialsToken.cs → ...TokenManagement/ClientCredentialsToken.cs b/...TokenManagement/ClientCredentialsToken.cs → ...TokenManagement/ClientCredentialsToken.cs
diff --git a/.../ClientCredentialsTokenEndpointService.cs → .../ClientCredentialsTokenEndpointService.cs b/.../ClientCredentialsTokenEndpointService.cs → .../ClientCredentialsTokenEndpointService.cs
diff --git a/...nagement/ClientCredentialsTokenHandler.cs → ...nagement/ClientCredentialsTokenHandler.cs b/...nagement/ClientCredentialsTokenHandler.cs → ...nagement/ClientCredentialsTokenHandler.cs
diff --git a/...lientCredentialsTokenManagementBuilder.cs → ...lientCredentialsTokenManagementBuilder.cs b/...lientCredentialsTokenManagementBuilder.cs → ...lientCredentialsTokenManagementBuilder.cs
diff --git a/...ientCredentialsTokenManagementDefaults.cs → ...ientCredentialsTokenManagementDefaults.cs b/...ientCredentialsTokenManagementDefaults.cs → ...ientCredentialsTokenManagementDefaults.cs
diff --git a/...lientCredentialsTokenManagementOptions.cs → ...lientCredentialsTokenManagementOptions.cs b/...lientCredentialsTokenManagementOptions.cs → ...lientCredentialsTokenManagementOptions.cs
diff --git a/...lientCredentialsTokenManagementService.cs → ...lientCredentialsTokenManagementService.cs b/...lientCredentialsTokenManagementService.cs → ...lientCredentialsTokenManagementService.cs
diff --git a/...nManagementServiceCollectionExtensions.cs → ...nManagementServiceCollectionExtensions.cs b/...nManagementServiceCollectionExtensions.cs → ...nManagementServiceCollectionExtensions.cs
diff --git a/...e.AccessTokenManagement/DPoPExtensions.cs → ...c/AccessTokenManagement/DPoPExtensions.cs b/...e.AccessTokenManagement/DPoPExtensions.cs → ...c/AccessTokenManagement/DPoPExtensions.cs
diff --git a/...nagement/DefaultClientAssertionService.cs → ...nagement/DefaultClientAssertionService.cs b/...nagement/DefaultClientAssertionService.cs → ...nagement/DefaultClientAssertionService.cs
diff --git a/...essTokenManagement/DefaultDPoPKeyStore.cs → ...essTokenManagement/DefaultDPoPKeyStore.cs b/...essTokenManagement/DefaultDPoPKeyStore.cs → ...essTokenManagement/DefaultDPoPKeyStore.cs
diff --git a/...okenManagement/DefaultDPoPProofService.cs → ...okenManagement/DefaultDPoPProofService.cs b/...okenManagement/DefaultDPoPProofService.cs → ...okenManagement/DefaultDPoPProofService.cs
diff --git a/...DistributedClientCredentialsTokenCache.cs → ...DistributedClientCredentialsTokenCache.cs b/...DistributedClientCredentialsTokenCache.cs → ...DistributedClientCredentialsTokenCache.cs
diff --git a/...enManagement/DistributedDPoPNonceStore.cs → ...enManagement/DistributedDPoPNonceStore.cs b/...enManagement/DistributedDPoPNonceStore.cs → ...enManagement/DistributedDPoPNonceStore.cs
diff --git a/...ent/Interfaces/IClientAssertionService.cs → ...ent/Interfaces/IClientAssertionService.cs b/...ent/Interfaces/IClientAssertionService.cs → ...ent/Interfaces/IClientAssertionService.cs
diff --git a/...nterfaces/IClientCredentialsTokenCache.cs → ...nterfaces/IClientCredentialsTokenCache.cs b/...nterfaces/IClientCredentialsTokenCache.cs → ...nterfaces/IClientCredentialsTokenCache.cs
diff --git a/...IClientCredentialsTokenEndpointService.cs → ...IClientCredentialsTokenEndpointService.cs b/...IClientCredentialsTokenEndpointService.cs → ...IClientCredentialsTokenEndpointService.cs
diff --git a/...lientCredentialsTokenManagementService.cs → ...lientCredentialsTokenManagementService.cs b/...lientCredentialsTokenManagementService.cs → ...lientCredentialsTokenManagementService.cs
diff --git a/...kenManagement/Interfaces/IDPoPKeyStore.cs → ...kenManagement/Interfaces/IDPoPKeyStore.cs b/...kenManagement/Interfaces/IDPoPKeyStore.cs → ...kenManagement/Interfaces/IDPoPKeyStore.cs
diff --git a/...nManagement/Interfaces/IDPoPNonceStore.cs → ...nManagement/Interfaces/IDPoPNonceStore.cs b/...nManagement/Interfaces/IDPoPNonceStore.cs → ...nManagement/Interfaces/IDPoPNonceStore.cs
diff --git a/...anagement/Interfaces/IDPoPProofService.cs → ...anagement/Interfaces/IDPoPProofService.cs b/...anagement/Interfaces/IDPoPProofService.cs → ...anagement/Interfaces/IDPoPProofService.cs
diff --git a/...nterfaces/ITokenRequestSynchronization.cs → ...nterfaces/ITokenRequestSynchronization.cs b/...nterfaces/ITokenRequestSynchronization.cs → ...nterfaces/ITokenRequestSynchronization.cs
diff --git a/...rc/Duende.AccessTokenManagement/README.md → ...ement/src/AccessTokenManagement/README.md b/...rc/Duende.AccessTokenManagement/README.md → ...ement/src/AccessTokenManagement/README.md
diff --git a/...TokenManagement/TokenRequestParameters.cs → ...TokenManagement/TokenRequestParameters.cs b/...TokenManagement/TokenRequestParameters.cs → ...TokenManagement/TokenRequestParameters.cs
diff --git a/...Management/TokenRequestSynchronization.cs → ...Management/TokenRequestSynchronization.cs b/...Management/TokenRequestSynchronization.cs → ...Management/TokenRequestSynchronization.cs
diff --git a/...ent/test/Tests/AccessTokenHandlerTests.cs → ...nagement.Tests/AccessTokenHandlerTests.cs b/...ent/test/Tests/AccessTokenHandlerTests.cs → ...nagement.Tests/AccessTokenHandlerTests.cs
diff --git a/...-token-management/test/Tests/Tests.csproj → ....Tests/AccessTokenManagement.Tests.csproj b/...-token-management/test/Tests/Tests.csproj → ....Tests/AccessTokenManagement.Tests.csproj
@@ -4,15 +4,15 @@
         <TargetFrameworks>net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
+        <RootNamespace>Duende.AccessTokenManagement</RootNamespace>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer"/>
-        <PackageReference Include="Microsoft.AspNetCore.TestHost"/>
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" />
 
         <PackageReference Include="Duende.IdentityServer" Version="$(IdentityServerVersion)" />
 
@@ -40,12 +40,11 @@
         with AngleSharp. -->
         <PackageReference Include="Microsoft.NETCore.Jit" Version="2.0.8" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2"/>
+        <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\src\Duende.AccessTokenManagement.OpenIdConnect\Duende.AccessTokenManagement.OpenIdConnect.csproj" />
-      <ProjectReference Include="..\..\src\Duende.AccessTokenManagement\Duende.AccessTokenManagement.csproj" />
+      <ProjectReference Include="..\..\src\AccessTokenManagement.OpenIdConnect\AccessTokenManagement.OpenIdConnect.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...ment/test/Tests/BackChannelClientTests.cs → ...anagement.Tests/BackChannelClientTests.cs b/...ment/test/Tests/BackChannelClientTests.cs → ...anagement.Tests/BackChannelClientTests.cs
diff --git a/...st/Tests/ClientTokenManagementApiTests.cs → ...nt.Tests/ClientTokenManagementApiTests.cs b/...st/Tests/ClientTokenManagementApiTests.cs → ...nt.Tests/ClientTokenManagementApiTests.cs
diff --git a/.../test/Tests/ClientTokenManagementTests.cs → ...ement.Tests/ClientTokenManagementTests.cs b/.../test/Tests/ClientTokenManagementTests.cs → ...ement.Tests/ClientTokenManagementTests.cs
diff --git a/...anagement/test/Tests/Framework/ApiHost.cs → ...okenManagement.Tests/Framework/ApiHost.cs b/...anagement/test/Tests/Framework/ApiHost.cs → ...okenManagement.Tests/Framework/ApiHost.cs
diff --git a/...anagement/test/Tests/Framework/AppHost.cs → ...okenManagement.Tests/Framework/AppHost.cs b/...anagement/test/Tests/Framework/AppHost.cs → ...okenManagement.Tests/Framework/AppHost.cs
diff --git a/...ement/test/Tests/Framework/GenericHost.cs → ...Management.Tests/Framework/GenericHost.cs b/...ement/test/Tests/Framework/GenericHost.cs → ...Management.Tests/Framework/GenericHost.cs
diff --git a/...est/Tests/Framework/IdentityServerHost.cs → ...ent.Tests/Framework/IdentityServerHost.cs b/...est/Tests/Framework/IdentityServerHost.cs → ...ent.Tests/Framework/IdentityServerHost.cs
diff --git a/...st/Tests/Framework/IntegrationTestBase.cs → ...nt.Tests/Framework/IntegrationTestBase.cs b/...st/Tests/Framework/IntegrationTestBase.cs → ...nt.Tests/Framework/IntegrationTestBase.cs
diff --git a/...test/Tests/Framework/TestBrowserClient.cs → ...ment.Tests/Framework/TestBrowserClient.cs b/...test/Tests/Framework/TestBrowserClient.cs → ...ment.Tests/Framework/TestBrowserClient.cs
diff --git a/...s/Framework/TestClientAssertionService.cs → ...s/Framework/TestClientAssertionService.cs b/...s/Framework/TestClientAssertionService.cs → ...s/Framework/TestClientAssertionService.cs
diff --git a/...est/Tests/Framework/TestDPoPNonceStore.cs → ...ent.Tests/Framework/TestDPoPNonceStore.cs b/...est/Tests/Framework/TestDPoPNonceStore.cs → ...ent.Tests/Framework/TestDPoPNonceStore.cs
diff --git a/...t/Tests/Framework/TestDPoPProofService.cs → ...t.Tests/Framework/TestDPoPProofService.cs b/...t/Tests/Framework/TestDPoPProofService.cs → ...t.Tests/Framework/TestDPoPProofService.cs
diff --git a/...t/Tests/Framework/TestDistributedCache.cs → ...t.Tests/Framework/TestDistributedCache.cs b/...t/Tests/Framework/TestDistributedCache.cs → ...t.Tests/Framework/TestDistributedCache.cs
diff --git a/...est/Tests/Framework/TestLoggerProvider.cs → ...ent.Tests/Framework/TestLoggerProvider.cs b/...est/Tests/Framework/TestLoggerProvider.cs → ...ent.Tests/Framework/TestLoggerProvider.cs
diff --git a/...est/Tests/Framework/TestOptionsMonitor.cs → ...ent.Tests/Framework/TestOptionsMonitor.cs b/...est/Tests/Framework/TestOptionsMonitor.cs → ...ent.Tests/Framework/TestOptionsMonitor.cs
diff --git a/...est/Tests/Framework/TestSchemeProvider.cs → ...ent.Tests/Framework/TestSchemeProvider.cs b/...est/Tests/Framework/TestSchemeProvider.cs → ...ent.Tests/Framework/TestSchemeProvider.cs
diff --git a/...eTokensInAuthenticationPropertiesTests.cs → ...eTokensInAuthenticationPropertiesTests.cs b/...eTokensInAuthenticationPropertiesTests.cs → ...eTokensInAuthenticationPropertiesTests.cs
diff --git a/...nt/test/Tests/UserTokenManagementTests.cs → ...agement.Tests/UserTokenManagementTests.cs b/...nt/test/Tests/UserTokenManagementTests.cs → ...agement.Tests/UserTokenManagementTests.cs
diff --git a/...Tests/UserTokenManagementWithDPoPTests.cs → ...Tests/UserTokenManagementWithDPoPTests.cs b/...Tests/UserTokenManagementWithDPoPTests.cs → ...Tests/UserTokenManagementWithDPoPTests.cs
diff --git a/access-token-management/test/Tests/Usings.cs → ...est/AccessTokenManagement.Tests/Usings.cs b/access-token-management/test/Tests/Usings.cs → ...est/AccessTokenManagement.Tests/Usings.cs