Skip to content

Commit 0eb1610

Browse files
sadukiesadukie
authored
Update project handling in SLN for Aspire (#941)
1 parent b50ee2a commit 0eb1610

4 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎.template.config/template.json‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,14 @@
2525
},
2626
"sources": [
2727
{
28+
"exclude": [
29+
".vs/**",
30+
".vscode/**",
31+
".git/**",
32+
".github/**",
33+
".template.config",
34+
"sample/**"
35+
],
2836
"modifiers": [
2937
{
3038
"condition": "(!aspire)",
@@ -44,29 +52,5 @@
4452
}
4553
]
4654
}
47-
],
48-
"primaryOutputs": [{
49-
"path": "src/Clean.Architecture.AspireHost/Clean.Architecture.AspireHost.csproj"
50-
},
51-
{
52-
"path": "src/Clean.Architecture.ServiceDefaults/Clean.Architecture.ServiceDefaults.csproj"
53-
},
54-
{
55-
"path": "tests/Clean.Architecture.AspireTests/Clean.Architecture.AspireTests.csproj"
56-
}
57-
],
58-
"postActions": [{
59-
"condition": "(aspire)",
60-
"description": "Add Aspire projects to solution",
61-
"manualInstructions": [{
62-
"text": "Add generated project to solution manually."
63-
}
64-
],
65-
"args": {
66-
"isRoot": "true"
67-
},
68-
"actionId": "D396686C-DE0E-4DE6-906D-291CD29FC5DE",
69-
"continueOnError": true
70-
}
71-
]
55+
]
7256
}

‎Clean.Architecture.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.UnitTest
3535
EndProject
3636
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.UseCases", "src\Clean.Architecture.UseCases\Clean.Architecture.UseCases.csproj", "{B74A78FF-B79E-4C38-A9C7-084A90990CAD}"
3737
EndProject
38+
#if (aspire)
3839
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.ServiceDefaults", "src\Clean.Architecture.ServiceDefaults\Clean.Architecture.ServiceDefaults.csproj", "{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2}"
3940
EndProject
4041
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Clean.Architecture.AspireHost", "src\Clean.Architecture.AspireHost\Clean.Architecture.AspireHost.csproj", "{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}"
4142
EndProject
43+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clean.Architecture.AspireTests", "tests\Clean.Architecture.AspireTests\Clean.Architecture.AspireTests.csproj", "{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}"
44+
EndProject
45+
#endif
4246
Global
4347
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4448
Debug|Any CPU = Debug|Any CPU
@@ -157,6 +161,18 @@ Global
157161
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x64.Build.0 = Release|Any CPU
158162
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x86.ActiveCfg = Release|Any CPU
159163
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870}.Release|x86.Build.0 = Release|Any CPU
164+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
165+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
166+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x64.ActiveCfg = Debug|Any CPU
167+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x64.Build.0 = Debug|Any CPU
168+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x86.ActiveCfg = Debug|Any CPU
169+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Debug|x86.Build.0 = Debug|Any CPU
170+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
171+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|Any CPU.Build.0 = Release|Any CPU
172+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x64.ActiveCfg = Release|Any CPU
173+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x64.Build.0 = Release|Any CPU
174+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x86.ActiveCfg = Release|Any CPU
175+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF}.Release|x86.Build.0 = Release|Any CPU
160176
EndGlobalSection
161177
GlobalSection(SolutionProperties) = preSolution
162178
HideSolutionNode = FALSE
@@ -171,6 +187,7 @@ Global
171187
{B74A78FF-B79E-4C38-A9C7-084A90990CAD} = {106AE906-5075-410A-B941-912F811848EE}
172188
{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2} = {106AE906-5075-410A-B941-912F811848EE}
173189
{C7039CB5-4F76-4F19-ABD7-C755FAB2A870} = {106AE906-5075-410A-B941-912F811848EE}
190+
{07D864BA-6245-D5C0-5C79-BB55D27ACBBF} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
174191
EndGlobalSection
175192
GlobalSection(ExtensibilityGlobals) = postSolution
176193
SolutionGuid = {B0F19343-8185-4A9F-9165-0EA8544BC925}

‎CleanArchitecture.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>Ardalis.CleanArchitecture.Template</id>
55
<title>ASP.NET Core Clean Architecture Solution</title>
6-
<version>10.0.1</version>
6+
<version>10.0.2</version>
77
<authors>Steve Smith</authors>
88
<description>
99
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.
@@ -13,7 +13,7 @@
1313
<license type="expression">MIT</license>
1414
<projectUrl>https://github.com/ardalis/CleanArchitecture</projectUrl>
1515
<releaseNotes>
16-
* Fix Launch URL in launchSettings.json
16+
* Fixes project references in the SLN file for Aspire
1717
</releaseNotes>
1818
<packageTypes>
1919
<packageType name="Template" />

‎Directory.Packages.props‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
<PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
4343
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="9.0.0" />
4444
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="9.0.0" />
45-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
46-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
47-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.0" />
48-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
49-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
45+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.11.1" />
46+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.11.1" />
47+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.11.1" />
48+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.11.1" />
49+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.11.1" />
5050
<PackageVersion Include="Aspire.Hosting.Testing" Version="9.0.0" />
5151
<!--#endif -->
5252
</ItemGroup>

0 commit comments

Comments
 (0)