Skip to content

Update project handling in SLN for Aspire #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ardalis merged 6 commits into from
Apr 24, 2025
Merged

Update project handling in SLN for Aspire #941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b7103f
Conditional logic for adding the Aspire projects in the SLN file
sadukie Apr 24, 2025
6da3a50
No need for the primaryOutputs and postActions
sadukie Apr 24, 2025
783444c
Update patch rev with note that fixes SLN handling for excluding Aspire
sadukie Apr 24, 2025
dc3d570
Fixing wording in the nuspec release notes
sadukie Apr 24, 2025
a713062
Updating OpenTelemetry packages to latest version - addressing build …
sadukie Apr 24, 2025
0409ca1
Using build server recommended version for OpenTelemetry packages
sadukie Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 9 additions & 25 deletions .template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,14 @@
},
"sources": [
{
"exclude": [
".vs/**",
".vscode/**",
".git/**",
".github/**",
".template.config",
"sample/**"
],
"modifiers": [
{
"condition": "(!aspire)",
Expand All @@ -44,29 +52,5 @@
}
]
}
],
"primaryOutputs": [{
"path": "src/Clean.Architecture.AspireHost/Clean.Architecture.AspireHost.csproj"
},
{
"path": "src/Clean.Architecture.ServiceDefaults/Clean.Architecture.ServiceDefaults.csproj"
},
{
"path": "tests/Clean.Architecture.AspireTests/Clean.Architecture.AspireTests.csproj"
}
],
"postActions": [{
"condition": "(aspire)",
"description": "Add Aspire projects to solution",
"manualInstructions": [{
"text": "Add generated project to solution manually."
}
],
"args": {
"isRoot": "true"
},
"actionId": "D396686C-DE0E-4DE6-906D-291CD29FC5DE",
"continueOnError": true
}
]
]
}
17 changes: 17 additions & 0 deletions Clean.Architecture.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.UnitTest
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.UseCases", "src\Clean.Architecture.UseCases\Clean.Architecture.UseCases.csproj", "{B74A78FF-B79E-4C38-A9C7-084A90990CAD}"
EndProject
#if (aspire)
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.ServiceDefaults", "src\Clean.Architecture.ServiceDefaults\Clean.Architecture.ServiceDefaults.csproj", "{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.AspireHost", "src\Clean.Architecture.AspireHost\Clean.Architecture.AspireHost.csproj", "{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clean.Architecture.AspireTests", "tests\Clean.Architecture.AspireTests\Clean.Architecture.AspireTests.csproj", "{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}"
EndProject
#endif
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -157,6 +161,18 @@ Global
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x64.Build.0 = Release|Any CPU
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x86.ActiveCfg = Release|Any CPU
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x86.Build.0 = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x64.ActiveCfg = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x64.Build.0 = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x86.ActiveCfg = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x86.Build.0 = Debug|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|Any CPU.Build.0 = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x64.ActiveCfg = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x64.Build.0 = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x86.ActiveCfg = Release|Any CPU
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -171,6 +187,7 @@ Global
{B74A78FF-B79E-4C38-A9C7-084A90990CAD} = {106AE906-5075-410A-B941-912F811848EE}
{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2} = {106AE906-5075-410A-B941-912F811848EE}
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870} = {106AE906-5075-410A-B941-912F811848EE}
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B0F19343-8185-4A9F-9165-0EA8544BC925}
Expand Down
4 changes: 2 additions & 2 deletions CleanArchitecture.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>Ardalis.CleanArchitecture.Template</id>
<title>ASP.NET Core Clean Architecture Solution</title>
<version>10.0.1</version>
<version>10.0.2</version>
<authors>Steve Smith</authors>
<description>
The Clean Architecture Solution Template popularized by Steve @ardalis Smith. Provides a great starting point for modern and/or DDD solutions built with .NET 8 and C# 12.
Expand All @@ -13,7 +13,7 @@
<license type="expression">MIT</license>
<projectUrl>https://github.com/ardalis/CleanArchitecture</projectUrl>
<releaseNotes>
* Fix Launch URL in launchSettings.json
* Fixes project references in the SLN file for Aspire
</releaseNotes>
<packageTypes>
<packageType name="Template" />
Expand Down
10 changes: 5 additions & 5 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
<!--#endif -->
</ItemGroup>
Expand Down
Loading