Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
188240c
Configured sending serilog to aspire structured logs
ardalis Oct 14, 2025
7f48390
Update Aspire integration
ardalis Oct 15, 2025
34971e7
add scalar support
ardalis Oct 15, 2025
fb2850e
update to net10
ardalis Oct 15, 2025
c922caa
Lots of updates:
ardalis Oct 15, 2025
2fd4115
adding more tests
ardalis Oct 15, 2025
bc8d8e1
Update template settings
ardalis Oct 15, 2025
5c9992a
Merge branch 'main' into ardalis/net10
ardalis Oct 15, 2025
c25ae0e
Change pack command from dotnet to nuget
ardalis Oct 15, 2025
625abb5
Install NuGet CLI and update pack command
ardalis Oct 15, 2025
8e6176b
Replace NuGet CLI installation with setup action
ardalis Oct 15, 2025
f3a8c08
Update publish.yml
ardalis Oct 15, 2025
3323fed
Update publish.yml
ardalis Oct 15, 2025
e52ad3b
Update Mono installation to use mono-complete
ardalis Oct 15, 2025
df5d599
fix an aspire directive
ardalis Oct 15, 2025
9f2f8e9
Merge branch 'ardalis/net10' of https://github.com/ardalis/CleanArchi…
ardalis Oct 15, 2025
b27fd08
Updates for net10 release
ardalis Nov 12, 2025
4c46f2c
Update aspire
ardalis Nov 13, 2025
84b9586
Updating to use SQL Server in a container
ardalis Nov 13, 2025
640d690
Update to use the right EF Core Design package
ardalis Nov 13, 2025
174cc70
Exclude content files to stop BuildHost-net472 folders from appearing
ardalis Nov 13, 2025
2dd181d
Added papercut for email testing with aspire docker image
ardalis Nov 13, 2025
5ef6c24
UpdateName only sends events if there is a change.
ardalis Nov 13, 2025
09279aa
Make tests run in parallel (all 3 projects) by default.
ardalis Nov 13, 2025
38c0ce4
Update Serilog to work properly with OTEL and structured logging
ardalis Nov 13, 2025
a4cb1ca
Merge in main
ardalis Nov 13, 2025
1ad8a1c
Update version
ardalis Nov 13, 2025
2313295
update when to try to publish to nuget
ardalis Nov 13, 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
12 changes: 10 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,16 @@
- name: Test
run: dotnet test "${{ env.SOLUTION_FILE }}" --configuration Release --no-build --no-restore

- name: Pack
run: dotnet pack "${{ env.NUSPEC_FILE }}" -NoDefaultExcludes --configuration Release --no-build --no-restore --output "${{ env.PACK_OUTPUT }}"
- uses: nuget/setup-nuget@v2

Check warning

Code scanning / CodeQL

Unpinned tag for a non-immutable Action in workflow

Unpinned 3rd party Action 'Publish to Nuget' step [Uses Step](1) uses 'nuget/setup-nuget' with ref 'v2', not a pinned commit hash
name: Setup NuGet
with:
nuget-version: 'latest'

- name: Install Mono
run: sudo apt-get update && sudo apt-get install -y mono-complete

- name: Pack (nuspec)
run: nuget pack "${{ env.NUSPEC_FILE }}" -OutputDirectory "${{ env.PACK_OUTPUT }}" -NoDefaultExcludes

- name: NuGet login (OIDC -> temp API key)
uses: NuGet/login@v1
Expand Down
22 changes: 4 additions & 18 deletions .template.config/template.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "http://json.schemastore.org/template",
"author": "Steve Smith @ardalis, Erik Dahl",
"author": "ardalis (Steve Smith)",
"classifications": [
"Web",
"ASP.NET",
Expand All @@ -16,14 +16,6 @@
"sourceName": "Clean.Architecture",
"templateFileExtensions": [ ".cs", ".csproj", ".slnx" ],
"preferNameDirectory": true,
"symbols": {
"aspire": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "true",
"description": "Include .NET Aspire."
}
},
"sources": [
{
"include": [
Expand All @@ -34,18 +26,12 @@
".vscode/**",
".git/**",
".github/**",
".idea/**",
".template.config/**",
"docs/**",
"sample/**"
],
"modifiers": [
{
"condition": "(!aspire)",
"exclude": [
"src/Clean.Architecture.AspireHost/**",
"src/Clean.Architecture.ServiceDefaults/**",
"tests/Clean.Architecture.AspireTests/**"
]
},
{
"condition": "true",
"copyOnly": [ "*.dll", "*.png", "*.ico", "*.jpg", "*.jpeg", "*.ps1" ]
Expand All @@ -58,4 +44,4 @@
]
}
]
}
}
28 changes: 0 additions & 28 deletions Clean.Architecture-NoAspire.slnx

This file was deleted.

199 changes: 0 additions & 199 deletions Clean.Architecture.sln

This file was deleted.

7 changes: 5 additions & 2 deletions CleanArchitecture.nuspec
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.1.1</version>
<version>11.0.0-beta.1</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 @@ -14,7 +14,10 @@
<projectUrl>https://github.com/ardalis/CleanArchitecture</projectUrl>
<releaseNotes>
* Aspire on by default
* Fixes issues with sln/slnx files
* Updated dependencies
* .NET 10
* Vogen
* Mediator.SourceGenerator
</releaseNotes>
<packageTypes>
<packageType name="Template" />
Expand Down
3 changes: 2 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup>
<NoWarn>1591</NoWarn> <!-- Remove this to turn on warnings for missing XML Comments -->
Expand Down
Loading
Loading