diff --git a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
index 36bec5a2..6678edd7 100755
--- a/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
+++ b/IdentityServer/v7/Basics/ClientCredentials/ClientCredentials.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientCredentials.AppHost", "ClientCredentials.AppHost\ClientCredentials.AppHost.csproj", "{62431B35-40B5-43B9-B4B7-BF730DEAA56D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{BB18E0F2-0E68-473A-B69F-7921335E7C22}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,18 @@ Global
 		{62431B35-40B5-43B9-B4B7-BF730DEAA56D}.Release|x64.Build.0 = Release|Any CPU
 		{62431B35-40B5-43B9-B4B7-BF730DEAA56D}.Release|x86.ActiveCfg = Release|Any CPU
 		{62431B35-40B5-43B9-B4B7-BF730DEAA56D}.Release|x86.Build.0 = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|x64.Build.0 = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Debug|x86.Build.0 = Debug|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|x64.ActiveCfg = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|x64.Build.0 = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|x86.ActiveCfg = Release|Any CPU
+		{BB18E0F2-0E68-473A-B69F-7921335E7C22}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Basics/Introspection/Introspection.sln b/IdentityServer/v7/Basics/Introspection/Introspection.sln
index 2e561b87..a195095a 100755
--- a/IdentityServer/v7/Basics/Introspection/Introspection.sln
+++ b/IdentityServer/v7/Basics/Introspection/Introspection.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceBasedApi", "..\..\A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Introspection.AppHost", "Introspection.AppHost\Introspection.AppHost.csproj", "{66086001-58EF-499D-933C-0AB86778BB94}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{D189E013-1D9E-43C8-8108-C1A5464E5E93}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,18 @@ Global
 		{66086001-58EF-499D-933C-0AB86778BB94}.Release|x64.Build.0 = Release|Any CPU
 		{66086001-58EF-499D-933C-0AB86778BB94}.Release|x86.ActiveCfg = Release|Any CPU
 		{66086001-58EF-499D-933C-0AB86778BB94}.Release|x86.Build.0 = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|x64.Build.0 = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Debug|x86.Build.0 = Debug|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|x64.ActiveCfg = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|x64.Build.0 = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|x86.ActiveCfg = Release|Any CPU
+		{D189E013-1D9E-43C8-8108-C1A5464E5E93}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
index 3c2c6b54..16d0b45c 100755
--- a/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
+++ b/IdentityServer/v7/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtBasedClientAuthentication.AppHost", "JwtBasedClientAuthentication.AppHost\JwtBasedClientAuthentication.AppHost.csproj", "{D257943F-BD65-4E2F-8ECE-266A76B56A64}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{227D5368-2D82-4DE2-A051-DEF434053A18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,9 +22,6 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -72,7 +71,20 @@ Global
 		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x64.Build.0 = Release|Any CPU
 		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x86.ActiveCfg = Release|Any CPU
 		{D257943F-BD65-4E2F-8ECE-266A76B56A64}.Release|x86.Build.0 = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|x64.Build.0 = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Debug|x86.Build.0 = Debug|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|Any CPU.Build.0 = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|x64.ActiveCfg = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|x64.Build.0 = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|x86.ActiveCfg = Release|Any CPU
+		{227D5368-2D82-4DE2-A051-DEF434053A18}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
index 3e2fe507..b3e5b07e 100755
--- a/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
+++ b/IdentityServer/v7/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBackChannelLogout.AppHos
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{7B0208C4-E0E9-419C-A045-6EF257AAF467}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,18 @@ Global
 		{D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x64.Build.0 = Release|Any CPU
 		{D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x86.ActiveCfg = Release|Any CPU
 		{D91E7A1F-6907-4441-ADBD-21F5130699D8}.Release|x86.Build.0 = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|x64.Build.0 = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Debug|x86.Build.0 = Debug|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|x64.ActiveCfg = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|x64.Build.0 = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|x86.ActiveCfg = Release|Any CPU
+		{7B0208C4-E0E9-419C-A045-6EF257AAF467}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
index a745002d..7f44f40c 100755
--- a/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
+++ b/IdentityServer/v7/Basics/MvcBasic/MvcBasic.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBasic.AppHost", "MvcBasic.AppHost\MvcBasic.AppHost.csproj", "{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,22 +22,7 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -71,20 +58,33 @@ Global
 		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.ActiveCfg = Release|Any CPU
 		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x64.Build.0 = Release|Any CPU
 		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.ActiveCfg = Release|Any CPU
-                {4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.ActiveCfg = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.Build.0 = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.Build.0 = Debug|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.Build.0 = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.ActiveCfg = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.Build.0 = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.ActiveCfg = Release|Any CPU
-                {F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.Build.0 = Release|Any CPU
-        EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
+		{4C432499-3659-4D5F-868C-C8273D16462F}.Release|x86.Build.0 = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x64.Build.0 = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B7}.Release|x86.Build.0 = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|x64.Build.0 = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Debug|x86.Build.0 = Debug|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|x64.ActiveCfg = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|x64.Build.0 = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|x86.ActiveCfg = Release|Any CPU
+		{47C0E932-19CA-474D-A2AC-FA707A5AA7BE}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
index a9942a54..b3672bd0 100755
--- a/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
+++ b/IdentityServer/v7/Basics/MvcJarJwt/MvcJarJwt.sln
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcJarJwt.AppHost", "MvcJarJwt.AppHost\MvcJarJwt.AppHost.csproj", "{B3C2D4E5-F6A7-4B8C-9D0E-F1A2B3C4D5E6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,22 +22,7 @@ Global
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x64.Build.0 = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -84,7 +71,20 @@ Global
 		{B3C2D4E5-F6A7-4B8C-9D0E-F1A2B3C4D5E6}.Release|x64.Build.0 = Release|Any CPU
 		{B3C2D4E5-F6A7-4B8C-9D0E-F1A2B3C4D5E6}.Release|x86.ActiveCfg = Release|Any CPU
 		{B3C2D4E5-F6A7-4B8C-9D0E-F1A2B3C4D5E6}.Release|x86.Build.0 = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|x64.Build.0 = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Debug|x86.Build.0 = Debug|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|x64.ActiveCfg = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|x64.Build.0 = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|x86.ActiveCfg = Release|Any CPU
+		{C1DED64A-BD33-45F8-B30D-406BBEA7E7C5}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v7/Basics/MvcPar/MvcPar.sln b/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
index ba9a26b0..08617d87 100644
--- a/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
+++ b/IdentityServer/v7/Basics/MvcPar/MvcPar.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcPar.AppHost", "MvcPar.Ap
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{1237F83B-7E53-4D51-BCF6-FE30091A9D52}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,18 @@ Global
 		{B0D6F82D-1FD4-49B2-88F3-6541EFC32EC3}.Release|x64.Build.0 = Release|Any CPU
 		{B0D6F82D-1FD4-49B2-88F3-6541EFC32EC3}.Release|x86.ActiveCfg = Release|Any CPU
 		{B0D6F82D-1FD4-49B2-88F3-6541EFC32EC3}.Release|x86.Build.0 = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|x64.Build.0 = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Debug|x86.Build.0 = Debug|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|x64.ActiveCfg = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|x64.Build.0 = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|x86.ActiveCfg = Release|Any CPU
+		{1237F83B-7E53-4D51-BCF6-FE30091A9D52}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
index 25feb211..2797e48d 100755
--- a/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
+++ b/IdentityServer/v7/Basics/MvcTokenManagement/MvcTokenManagement.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcTokenManagement.AppHost"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,18 @@ Global
 		{7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x64.Build.0 = Release|Any CPU
 		{7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x86.ActiveCfg = Release|Any CPU
 		{7A6C0E4E-6722-48C9-9178-AC0822FE1534}.Release|x86.Build.0 = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|x64.Build.0 = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Debug|x86.Build.0 = Debug|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|x64.ActiveCfg = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|x64.Build.0 = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|x86.ActiveCfg = Release|Any CPU
+		{91B38286-A9A8-4EDA-B18C-0A24A4C4DD33}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Configuration/Permissions/Permissions.sln b/IdentityServer/v7/Configuration/Permissions/Permissions.sln
index 268012c9..a44abebd 100644
--- a/IdentityServer/v7/Configuration/Permissions/Permissions.sln
+++ b/IdentityServer/v7/Configuration/Permissions/Permissions.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Permissions.AppHost", "Permissions.AppHost\Permissions.AppHost.csproj", "{134DF05E-813E-472D-B8AC-5246E21394C6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{03D5F200-D6B7-45AB-9D89-13B8255D6611}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{134DF05E-813E-472D-B8AC-5246E21394C6}.Release|x64.Build.0 = Release|Any CPU
 		{134DF05E-813E-472D-B8AC-5246E21394C6}.Release|x86.ActiveCfg = Release|Any CPU
 		{134DF05E-813E-472D-B8AC-5246E21394C6}.Release|x86.Build.0 = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|x64.Build.0 = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Debug|x86.Build.0 = Debug|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|x64.ActiveCfg = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|x64.Build.0 = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|x86.ActiveCfg = Release|Any CPU
+		{03D5F200-D6B7-45AB-9D89-13B8255D6611}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.sln b/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.sln
index dfc6ef33..49355135 100644
--- a/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.sln
+++ b/IdentityServer/v7/Configuration/PipelineRegistration/PipelineRegistration.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipelineRegistration.AppHost", "PipelineRegistration.AppHost\PipelineRegistration.AppHost.csproj", "{8F7BBD2B-6C13-409F-8442-C8DF4E942FB6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{2E90118F-4454-4480-AD73-1C922BEDA1E7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{8F7BBD2B-6C13-409F-8442-C8DF4E942FB6}.Release|x64.Build.0 = Release|Any CPU
 		{8F7BBD2B-6C13-409F-8442-C8DF4E942FB6}.Release|x86.ActiveCfg = Release|Any CPU
 		{8F7BBD2B-6C13-409F-8442-C8DF4E942FB6}.Release|x86.Build.0 = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|x64.Build.0 = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Debug|x86.Build.0 = Debug|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|x64.ActiveCfg = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|x64.Build.0 = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|x86.ActiveCfg = Release|Any CPU
+		{2E90118F-4454-4480-AD73-1C922BEDA1E7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Configuration/SimpleDcr/Configuration.sln b/IdentityServer/v7/Configuration/SimpleDcr/Configuration.sln
index bdfc3477..ff7845c4 100644
--- a/IdentityServer/v7/Configuration/SimpleDcr/Configuration.sln
+++ b/IdentityServer/v7/Configuration/SimpleDcr/Configuration.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDcr.AppHost", "SimpleDcr.AppHost\SimpleDcr.AppHost.csproj", "{729A28E9-EF1F-4EBA-B09A-FFBCB9AD1C32}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{08128302-5398-4E88-8DEA-623A7635A2DD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{729A28E9-EF1F-4EBA-B09A-FFBCB9AD1C32}.Release|x64.Build.0 = Release|Any CPU
 		{729A28E9-EF1F-4EBA-B09A-FFBCB9AD1C32}.Release|x86.ActiveCfg = Release|Any CPU
 		{729A28E9-EF1F-4EBA-B09A-FFBCB9AD1C32}.Release|x86.Build.0 = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|x64.Build.0 = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Debug|x86.Build.0 = Debug|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|x64.ActiveCfg = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|x64.Build.0 = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|x86.ActiveCfg = Release|Any CPU
+		{08128302-5398-4E88-8DEA-623A7635A2DD}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.sln b/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.sln
index 129474a3..4884cacd 100644
--- a/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.sln
+++ b/IdentityServer/v7/Configuration/SoftwareStatement/SoftwareStatement.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareStatement.AppHost", "SoftwareStatement.AppHost\SoftwareStatement.AppHost.csproj", "{38129495-2E96-431B-BEEA-705A3F75FD15}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{38129495-2E96-431B-BEEA-705A3F75FD15}.Release|x64.Build.0 = Release|Any CPU
 		{38129495-2E96-431B-BEEA-705A3F75FD15}.Release|x86.ActiveCfg = Release|Any CPU
 		{38129495-2E96-431B-BEEA-705A3F75FD15}.Release|x86.Build.0 = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|x64.Build.0 = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Debug|x86.Build.0 = Debug|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|x64.ActiveCfg = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|x64.Build.0 = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|x86.ActiveCfg = Release|Any CPU
+		{F86C66C6-64AE-4D8D-AAD4-36F913E0F0EE}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/DPoP/DPoP.sln b/IdentityServer/v7/DPoP/DPoP.sln
index 69dc74c8..d57ba2d8 100644
--- a/IdentityServer/v7/DPoP/DPoP.sln
+++ b/IdentityServer/v7/DPoP/DPoP.sln
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\Id
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPoP.AppHost", "DPoP.AppHost\DPoP.AppHost.csproj", "{4215C502-1889-4B92-B3BC-C6DB63FF4CF0}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{8EA51636-0821-48B2-A788-5EFCE67A0821}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{4215C502-1889-4B92-B3BC-C6DB63FF4CF0}.Release|x64.Build.0 = Release|Any CPU
 		{4215C502-1889-4B92-B3BC-C6DB63FF4CF0}.Release|x86.ActiveCfg = Release|Any CPU
 		{4215C502-1889-4B92-B3BC-C6DB63FF4CF0}.Release|x86.Build.0 = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|x64.Build.0 = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Debug|x86.Build.0 = Debug|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|x64.ActiveCfg = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|x64.Build.0 = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|x86.ActiveCfg = Release|Any CPU
+		{8EA51636-0821-48B2-A788-5EFCE67A0821}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/Directory.Packages.props b/IdentityServer/v7/Directory.Packages.props
index 86e8191d..9ec6873f 100644
--- a/IdentityServer/v7/Directory.Packages.props
+++ b/IdentityServer/v7/Directory.Packages.props
@@ -4,7 +4,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.3.0" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.5" />
     <PackageVersion Include="Duende.AccessTokenManagement" Version="4.2.0" />
     <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.2.0" />
     <PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="1.0.2" />
@@ -22,7 +22,7 @@
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Certificate" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="10.0.7" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="10.0.9" />
     <PackageVersion Include="Microsoft.AspNetCore.Authentication.WsFederation" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.7" />
@@ -40,7 +40,7 @@
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.5.0" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.19.1" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.17.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
     <PackageVersion Include="ModelContextProtocol" Version="1.2.0" />
diff --git a/IdentityServer/v7/McpDemo/McpDemo.sln b/IdentityServer/v7/McpDemo/McpDemo.sln
index 956b3951..33af22c3 100644
--- a/IdentityServer/v7/McpDemo/McpDemo.sln
+++ b/IdentityServer/v7/McpDemo/McpDemo.sln
@@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McpDemo.Client", "McpDemo.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McpDemo.AppHost", "McpDemo.AppHost\McpDemo.AppHost.csproj", "{0AA954E8-17F7-4272-BDDC-043DBFB1DBEC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{F49E5582-2C89-41D4-B297-34322B1C14F4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -66,6 +68,18 @@ Global
 		{0AA954E8-17F7-4272-BDDC-043DBFB1DBEC}.Release|x64.Build.0 = Release|Any CPU
 		{0AA954E8-17F7-4272-BDDC-043DBFB1DBEC}.Release|x86.ActiveCfg = Release|Any CPU
 		{0AA954E8-17F7-4272-BDDC-043DBFB1DBEC}.Release|x86.Build.0 = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|x64.Build.0 = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Debug|x86.Build.0 = Debug|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|x64.ActiveCfg = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|x64.Build.0 = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{F49E5582-2C89-41D4-B297-34322B1C14F4}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/ScopesAndResources/ScopesAndResources.sln b/IdentityServer/v7/ScopesAndResources/ScopesAndResources.sln
index bcde9eff..d826e620 100755
--- a/IdentityServer/v7/ScopesAndResources/ScopesAndResources.sln
+++ b/IdentityServer/v7/ScopesAndResources/ScopesAndResources.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScopesAndResources.AppHost", "ScopesAndResources.AppHost\ScopesAndResources.AppHost.csproj", "{5B5C7533-60AD-4819-911E-D332819F0526}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,18 @@ Global
 		{5B5C7533-60AD-4819-911E-D332819F0526}.Release|x64.Build.0 = Release|Any CPU
 		{5B5C7533-60AD-4819-911E-D332819F0526}.Release|x86.ActiveCfg = Release|Any CPU
 		{5B5C7533-60AD-4819-911E-D332819F0526}.Release|x86.Build.0 = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|x64.Build.0 = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Debug|x86.Build.0 = Debug|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|x64.ActiveCfg = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|x64.Build.0 = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|x86.ActiveCfg = Release|Any CPU
+		{FFEFFE54-C84B-41CF-BCDB-8C9E22E5128C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/SessionMigration/SessionMigration.sln b/IdentityServer/v7/SessionMigration/SessionMigration.sln
index a554a5d7..85b07a76 100644
--- a/IdentityServer/v7/SessionMigration/SessionMigration.sln
+++ b/IdentityServer/v7/SessionMigration/SessionMigration.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionMigration", "Session
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionMigration.AppHost", "SessionMigration.AppHost\SessionMigration.AppHost.csproj", "{55BF0DB0-2C81-4551-92CB-6D2204A62ECB}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -41,6 +43,18 @@ Global
 		{55BF0DB0-2C81-4551-92CB-6D2204A62ECB}.Release|x64.Build.0 = Release|Any CPU
 		{55BF0DB0-2C81-4551-92CB-6D2204A62ECB}.Release|x86.ActiveCfg = Release|Any CPU
 		{55BF0DB0-2C81-4551-92CB-6D2204A62ECB}.Release|x86.Build.0 = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|x64.Build.0 = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Debug|x86.Build.0 = Debug|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|x64.ActiveCfg = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|x64.Build.0 = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|x86.ActiveCfg = Release|Any CPU
+		{21C59C6F-89EE-4699-A70E-FE2B83B1E33C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.sln b/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.sln
index 820faec4..4bfd2bce 100755
--- a/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.sln
+++ b/IdentityServer/v7/UserInteraction/SpaLoginUi/SpaLoginUi.sln
@@ -9,24 +9,66 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaLoginUi.AppHost", "SpaLoginUi.AppHost\SpaLoginUi.AppHost.csproj", "{331462B0-08C0-49CC-8149-FC0A9AA28007}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}"
+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
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|x86.Build.0 = Debug|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|x64.Build.0 = Release|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|x86.Build.0 = Release|Any CPU
 		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|x64.Build.0 = Debug|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Debug|x86.Build.0 = Debug|Any CPU
 		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|x64.ActiveCfg = Release|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|x64.Build.0 = Release|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|x86.ActiveCfg = Release|Any CPU
+		{14EBFBC1-BD4F-4DBA-A8E9-175622591E4E}.Release|x86.Build.0 = Release|Any CPU
 		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|x64.Build.0 = Debug|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Debug|x86.Build.0 = Debug|Any CPU
 		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|Any CPU.Build.0 = Release|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|x64.ActiveCfg = Release|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|x64.Build.0 = Release|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|x86.ActiveCfg = Release|Any CPU
+		{331462B0-08C0-49CC-8149-FC0A9AA28007}.Release|x86.Build.0 = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|x64.Build.0 = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Debug|x86.Build.0 = Debug|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|x64.ActiveCfg = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|x64.Build.0 = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2AF461DC-ADC4-457C-ADDA-D58F2C53114D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln b/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
index 96db5d6f..fb73aec7 100644
--- a/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
+++ b/IdentityServer/v7/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "Ident
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsAuthentication.AppHost", "WindowsAuthentication.AppHost\WindowsAuthentication.AppHost.csproj", "{F40E0908-3007-4FF3-80E0-5015D9E98C38}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{BA4B6408-F9CC-4565-975D-2B189342D851}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,18 @@ Global
 		{F40E0908-3007-4FF3-80E0-5015D9E98C38}.Release|x64.Build.0 = Release|Any CPU
 		{F40E0908-3007-4FF3-80E0-5015D9E98C38}.Release|x86.ActiveCfg = Release|Any CPU
 		{F40E0908-3007-4FF3-80E0-5015D9E98C38}.Release|x86.Build.0 = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|x64.Build.0 = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Debug|x86.Build.0 = Debug|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|x64.ActiveCfg = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|x64.Build.0 = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA4B6408-F9CC-4565-975D-2B189342D851}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
index e52105dc..15b075d6 100644
--- a/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
+++ b/IdentityServer/v7/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WsFederationDynamicProviders.AppHost", "WsFederationDynamicProviders.AppHost\WsFederationDynamicProviders.AppHost.csproj", "{20A711FE-CDA6-41C0-91FE-E20398FB9D6F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{A2A9C505-32B0-449A-846A-0C0405705450}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,6 +57,18 @@ Global
 		{20A711FE-CDA6-41C0-91FE-E20398FB9D6F}.Release|x64.Build.0 = Release|Any CPU
 		{20A711FE-CDA6-41C0-91FE-E20398FB9D6F}.Release|x86.ActiveCfg = Release|Any CPU
 		{20A711FE-CDA6-41C0-91FE-E20398FB9D6F}.Release|x86.Build.0 = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|x64.Build.0 = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Debug|x86.Build.0 = Debug|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|x64.ActiveCfg = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|x64.Build.0 = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|x86.ActiveCfg = Release|Any CPU
+		{A2A9C505-32B0-449A-846A-0C0405705450}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v7/global.json b/IdentityServer/v7/global.json
deleted file mode 100755
index 9ba75da8..00000000
--- a/IdentityServer/v7/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "sdk": {
-    "version": "10.0.100",
-    "rollForward": "latestMinor",
-    "allowPrerelease": false
-  },
-  "msbuild-sdks": {
-    "Aspire.AppHost.Sdk": "13.2.3"
-  }
-}
diff --git a/IdentityServer/v8/AspNetIdentity/AspNetIdentitySample.sln b/IdentityServer/v8/AspNetIdentity/AspNetIdentitySample.sln
index 4237fccb..e240f60c 100755
--- a/IdentityServer/v8/AspNetIdentity/AspNetIdentitySample.sln
+++ b/IdentityServer/v8/AspNetIdentity/AspNetIdentitySample.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31129.286
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetIdentity.AppHost", "AspNetIdentity.AppHost\AspNetIdentity.AppHost.csproj", "{D28A641C-D47F-4492-AAA0-0C9BDB48795D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,18 +57,18 @@ Global
 		{D28A641C-D47F-4492-AAA0-0C9BDB48795D}.Release|x64.Build.0 = Release|Any CPU
 		{D28A641C-D47F-4492-AAA0-0C9BDB48795D}.Release|x86.ActiveCfg = Release|Any CPU
 		{D28A641C-D47F-4492-AAA0-0C9BDB48795D}.Release|x86.Build.0 = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|x64.Build.0 = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Debug|x86.Build.0 = Debug|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|x64.ActiveCfg = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|x64.Build.0 = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|x86.ActiveCfg = Release|Any CPU
-		{D46F3C5F-7D0A-42A5-98F9-4C0C91FF8B1F}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.sln b/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.sln
index f7763c87..68963176 100644
--- a/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.sln
+++ b/IdentityServer/v8/AspNetIdentityPasskeys/AspNetIdentityPasskeys.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerAspNetIdentityPasskeys", "IdentityServerAspNetIdentityPasskeys\IdentityServerAspNetIdentityPasskeys.csproj", "{BFF3D2A2-391A-477F-81DE-9A2ED321C41C}"
 EndProject
@@ -14,7 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".config", ".config", "{2D99
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{ECACD4EC-260D-4233-89F4-FC2836141F0B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetIdentityPasskeys.AppHost", "AspNetIdentityPasskeys.AppHost\AspNetIdentityPasskeys.AppHost.csproj", "{85ADA006-B35A-437B-A388-C68C07E433B7}"
 EndProject
@@ -52,18 +52,18 @@ Global
 		{ECACD4EC-260D-4233-89F4-FC2836141F0B}.Release|x64.Build.0 = Release|Any CPU
 		{ECACD4EC-260D-4233-89F4-FC2836141F0B}.Release|x86.ActiveCfg = Release|Any CPU
 		{ECACD4EC-260D-4233-89F4-FC2836141F0B}.Release|x86.Build.0 = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|x64.Build.0 = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Debug|x86.Build.0 = Debug|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|x64.ActiveCfg = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|x64.Build.0 = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|x86.ActiveCfg = Release|Any CPU
-		{C7FBA224-73B4-403C-BF9B-63A6A6F186F9}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{85ADA006-B35A-437B-A388-C68C07E433B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{85ADA006-B35A-437B-A388-C68C07E433B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{85ADA006-B35A-437B-A388-C68C07E433B7}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.sln b/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.sln
index 60f4e689..c9b1e430 100755
--- a/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.sln
+++ b/IdentityServer/v8/Basics/ClientCredentials/ClientCredentials.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClientCredentials.AppHost", "ClientCredentials.AppHost\ClientCredentials.AppHost.csproj", "{657AD2D8-C614-47A4-AF17-F611782E9692}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,18 @@ Global
 		{657AD2D8-C614-47A4-AF17-F611782E9692}.Release|x64.Build.0 = Release|Any CPU
 		{657AD2D8-C614-47A4-AF17-F611782E9692}.Release|x86.ActiveCfg = Release|Any CPU
 		{657AD2D8-C614-47A4-AF17-F611782E9692}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/Basics/Introspection/Introspection.sln b/IdentityServer/v8/Basics/Introspection/Introspection.sln
index 42de8252..27d3a561 100755
--- a/IdentityServer/v8/Basics/Introspection/Introspection.sln
+++ b/IdentityServer/v8/Basics/Introspection/Introspection.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceBasedApi", "..\..\A
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Introspection.AppHost", "Introspection.AppHost\Introspection.AppHost.csproj", "{B0CC862F-6EDD-4C83-9E69-4B3826074B71}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,6 +71,18 @@ Global
 		{B0CC862F-6EDD-4C83-9E69-4B3826074B71}.Release|x64.Build.0 = Release|Any CPU
 		{B0CC862F-6EDD-4C83-9E69-4B3826074B71}.Release|x86.ActiveCfg = Release|Any CPU
 		{B0CC862F-6EDD-4C83-9E69-4B3826074B71}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
index a26c694c..114833f5 100755
--- a/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
+++ b/IdentityServer/v8/Basics/JwtBasedClientAuthentication/JwtBasedClientAuthentication.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JwtBasedClientAuthentication.AppHost", "JwtBasedClientAuthentication.AppHost\JwtBasedClientAuthentication.AppHost.csproj", "{D257943F-BD65-4E2F-8ECE-266A76B56A63}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,6 +26,18 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{231602F3-72FC-4D10-9BB8-90FCCF662DF6}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
index c9f9bd80..11a7e59d 100755
--- a/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
+++ b/IdentityServer/v8/Basics/MvcBackChannelLogout/MvcBackChannelLogout.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBackChannelLogout.AppHos
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/MvcBasic/MvcBasic.sln b/IdentityServer/v8/Basics/MvcBasic/MvcBasic.sln
index 0698fee7..3445f963 100755
--- a/IdentityServer/v8/Basics/MvcBasic/MvcBasic.sln
+++ b/IdentityServer/v8/Basics/MvcBasic/MvcBasic.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcBasic.AppHost", "MvcBasic.AppHost\MvcBasic.AppHost.csproj", "{F1A3E2C4-D5B6-47A8-9E0D-C1F2E3D4A5B6}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,6 +26,18 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.sln b/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.sln
index daa655bc..36079a16 100755
--- a/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.sln
+++ b/IdentityServer/v8/Basics/MvcJarJwt/MvcJarJwt.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\..
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcJarJwt.AppHost", "MvcJarJwt.AppHost\MvcJarJwt.AppHost.csproj", "{A2B1C3D4-E5F6-4A7B-8C9D-E0F1A2B3C4D5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -24,6 +26,18 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1F49E1C3-B9BC-42EC-881E-AF42D358EAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/MvcPar/MvcPar.sln b/IdentityServer/v8/Basics/MvcPar/MvcPar.sln
index 3f54a118..deb5c50c 100644
--- a/IdentityServer/v8/Basics/MvcPar/MvcPar.sln
+++ b/IdentityServer/v8/Basics/MvcPar/MvcPar.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcPar.AppHost", "MvcPar.Ap
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A7B3FC1-BD45-4679-A3D9-FE2E06F783CF}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln
index 637b244b..5772e9b9 100755
--- a/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln
+++ b/IdentityServer/v8/Basics/MvcTokenManagement/MvcTokenManagement.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcTokenManagement.AppHost"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{62493CA0-0872-4C10-AE75-1D2590B027EF}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Configuration/Permissions/Permissions.sln b/IdentityServer/v8/Configuration/Permissions/Permissions.sln
index 08ecc45c..6c840ede 100644
--- a/IdentityServer/v8/Configuration/Permissions/Permissions.sln
+++ b/IdentityServer/v8/Configuration/Permissions/Permissions.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Permissions.AppHost", "Permissions.AppHost\Permissions.AppHost.csproj", "{D257943F-BD65-4E2F-8ECE-266A76B56A62}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.sln b/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.sln
index 346e7a2e..20c91ed2 100644
--- a/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.sln
+++ b/IdentityServer/v8/Configuration/PipelineRegistration/PipelineRegistration.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipelineRegistration.AppHost", "PipelineRegistration.AppHost\PipelineRegistration.AppHost.csproj", "{00F3B583-6AB1-4C5A-A0DD-30234E137282}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Configuration/SimpleDcr/Configuration.sln b/IdentityServer/v8/Configuration/SimpleDcr/Configuration.sln
index 76e08532..0c80cce0 100644
--- a/IdentityServer/v8/Configuration/SimpleDcr/Configuration.sln
+++ b/IdentityServer/v8/Configuration/SimpleDcr/Configuration.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDcr.AppHost", "SimpleDcr.AppHost\SimpleDcr.AppHost.csproj", "{F7806158-551F-488B-95FC-41BED904AF2C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.sln b/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.sln
index 1c1eff93..9d5028cb 100644
--- a/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.sln
+++ b/IdentityServer/v8/Configuration/SoftwareStatement/SoftwareStatement.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SoftwareStatement.AppHost", "SoftwareStatement.AppHost\SoftwareStatement.AppHost.csproj", "{B3F8B3E4-34E4-4DBE-942C-752B70630E1F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,6 +25,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CD4E158A-9173-49A5-BF10-F5CAE6E5D3B1}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/DPoP/DPoP.sln b/IdentityServer/v8/DPoP/DPoP.sln
index 66bfaa25..41b6998b 100644
--- a/IdentityServer/v8/DPoP/DPoP.sln
+++ b/IdentityServer/v8/DPoP/DPoP.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
@@ -13,6 +13,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "..\Id
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DPoP.AppHost", "DPoP.AppHost\DPoP.AppHost.csproj", "{D10B1BD1-8D21-4749-BD33-09FEF19EB3A2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -83,6 +85,18 @@ Global
 		{D10B1BD1-8D21-4749-BD33-09FEF19EB3A2}.Release|x64.Build.0 = Release|Any CPU
 		{D10B1BD1-8D21-4749-BD33-09FEF19EB3A2}.Release|x86.ActiveCfg = Release|Any CPU
 		{D10B1BD1-8D21-4749-BD33-09FEF19EB3A2}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/Directory.Packages.props b/IdentityServer/v8/Directory.Packages.props
index 849bf1d1..30cf1fab 100644
--- a/IdentityServer/v8/Directory.Packages.props
+++ b/IdentityServer/v8/Directory.Packages.props
@@ -4,7 +4,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.3" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.5" />
     <PackageVersion Include="Duende.AccessTokenManagement" Version="4.2.0" />
     <PackageVersion Include="Duende.AccessTokenManagement.OpenIdConnect" Version="4.2.0" />
     <PackageVersion Include="Duende.AspNetCore.Authentication.JwtBearer" Version="1.0.2" />
@@ -31,8 +31,8 @@
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.8" />
     <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.8" />
     <PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.8" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.UI" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.8" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.8" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.8" />
@@ -41,9 +41,9 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.8" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.8" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.7.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.8" />
-    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.7.0" />
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.17.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.17.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="10.0.2" />
@@ -51,8 +51,8 @@
     <PackageVersion Include="ModelContextProtocol.AspNetCore" Version="1.2.0" />
     <PackageVersion Include="OpenTelemetry" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.16.0" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.16.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.9.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
@@ -63,4 +63,4 @@
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.1.7" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.17.0" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/IdentityServer/v8/MTLS/MTLS.sln b/IdentityServer/v8/MTLS/MTLS.sln
index 954db23f..83ed50d4 100644
--- a/IdentityServer/v8/MTLS/MTLS.sln
+++ b/IdentityServer/v8/MTLS/MTLS.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "Api\Api.csproj", "{3
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MTLS.AppHost", "MTLS.AppHost\MTLS.AppHost.csproj", "{E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,18 +71,18 @@ Global
 		{E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x64.Build.0 = Release|Any CPU
 		{E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x86.ActiveCfg = Release|Any CPU
 		{E1E0C62A-AC6E-4C19-BC9F-14C0CE76EBDB}.Release|x86.Build.0 = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x64.Build.0 = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Debug|x86.Build.0 = Debug|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x64.ActiveCfg = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x64.Build.0 = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x86.ActiveCfg = Release|Any CPU
-		{155B2E96-BD6B-4560-A7B3-A6E8A55CFAF5}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/McpDemo/McpDemo.sln b/IdentityServer/v8/McpDemo/McpDemo.sln
index a05e2f33..acc97316 100644
--- a/IdentityServer/v8/McpDemo/McpDemo.sln
+++ b/IdentityServer/v8/McpDemo/McpDemo.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McpDemo.McpServer", "McpDemo.McpServer\McpDemo.McpServer.csproj", "{C7364D55-7AA4-4B41-B9C1-F849AF17CADE}"
 EndProject
@@ -8,6 +8,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McpDemo.Client", "McpDemo.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "McpDemo.AppHost", "McpDemo.AppHost\McpDemo.AppHost.csproj", "{394E83BB-3BA9-4DCA-A61A-99990D168A56}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,6 +20,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{C7364D55-7AA4-4B41-B9C1-F849AF17CADE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C7364D55-7AA4-4B41-B9C1-F849AF17CADE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C7364D55-7AA4-4B41-B9C1-F849AF17CADE}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/PAT/PAT.sln b/IdentityServer/v8/PAT/PAT.sln
index 47125bca..761b0bfe 100755
--- a/IdentityServer/v8/PAT/PAT.sln
+++ b/IdentityServer/v8/PAT/PAT.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PAT.AppHost", "PAT.AppHost\PAT.AppHost.csproj", "{E3B1C951-7AB0-4221-9015-5973C675D52A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,18 +71,18 @@ Global
 		{E3B1C951-7AB0-4221-9015-5973C675D52A}.Release|x64.Build.0 = Release|Any CPU
 		{E3B1C951-7AB0-4221-9015-5973C675D52A}.Release|x86.ActiveCfg = Release|Any CPU
 		{E3B1C951-7AB0-4221-9015-5973C675D52A}.Release|x86.Build.0 = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|x64.Build.0 = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Debug|x86.Build.0 = Debug|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|x64.ActiveCfg = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|x64.Build.0 = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|x86.ActiveCfg = Release|Any CPU
-		{4C53FF2B-1DA3-42B5-B8C0-8ACAD013463E}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/SAML/Basic/Basic.sln b/IdentityServer/v8/SAML/Basic/Basic.sln
index b35bab0e..bc09c97b 100644
--- a/IdentityServer/v8/SAML/Basic/Basic.sln
+++ b/IdentityServer/v8/SAML/Basic/Basic.sln
@@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceProvider", "ServiceP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Basic.AppHost", "Basic.AppHost\Basic.AppHost.csproj", "{A1B2C3D4-1111-2222-3333-444455558888}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{A1B2C3D4-1111-2222-3333-444455559999}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,9 +28,9 @@ Global
 		{A1B2C3D4-1111-2222-3333-444455558888}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A1B2C3D4-1111-2222-3333-444455558888}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A1B2C3D4-1111-2222-3333-444455558888}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A1B2C3D4-1111-2222-3333-444455559999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A1B2C3D4-1111-2222-3333-444455559999}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A1B2C3D4-1111-2222-3333-444455559999}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A1B2C3D4-1111-2222-3333-444455559999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v8/SAML/IdPInitiated/IdPInitiated.sln b/IdentityServer/v8/SAML/IdPInitiated/IdPInitiated.sln
index 756276b0..03d4b302 100644
--- a/IdentityServer/v8/SAML/IdPInitiated/IdPInitiated.sln
+++ b/IdentityServer/v8/SAML/IdPInitiated/IdPInitiated.sln
@@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceProvider", "ServiceP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdPInitiated.AppHost", "IdPInitiated.AppHost\IdPInitiated.AppHost.csproj", "{B1B2C3D4-1111-2222-3333-444455558888}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{B1B2C3D4-1111-2222-3333-444455559999}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -28,9 +28,9 @@ Global
 		{B1B2C3D4-1111-2222-3333-444455558888}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B1B2C3D4-1111-2222-3333-444455558888}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B1B2C3D4-1111-2222-3333-444455558888}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B1B2C3D4-1111-2222-3333-444455559999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B1B2C3D4-1111-2222-3333-444455559999}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B1B2C3D4-1111-2222-3333-444455559999}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B1B2C3D4-1111-2222-3333-444455559999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/IdentityServer/v8/ScopesAndResources/ScopesAndResources.sln b/IdentityServer/v8/ScopesAndResources/ScopesAndResources.sln
index db93bfa9..50c5b92d 100755
--- a/IdentityServer/v8/ScopesAndResources/ScopesAndResources.sln
+++ b/IdentityServer/v8/ScopesAndResources/ScopesAndResources.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScopesAndResources.AppHost", "ScopesAndResources.AppHost\ScopesAndResources.AppHost.csproj", "{E63F54A0-697D-43BF-ACDB-58A142C3C8FC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,6 +21,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{391FDE19-D829-4868-9221-B64358475C48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{391FDE19-D829-4868-9221-B64358475C48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{391FDE19-D829-4868-9221-B64358475C48}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/SessionManagement/SessionManagement.sln b/IdentityServer/v8/SessionManagement/SessionManagement.sln
index 25bcfce4..e0715a3c 100644
--- a/IdentityServer/v8/SessionManagement/SessionManagement.sln
+++ b/IdentityServer/v8/SessionManagement/SessionManagement.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32319.34
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServerHost", "Ident
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionManagement.AppHost", "SessionManagement.AppHost\SessionManagement.AppHost.csproj", "{B209266E-8692-4EBA-95B5-315C8C3B66B6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{9B0ECE6E-7F9A-483D-B974-D61D6A0BA88C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\Apis\SimpleApi\SimpleApi.csproj", "{B2FEB55A-BFF8-48CD-830E-64AD4D15CBA9}"
 EndProject
@@ -31,10 +31,10 @@ Global
 		{B209266E-8692-4EBA-95B5-315C8C3B66B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B209266E-8692-4EBA-95B5-315C8C3B66B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B209266E-8692-4EBA-95B5-315C8C3B66B6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9B0ECE6E-7F9A-483D-B974-D61D6A0BA88C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9B0ECE6E-7F9A-483D-B974-D61D6A0BA88C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9B0ECE6E-7F9A-483D-B974-D61D6A0BA88C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9B0ECE6E-7F9A-483D-B974-D61D6A0BA88C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B2FEB55A-BFF8-48CD-830E-64AD4D15CBA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B2FEB55A-BFF8-48CD-830E-64AD4D15CBA9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B2FEB55A-BFF8-48CD-830E-64AD4D15CBA9}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/IdentityServer/v8/SessionMigration/SessionMigration.sln b/IdentityServer/v8/SessionMigration/SessionMigration.sln
index 437702d7..f8b792c7 100644
--- a/IdentityServer/v8/SessionMigration/SessionMigration.sln
+++ b/IdentityServer/v8/SessionMigration/SessionMigration.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionMigration", "Session
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SessionMigration.AppHost", "SessionMigration.AppHost\SessionMigration.AppHost.csproj", "{187F1FE3-837D-4163-9B2D-DA70CFEB2EBC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -17,6 +19,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{8738E1CA-F4D4-4FC5-88A9-7C45CA452154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8738E1CA-F4D4-4FC5-88A9-7C45CA452154}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8738E1CA-F4D4-4FC5-88A9-7C45CA452154}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/TokenExchange/TokenExchange.sln b/IdentityServer/v8/TokenExchange/TokenExchange.sln
index 1a365c3d..e6f488d9 100755
--- a/IdentityServer/v8/TokenExchange/TokenExchange.sln
+++ b/IdentityServer/v8/TokenExchange/TokenExchange.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TokenExchange.AppHost", "TokenExchange.AppHost\TokenExchange.AppHost.csproj", "{E90D42B7-BC5B-498C-A667-70F90E8A03CC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -57,18 +57,18 @@ Global
 		{E90D42B7-BC5B-498C-A667-70F90E8A03CC}.Release|x64.Build.0 = Release|Any CPU
 		{E90D42B7-BC5B-498C-A667-70F90E8A03CC}.Release|x86.ActiveCfg = Release|Any CPU
 		{E90D42B7-BC5B-498C-A667-70F90E8A03CC}.Release|x86.Build.0 = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|x64.Build.0 = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Debug|x86.Build.0 = Debug|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|x64.ActiveCfg = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|x64.Build.0 = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|x86.ActiveCfg = Release|Any CPU
-		{D312D120-217B-4BF2-ADA8-9AEC3BEED25C}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.sln b/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.sln
index b5b4edbd..e5dedf70 100755
--- a/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.sln
+++ b/IdentityServer/v8/UserInteraction/Ciba/IdentityServer.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 15.0.26124.0
@@ -10,7 +10,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServer.AppHost", "IdentityServer.AppHost\IdentityServer.AppHost.csproj", "{6B3F90E4-4884-46FE-A31A-1CA6F9F8AC3D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{9F81F4DE-4D15-4280-9D8A-1FE8D4D6578D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -34,10 +34,10 @@ Global
 		{6B3F90E4-4884-46FE-A31A-1CA6F9F8AC3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6B3F90E4-4884-46FE-A31A-1CA6F9F8AC3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6B3F90E4-4884-46FE-A31A-1CA6F9F8AC3D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9F81F4DE-4D15-4280-9D8A-1FE8D4D6578D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F81F4DE-4D15-4280-9D8A-1FE8D4D6578D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F81F4DE-4D15-4280-9D8A-1FE8D4D6578D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F81F4DE-4D15-4280-9D8A-1FE8D4D6578D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln b/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln
index 6996ad47..c4f82058 100644
--- a/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln
+++ b/IdentityServer/v8/UserInteraction/DynamicProviders/DynamicProviders.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134
@@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentityServer.AppHost", "IdentityServer.AppHost\IdentityServer.AppHost.csproj", "{721009DF-B8CB-42BB-8E97-6AF070D9F4DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{48840739-F37C-4710-B254-9E3BF8B564A8}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -29,10 +29,10 @@ Global
 		{721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{721009DF-B8CB-42BB-8E97-6AF070D9F4DB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{48840739-F37C-4710-B254-9E3BF8B564A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48840739-F37C-4710-B254-9E3BF8B564A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48840739-F37C-4710-B254-9E3BF8B564A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48840739-F37C-4710-B254-9E3BF8B564A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.sln b/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.sln
index e9bc0076..3bb2b27c 100644
--- a/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.sln
+++ b/IdentityServer/v8/UserInteraction/ProfileService/ProfileService.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleApi", "..\..\Apis\Sim
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProfileService.AppHost", "ProfileService.AppHost\ProfileService.AppHost.csproj", "{A55F3C32-881C-483D-985B-E6EFA28FD0A0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{F919D00F-BFC0-4FD0-93EF-5D2C116C3E86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -35,10 +35,10 @@ Global
 		{A55F3C32-881C-483D-985B-E6EFA28FD0A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A55F3C32-881C-483D-985B-E6EFA28FD0A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A55F3C32-881C-483D-985B-E6EFA28FD0A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F919D00F-BFC0-4FD0-93EF-5D2C116C3E86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F919D00F-BFC0-4FD0-93EF-5D2C116C3E86}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F919D00F-BFC0-4FD0-93EF-5D2C116C3E86}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F919D00F-BFC0-4FD0-93EF-5D2C116C3E86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.sln b/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.sln
index 9e1c7df1..a54b77eb 100755
--- a/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.sln
+++ b/IdentityServer/v8/UserInteraction/SpaLoginUi/SpaLoginUi.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134
@@ -9,12 +9,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaLoginUi.AppHost", "SpaLoginUi.AppHost\SpaLoginUi.AppHost.csproj", "{2013F532-FB8D-494B-B0E0-31DB3F05AB05}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1C627305-E87E-4AEB-ADEE-D1A6E0BDD0F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/IdentityServer/v8/UserInteraction/StepUp/StepUp.sln b/IdentityServer/v8/UserInteraction/StepUp/StepUp.sln
index 10021816..5acb4867 100644
--- a/IdentityServer/v8/UserInteraction/StepUp/StepUp.sln
+++ b/IdentityServer/v8/UserInteraction/StepUp/StepUp.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -11,7 +11,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "Api\Api.csproj", "{3
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StepUp.AppHost", "StepUp.AppHost\StepUp.AppHost.csproj", "{7AC5EB4B-5A40-4537-B8B2-6CDCE4C23AD5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{5375673C-0300-4072-8F69-D163E631EEBE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -71,18 +71,18 @@ Global
 		{7AC5EB4B-5A40-4537-B8B2-6CDCE4C23AD5}.Release|x64.Build.0 = Release|Any CPU
 		{7AC5EB4B-5A40-4537-B8B2-6CDCE4C23AD5}.Release|x86.ActiveCfg = Release|Any CPU
 		{7AC5EB4B-5A40-4537-B8B2-6CDCE4C23AD5}.Release|x86.Build.0 = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|x64.Build.0 = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Debug|x86.Build.0 = Debug|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|x64.ActiveCfg = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|x64.Build.0 = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|x86.ActiveCfg = Release|Any CPU
-		{5375673C-0300-4072-8F69-D163E631EEBE}.Release|x86.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln b/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
index 1510adcd..88cde764 100644
--- a/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
+++ b/IdentityServer/v8/UserInteraction/WindowsAuthentication/WindowsAuthentication.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IdentityServerHost", "Ident
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsAuthentication.AppHost", "WindowsAuthentication.AppHost\WindowsAuthentication.AppHost.csproj", "{42858654-8534-4FE0-A3C4-68ADCCAE32E8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,6 +21,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{054FD280-B2A1-40FB-ABA0-C9F01AC13BD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{054FD280-B2A1-40FB-ABA0-C9F01AC13BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{054FD280-B2A1-40FB-ABA0-C9F01AC13BD2}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln b/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
index 9b9b0bb3..87723a7c 100644
--- a/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
+++ b/IdentityServer/v8/UserInteraction/WsFederationDynamicProviders/WsFederationDynamicProviders.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31205.134
@@ -9,6 +9,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WsFederationDynamicProviders.AppHost", "WsFederationDynamicProviders.AppHost\WsFederationDynamicProviders.AppHost.csproj", "{F0584100-A113-4C84-BAF3-A6809FF3159B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aspire.ServiceDefaults", "..\..\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj", "{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,6 +21,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x64.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Debug|x86.Build.0 = Debug|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x64.Build.0 = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.ActiveCfg = Release|Any CPU
+		{19FDEF8E-DC85-44B4-AF5E-F8D79A5D3053}.Release|x86.Build.0 = Release|Any CPU
 		{9B241402-8ED3-4D2E-A3BE-076ACEC4F4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9B241402-8ED3-4D2E-A3BE-076ACEC4F4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9B241402-8ED3-4D2E-A3BE-076ACEC4F4AA}.Debug|x64.ActiveCfg = Debug|Any CPU
diff --git a/IdentityServer/v8/UserManagement/UserManagement.slnx b/IdentityServer/v8/UserManagement/UserManagement.slnx
index 5571e0c9..cdf610c6 100644
--- a/IdentityServer/v8/UserManagement/UserManagement.slnx
+++ b/IdentityServer/v8/UserManagement/UserManagement.slnx
@@ -1,5 +1,6 @@
 <Solution>
   <Project Path="UserManagementSample.AppHost/UserManagementSample.AppHost.csproj" />
+  <Project Path="../Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj" />
   <Project Path="UserManagementSample.AspNetIdentitySource/UserManagementSample.AspNetIdentitySource.csproj" />
   <Project Path="UserManagementSample.Client/UserManagementSample.Client.csproj" />
   <Project Path="UserManagementSample.ServiceDefaults/UserManagementSample.ServiceDefaults.csproj" />
diff --git a/IdentityServer/v8/global.json b/IdentityServer/v8/global.json
deleted file mode 100755
index 53071316..00000000
--- a/IdentityServer/v8/global.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "sdk": {
-    "version": "10.0.100",
-    "rollForward": "latestMinor",
-    "allowPrerelease": false
-  },
-  "msbuild-sdks": {
-    "Aspire.AppHost.Sdk": "13.4.3"
-  }
-}
diff --git a/global.json b/global.json
index 53071316..a8b95bc1 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "allowPrerelease": false
   },
   "msbuild-sdks": {
-    "Aspire.AppHost.Sdk": "13.4.3"
+    "Aspire.AppHost.Sdk": "13.4.5"
   }
 }
diff --git a/samples.slnx b/samples.slnx
index 065501a3..18489548 100644
--- a/samples.slnx
+++ b/samples.slnx
@@ -182,7 +182,6 @@
   <Folder Name="/IdentityServer/" />
   <Folder Name="/IdentityServer/v7/">
     <File Path="IdentityServer\v7\Directory.Packages.props" />
-    <File Path="IdentityServer\v7\global.json" />
     <Project Path="IdentityServer/v7/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v7/SessionMigration/">
@@ -416,7 +415,6 @@
   </Folder>
   <Folder Name="/IdentityServer/v8/">
     <File Path="IdentityServer\v8\Directory.Packages.props" />
-    <File Path="IdentityServer\v8\global.json" />
     <Project Path="IdentityServer/v8/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj" />
   </Folder>
   <Folder Name="/IdentityServer/v8/SessionMigration/">