Elgato_dark/products
1
0
Fork 0
mirror of https://github.com/DuendeSoftware/products synced 2026-05-24 09:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2012 from DuendeSoftware/dh/aspire-tweaks

Browse source 
Rename aspire projects and update package/sdk references
This commit is contained in:
Damian Hickey 2025-05-12 07:45:04 +02:00 committed by GitHub
commit 041c7dfabb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
52 changed files with 119 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Directory.Packages.props
View file

@ -2,8 +2,8 @@
<ItemGroup>
<PackageVersion Include="AngleSharp" Version="1.1.2" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.2.1" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.2.1" />
<PackageVersion Include="BullsEye" Version="5.0.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Duende.AccessTokenManagement" Version="3.2.0" />

2
bff/hosts/Hosts.AppHost/Hosts.AppHost.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0" />
<Sdk Name="Aspire.AppHost.Sdk" Version="9.2.1" />
<PropertyGroup>
<OutputType>Exe</OutputType>

71
identity-server/aspire/AppHost/AppHost.csproj Normal file
View file

@ -0,0 +1,71 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.2.1" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
<UserSecretsId>b86a3528-3d86-4514-b57f-9839f472ef31</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.1.0" />
</ItemGroup>
<ItemGroup>
<!-- Database Projects -->
<ProjectReference Include="..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
<ProjectReference Include="..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
<!-- IdentityServer Hosts -->
<ProjectReference Include="..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\hosts\Configuration\Host.Configuration.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\hosts\EntityFramework\Host.EntityFramework.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\hosts\EntityFramework-dotnet9\Host.EntityFramework.dotnet9.csproj" />
<ProjectReference Include="..\..\hosts\main\Host.Main.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<!-- API Projects -->
<ProjectReference Include="..\..\clients\src\APIs\DPoPApi\DPoPApi.csproj" />
<ProjectReference Include="..\..\clients\src\APIs\ResourceBasedApi\ResourceBasedApi.csproj" />
<ProjectReference Include="..\..\clients\src\APIs\SimpleApi\SimpleApi.csproj" />
<!-- Clients (Console) -->
<ProjectReference Include="..\..\clients\src\ConsoleCibaClient\ConsoleCibaClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleDeviceFlow\ConsoleDeviceFlow.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlow\ConsoleClientCredentialsFlow.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowCallingIdentityServerApi\ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowPostBody\ConsoleClientCredentialsFlowPostBody.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleClientCredentialsFlowDPoP\ConsoleClientCredentialsFlowDPoP.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleDcrClient\ConsoleDcrClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleEphemeralMtlsClient\ConsoleEphemeralMtlsClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleCustomGrant\ConsoleExtensionGrant.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleIntrospectionClient\ConsoleIntrospectionClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleMTLSClient\ConsoleMTLSClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsolePrivateKeyJwtClient\ConsolePrivateKeyJwtClient.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlow\ConsoleResourceOwnerFlow.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowPublic\ConsoleResourceOwnerFlowPublic.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowReference\ConsoleResourceOwnerFlowReference.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowRefreshToken\ConsoleResourceOwnerFlowRefreshToken.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceOwnerFlowUserInfo\ConsoleResourceOwnerFlowUserInfo.csproj" />
<ProjectReference Include="..\..\clients\src\WindowsConsoleSystemBrowser\WindowsConsoleSystemBrowser.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleScopesResources\ConsoleScopesResources.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleCode\ConsoleCode.csproj" />
<ProjectReference Include="..\..\clients\src\ConsoleResourceIndicators\ConsoleResourceIndicators.csproj" />
<!-- Clients (Web) -->
<ProjectReference Include="..\..\clients\src\MvcCode\MvcCode.csproj" />
<ProjectReference Include="..\..\clients\src\MvcDPoP\MvcDPoP.csproj" />
<ProjectReference Include="..\..\clients\src\JsOidc\JsOidc.csproj" />
<ProjectReference Include="..\..\clients\src\MvcAutomaticTokenManagement\MvcAutomaticTokenManagement.csproj" />
<ProjectReference Include="..\..\clients\src\MvcHybridBackChannel\MvcHybridBackChannel.csproj" />
<ProjectReference Include="..\..\clients\src\MvcJarJwt\MvcJarJwt.csproj" />
<ProjectReference Include="..\..\clients\src\MvcJarUriJwt\MvcJarUriJwt.csproj" />
</ItemGroup>
</Project>

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Program.cs → identity-server/aspire/AppHost/Program.cs
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/Properties/launchSettings.json → identity-server/aspire/AppHost/Properties/launchSettings.json vendored
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/ResourceBuilderExtensions.cs → identity-server/aspire/AppHost/ResourceBuilderExtensions.cs
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.Development.json → identity-server/aspire/AppHost/appsettings.Development.json vendored
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/appsettings.json → identity-server/aspire/AppHost/appsettings.json vendored
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject → identity-server/aspire/AppHost/aspire.orchestrator.AppHost.v3.ncrunchproject
View file

0
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/Extensions.cs → identity-server/aspire/ServiceDefaults/Extensions.cs
View file

2
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj → identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj
View file

@ -20,7 +20,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
</ItemGroup>
</Project>

71
identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj
View file

@ -1,71 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="9.1.0" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsAspireHost>true</IsAspireHost>
<UserSecretsId>b86a3528-3d86-4514-b57f-9839f472ef31</UserSecretsId>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.1.0" />
<PackageReference Include="Aspire.Hosting.SqlServer" Version="9.1.0" />
</ItemGroup>
<ItemGroup>
<!-- Database Projects -->
<ProjectReference Include="..\..\..\hosts\EntityFramework-dotnet9\Host.EntityFramework.dotnet9.csproj" />
<ProjectReference Include="..\..\..\migrations\AspNetIdentityDb\AspNetIdentityDb.csproj" />
<ProjectReference Include="..\..\..\migrations\IdentityServerDb\IdentityServerDb.csproj" />
<!-- IdentityServer Hosts -->
<ProjectReference Include="..\..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\hosts\Configuration\Host.Configuration.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\hosts\EntityFramework\Host.EntityFramework.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<ProjectReference Include="..\..\..\hosts\main\Host.Main.csproj" PrivateAssets="All" ReferenceOutputAssembly="false" />
<!-- API Projects -->
<ProjectReference Include="..\..\..\clients\src\APIs\DPoPApi\DPoPApi.csproj" />
<ProjectReference Include="..\..\..\clients\src\APIs\ResourceBasedApi\ResourceBasedApi.csproj" />
<ProjectReference Include="..\..\..\clients\src\APIs\SimpleApi\SimpleApi.csproj" />
<!-- Clients (Console) -->
<ProjectReference Include="..\..\..\clients\src\ConsoleCibaClient\ConsoleCibaClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleDeviceFlow\ConsoleDeviceFlow.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlow\ConsoleClientCredentialsFlow.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowCallingIdentityServerApi\ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowPostBody\ConsoleClientCredentialsFlowPostBody.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleClientCredentialsFlowDPoP\ConsoleClientCredentialsFlowDPoP.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleDcrClient\ConsoleDcrClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleEphemeralMtlsClient\ConsoleEphemeralMtlsClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleCustomGrant\ConsoleExtensionGrant.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleIntrospectionClient\ConsoleIntrospectionClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleMTLSClient\ConsoleMTLSClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsolePrivateKeyJwtClient\ConsolePrivateKeyJwtClient.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlow\ConsoleResourceOwnerFlow.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowPublic\ConsoleResourceOwnerFlowPublic.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowReference\ConsoleResourceOwnerFlowReference.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowRefreshToken\ConsoleResourceOwnerFlowRefreshToken.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceOwnerFlowUserInfo\ConsoleResourceOwnerFlowUserInfo.csproj" />
<ProjectReference Include="..\..\..\clients\src\WindowsConsoleSystemBrowser\WindowsConsoleSystemBrowser.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleScopesResources\ConsoleScopesResources.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleCode\ConsoleCode.csproj" />
<ProjectReference Include="..\..\..\clients\src\ConsoleResourceIndicators\ConsoleResourceIndicators.csproj" />
<!-- Clients (Web) -->
<ProjectReference Include="..\..\..\clients\src\MvcCode\MvcCode.csproj" />
<ProjectReference Include="..\..\..\clients\src\MvcDPoP\MvcDPoP.csproj" />
<ProjectReference Include="..\..\..\clients\src\JsOidc\JsOidc.csproj" />
<ProjectReference Include="..\..\..\clients\src\MvcAutomaticTokenManagement\MvcAutomaticTokenManagement.csproj" />
<ProjectReference Include="..\..\..\clients\src\MvcHybridBackChannel\MvcHybridBackChannel.csproj" />
<ProjectReference Include="..\..\..\clients\src\MvcJarJwt\MvcJarJwt.csproj" />
<ProjectReference Include="..\..\..\clients\src\MvcJarUriJwt\MvcJarUriJwt.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/APIs/DPoPApi/DPoPApi.csproj
View file

@ -6,7 +6,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/APIs/ResourceBasedApi/ResourceBasedApi.csproj
View file

@ -12,7 +12,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/APIs/SimpleApi/SimpleApi.csproj
View file

@ -6,7 +6,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj
View file

@ -11,7 +11,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleClientCredentialsFlowDPoP/ConsoleClientCredentialsFlowDPoP.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleClientCredentialsFlowPostBody/ConsoleClientCredentialsFlowPostBody.csproj
View file

@ -6,7 +6,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/ConsoleCode/ConsoleCode.csproj
View file

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/ConsoleCustomGrant/ConsoleExtensionGrant.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleDcrClient/ConsoleDcrClient.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleDeviceFlow/ConsoleDeviceFlow.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleEphemeralMtlsClient/ConsoleEphemeralMtlsClient.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleIntrospectionClient/ConsoleIntrospectionClient.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleMTLSClient/ConsoleMTLSClient.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleParameterizedScopeClient/ConsoleParameterizedScopeClient.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsolePrivateKeyJwtClient/ConsolePrivateKeyJwtClient.csproj
View file

@ -13,7 +13,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleResourceIndicators/ConsoleResourceIndicators.csproj
View file

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/ConsoleResourceOwnerFlow/ConsoleResourceOwnerFlow.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleResourceOwnerFlowPublic/ConsoleResourceOwnerFlowPublic.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleResourceOwnerFlowReference/ConsoleResourceOwnerFlowReference.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleResourceOwnerFlowRefreshToken/ConsoleResourceOwnerFlowRefreshToken.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleResourceOwnerFlowUserInfo/ConsoleResourceOwnerFlowUserInfo.csproj
View file

@ -7,7 +7,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/ConsoleScopesResources/ConsoleScopesResources.csproj
View file

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/JsOidc/JsOidc.csproj
View file

@ -6,6 +6,6 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/MvcAutomaticTokenManagement/MvcAutomaticTokenManagement.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/MvcCode/MvcCode.csproj
View file

@ -17,7 +17,7 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/MvcDPoP/MvcDPoP.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/MvcHybridBackChannel/MvcHybridBackChannel.csproj
View file

@ -14,7 +14,7 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Http" />
<PackageReference Include="OpenTelemetry.Instrumentation.SqlClient" />
<PackageReference Include="Serilog.AspNetCore" />
<ProjectReference Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>
</Project>

2
identity-server/clients/src/MvcJarJwt/MvcJarJwt.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/clients/src/MvcJarUriJwt/MvcJarUriJwt.csproj
View file

@ -19,7 +19,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\Constants\Constants.csproj" />
</ItemGroup>

2
identity-server/hosts/AspNetIdentity/Host.AspNetIdentity.csproj
View file

@ -33,7 +33,7 @@ Microsoft.EntityFrameworkCore.SqlServer that don't have this problem exist). -->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\src\AspNetIdentity\Duende.IdentityServer.AspNetIdentity.csproj" />
<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
</ItemGroup>

2
identity-server/hosts/Configuration/Host.Configuration.csproj
View file

@ -36,7 +36,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
</ItemGroup>

2
identity-server/hosts/EntityFramework-dotnet9/Host.EntityFramework.dotnet9.csproj
View file

@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
<ProjectReference Include="..\..\src\Configuration.EntityFramework\Duende.IdentityServer.Configuration.EntityFramework.csproj" />
<ProjectReference Include="..\..\src\EntityFramework\Duende.IdentityServer.EntityFramework.csproj" />

2
identity-server/hosts/EntityFramework/Host.EntityFramework.csproj
View file

@ -34,7 +34,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
<ProjectReference Include="..\..\src\Configuration.EntityFramework\Duende.IdentityServer.Configuration.EntityFramework.csproj" />
<ProjectReference Include="..\..\src\EntityFramework\Duende.IdentityServer.EntityFramework.csproj" />

2
identity-server/hosts/main/Host.Main.csproj
View file

@ -36,7 +36,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\src\Configuration\Duende.IdentityServer.Configuration.csproj" />
<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />
</ItemGroup>

4
identity-server/identity-server.slnf
View file

@ -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",

2
identity-server/migrations/AspNetIdentityDb/AspNetIdentityDb.csproj
View file

@ -9,7 +9,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
<ProjectReference Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference Include="..\..\hosts\AspNetIdentity\Host.AspNetIdentity.csproj" />
<ProjectReference Include="..\..\src\AspNetIdentity\Duende.IdentityServer.AspNetIdentity.csproj" />
</ItemGroup>

2
identity-server/migrations/IdentityServerDb/IdentityServerDb.csproj
View file

@ -24,7 +24,7 @@
<ItemGroup>
<ProjectReference
Include="..\..\aspire\aspire.orchestrator\aspire.orchestrator.ServiceDefaults\aspire.orchestrator.ServiceDefaults.csproj" />
Include="..\..\aspire\ServiceDefaults\ServiceDefaults.csproj" />
<ProjectReference
Include="..\..\src\EntityFramework.Storage\Duende.IdentityServer.EntityFramework.Storage.csproj" />
<ProjectReference Include="..\..\src\IdentityServer\Duende.IdentityServer.csproj" />

8
products.slnx
View file

@ -61,12 +61,12 @@
<Project Path="bff/test/Hosts.Tests/Hosts.Tests.csproj" />
</Folder>
<Folder Name="/identity-server/" />
<Folder Name="/identity-server/aspire/">
<Project Path="identity-server/aspire/aspire.orchestrator/aspire.orchestrator.AppHost/aspire.orchestrator.AppHost.csproj" />
<Project Path="identity-server/aspire/aspire.orchestrator/aspire.orchestrator.ServiceDefaults/aspire.orchestrator.ServiceDefaults.csproj" />
<Folder Name="/identity-server/aspire/" >
<Project Path="identity-server/aspire/AppHost/AppHost.csproj" />
<Project Path="identity-server/aspire/ServiceDefaults/ServiceDefaults.csproj" />
</Folder>
<Folder Name="/identity-server/clients/" />
<Folder Name="/identity-server/clients/src/">
<Folder Name="/identity-server/clients/src/" >
<Project Path="identity-server/clients/src/ConsoleCibaClient/ConsoleCibaClient.csproj" />
<Project Path="identity-server/clients/src/ConsoleClientCredentialsFlow/ConsoleClientCredentialsFlow.csproj" />
<Project Path="identity-server/clients/src/ConsoleClientCredentialsFlowCallingIdentityServerApi/ConsoleClientCredentialsFlowCallingIdentityServerApi.csproj" />