From 2494167a99ad7b87ae081b47dc502b7c7e51c21b Mon Sep 17 00:00:00 2001 From: Damian Hickey Date: Sun, 11 May 2025 20:42:28 +0200 Subject: [PATCH 1/3] Rename aspire projects and move them to a higher folder. --- identity-server/aspire/AppHost/AppHost.csproj | 71 +++++++++++++++++++ .../Program.cs | 0 .../Properties/launchSettings.json | 0 .../ResourceBuilderExtensions.cs | 0 .../appsettings.Development.json | 0 .../appsettings.json | 0 ...ire.orchestrator.AppHost.v3.ncrunchproject | 0 .../Extensions.cs | 0 .../ServiceDefaults.csproj} | 2 +- .../aspire.orchestrator.AppHost.csproj | 71 ------------------- .../clients/src/APIs/DPoPApi/DPoPApi.csproj | 2 +- .../ResourceBasedApi/ResourceBasedApi.csproj | 2 +- .../src/APIs/SimpleApi/SimpleApi.csproj | 2 +- .../ConsoleCibaClient.csproj | 2 +- .../ConsoleClientCredentialsFlow.csproj | 2 +- ...entialsFlowCallingIdentityServerApi.csproj | 2 +- .../ConsoleClientCredentialsFlowDPoP.csproj | 2 +- ...onsoleClientCredentialsFlowPostBody.csproj | 2 +- .../src/ConsoleCode/ConsoleCode.csproj | 2 +- .../ConsoleExtensionGrant.csproj | 2 +- .../ConsoleDcrClient/ConsoleDcrClient.csproj | 2 +- .../ConsoleDeviceFlow.csproj | 2 +- .../ConsoleEphemeralMtlsClient.csproj | 2 +- .../ConsoleIntrospectionClient.csproj | 2 +- .../ConsoleMTLSClient.csproj | 2 +- .../ConsoleParameterizedScopeClient.csproj | 2 +- .../ConsolePrivateKeyJwtClient.csproj | 2 +- .../ConsoleResourceIndicators.csproj | 2 +- .../ConsoleResourceOwnerFlow.csproj | 2 +- .../ConsoleResourceOwnerFlowPublic.csproj | 2 +- .../ConsoleResourceOwnerFlowReference.csproj | 2 +- ...onsoleResourceOwnerFlowRefreshToken.csproj | 2 +- .../ConsoleResourceOwnerFlowUserInfo.csproj | 2 +- .../ConsoleScopesResources.csproj | 2 +- .../clients/src/JsOidc/JsOidc.csproj | 2 +- .../MvcAutomaticTokenManagement.csproj | 2 +- .../clients/src/MvcCode/MvcCode.csproj | 2 +- .../clients/src/MvcDPoP/MvcDPoP.csproj | 2 +- .../MvcHybridBackChannel.csproj | 2 +- .../clients/src/MvcJarJwt/MvcJarJwt.csproj | 2 +- .../src/MvcJarUriJwt/MvcJarUriJwt.csproj | 2 +- .../AspNetIdentity/Host.AspNetIdentity.csproj | 2 +- .../Configuration/Host.Configuration.csproj | 2 +- .../Host.EntityFramework.dotnet9.csproj | 2 +- .../Host.EntityFramework.csproj | 2 +- identity-server/hosts/main/Host.Main.csproj | 2 +- .../AspNetIdentityDb/AspNetIdentityDb.csproj | 2 +- .../IdentityServerDb/IdentityServerDb.csproj | 2 +- products.slnx | 8 +-- 49 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 identity-server/aspire/AppHost/AppHost.csproj rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/Program.cs (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/Properties/launchSettings.json (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/ResourceBuilderExtensions.cs (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/appsettings.Development.json (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/appsettings.json (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.AppHost => AppHost}/aspire.orchestrator.AppHost.v3.ncrunchproject (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.ServiceDefaults => ServiceDefaults}/Extensions.cs (100%) rename identity-server/aspire/{aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj => ServiceDefaults/ServiceDefaults.csproj} (91%) delete mode 100644 identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj diff --git a/identity-server/aspire/AppHost/AppHost.csproj b/identity-server/aspire/AppHost/AppHost.csproj new file mode 100644 index 000000000..310bc424b --- /dev/null +++ b/identity-server/aspire/AppHost/AppHost.csproj @@ -0,0 +1,71 @@ + + + + + + Exe + net9.0 + enable + enable + true + b86a3528-3d86-4514-b57f-9839f472ef31 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Program.cs b/identity-server/aspire/AppHost/Program.cs similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Program.cs rename to identity-server/aspire/AppHost/Program.cs diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Properties/launchSettings.json b/identity-server/aspire/AppHost/Properties/launchSettings.json similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Properties/launchSettings.json rename to identity-server/aspire/AppHost/Properties/launchSettings.json diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/ResourceBuilderExtensions.cs b/identity-server/aspire/AppHost/ResourceBuilderExtensions.cs similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/ResourceBuilderExtensions.cs rename to identity-server/aspire/AppHost/ResourceBuilderExtensions.cs diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.Development.json b/identity-server/aspire/AppHost/appsettings.Development.json similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.Development.json rename to identity-server/aspire/AppHost/appsettings.Development.json diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.json b/identity-server/aspire/AppHost/appsettings.json similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.json rename to identity-server/aspire/AppHost/appsettings.json diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject b/identity-server/aspire/AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject rename to identity-server/aspire/AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/Extensions.cs b/identity-server/aspire/ServiceDefaults/Extensions.cs similarity index 100% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/Extensions.cs rename to identity-server/aspire/ServiceDefaults/Extensions.cs diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj b/identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj similarity index 91% rename from identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj rename to identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj index 99b4c2872..31a1c2346 100644 --- a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj +++ b/identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj @@ -20,7 +20,7 @@ - + diff --git a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj b/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj deleted file mode 100644 index 315ea207d..000000000 --- a/identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - Exe - net9.0 - enable - enable - true - b86a3528-3d86-4514-b57f-9839f472ef31 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj index 80858b8ac..46b57ed28 100644 --- a/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj +++ b/identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj @@ -6,7 +6,7 @@ + Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj index fd28243b7..6914177d0 100644 --- a/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj +++ b/identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj @@ -12,7 +12,7 @@ + Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj index 80858b8ac..46b57ed28 100644 --- a/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj +++ b/identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj @@ -6,7 +6,7 @@ + Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj index fdad3b6bf..428619194 100644 --- a/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj +++ b/identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj @@ -11,7 +11,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj index 4e8eecb76..91fb619ec 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj +++ b/identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj index 3f079e01b..9c4b63984 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj index f11f722f2..dfa10d102 100644 --- a/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj +++ b/identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj @@ -6,7 +6,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj index 5602ce096..115c778cf 100644 --- a/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj +++ b/identity-server/clients/src/ConsoleCode/ConsoleCode.csproj @@ -13,7 +13,7 @@ - + diff --git a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj +++ b/identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj index 53f017a50..87faedb8d 100644 --- a/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj +++ b/identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj +++ b/identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj index 711034e35..1991e823f 100644 --- a/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj +++ b/identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj +++ b/identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj index 6b3c31146..fe94b0f4f 100644 --- a/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj +++ b/identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj index 0827cb0b0..d19de5f98 100644 --- a/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj +++ b/identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj index f2c886d7f..159ec844b 100644 --- a/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj +++ b/identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj @@ -13,7 +13,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj index 5602ce096..115c778cf 100644 --- a/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj +++ b/identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj @@ -13,7 +13,7 @@ - + diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj +++ b/identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj index 4794f1e67..e7159a91c 100644 --- a/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj +++ b/identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj @@ -7,7 +7,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj index 739a7074c..8ef2ce85e 100644 --- a/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj +++ b/identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj @@ -6,7 +6,7 @@ - + diff --git a/identity-server/clients/src/JsOidc/JsOidc.csproj b/identity-server/clients/src/JsOidc/JsOidc.csproj index df8b1e26a..a375a6a27 100644 --- a/identity-server/clients/src/JsOidc/JsOidc.csproj +++ b/identity-server/clients/src/JsOidc/JsOidc.csproj @@ -6,6 +6,6 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj index 4a49206b4..428a9e09a 100644 --- a/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj +++ b/identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj @@ -19,7 +19,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/MvcCode/MvcCode.csproj b/identity-server/clients/src/MvcCode/MvcCode.csproj index 71bb48c70..3d9ece70b 100644 --- a/identity-server/clients/src/MvcCode/MvcCode.csproj +++ b/identity-server/clients/src/MvcCode/MvcCode.csproj @@ -17,7 +17,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj index b32cf948d..603a76b7b 100644 --- a/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj +++ b/identity-server/clients/src/MvcDPoP/MvcDPoP.csproj @@ -19,7 +19,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj index cbc5f20d6..bc533f2cc 100644 --- a/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj +++ b/identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj @@ -14,7 +14,7 @@ - + diff --git a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj index 4a49206b4..428a9e09a 100644 --- a/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj +++ b/identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj @@ -19,7 +19,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj index 4a49206b4..428a9e09a 100644 --- a/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj +++ b/identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj @@ -19,7 +19,7 @@ + Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj b/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj index 62a264f43..fa60b6992 100644 --- a/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj +++ b/identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj @@ -33,7 +33,7 @@ Microsoft.EntityFrameworkCore.SqlServer that don't have this problem exist). --> - + diff --git a/identity-server/hosts/Configuration/Host.Configuration.csproj b/identity-server/hosts/Configuration/Host.Configuration.csproj index b3e3b8ebc..31c4e2820 100644 --- a/identity-server/hosts/Configuration/Host.Configuration.csproj +++ b/identity-server/hosts/Configuration/Host.Configuration.csproj @@ -36,7 +36,7 @@ + Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj b/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj index d21131a9f..c9ad4ee20 100644 --- a/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj +++ b/identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj @@ -34,7 +34,7 @@ - + diff --git a/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj b/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj index 6bd8f03c0..9e9297462 100644 --- a/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj +++ b/identity-server/hosts/EntityFramework/Host.EntityFramework.csproj @@ -34,7 +34,7 @@ - + diff --git a/identity-server/hosts/main/Host.Main.csproj b/identity-server/hosts/main/Host.Main.csproj index 68517641d..0c4bca4b1 100644 --- a/identity-server/hosts/main/Host.Main.csproj +++ b/identity-server/hosts/main/Host.Main.csproj @@ -36,7 +36,7 @@ - + diff --git a/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj b/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj index 59a14d5d5..e0579bd1e 100644 --- a/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj +++ b/identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj @@ -9,7 +9,7 @@ - + diff --git a/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj b/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj index fc0bd2150..7e88e053e 100644 --- a/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj +++ b/identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj @@ -24,7 +24,7 @@ + Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" /> diff --git a/products.slnx b/products.slnx index 1b101b9c1..77188a829 100644 --- a/products.slnx +++ b/products.slnx @@ -61,12 +61,12 @@ - - - + + + - + From e392f0787f59fec3a23a6f3b23c22c508bfd5189 Mon Sep 17 00:00:00 2001 From: Damian Hickey Date: Sun, 11 May 2025 20:43:07 +0200 Subject: [PATCH 2/3] Use latest 9.2.1 aspire sdk and package references. Need to align across projects because of global package management. --- Directory.Packages.props | 4 ++-- bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 70be56dc8..0da8b6d25 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -2,8 +2,8 @@ - - + + diff --git a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj index 974278ebf..cdc7db3c3 100644 --- a/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj +++ b/bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj @@ -1,6 +1,6 @@  - + Exe From a859fbc051651ad139f3ba4cd935dba017e6497c Mon Sep 17 00:00:00 2001 From: Damian Hickey Date: Sun, 11 May 2025 20:50:00 +0200 Subject: [PATCH 3/3] fix slnf aspire projects paths --- identity-server/identity-server.slnf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/identity-server/identity-server.slnf b/identity-server/identity-server.slnf index 56a59b620..396f4021c 100644 --- a/identity-server/identity-server.slnf +++ b/identity-server/identity-server.slnf @@ -2,8 +2,8 @@ "solution": { "path": "..\\products.slnx", "projects": [ - "identity-server\\aspire\\aspire.orchestrator\\aspire.orchestrator.AppHost\\aspire.orchestrator.AppHost.csproj", - "identity-server\\aspire\\aspire.orchestrator\\aspire.orchestrator.ServiceDefaults\\aspire.orchestrator.ServiceDefaults.csproj", + "identity-server\\aspire\\AppHost\\AppHost.csproj", + "identity-server\\aspire\\ServiceDefaults\\ServiceDefaults.csproj", "identity-server\\clients\\src\\Constants\\Constants.csproj", "identity-server\\clients\\src\\APIs\\SimpleApi\\SimpleApi.csproj", "identity-server\\clients\\src\\APIs\\ResourceBasedApi\\ResourceBasedApi.csproj",