fixing up solution files to work with conditional aspire and slnx

Author: ardalis

.template.config/template.json

@@ -14,23 +14,27 @@
   "name": "ASP.NET Clean Architecture Solution",
   "shortName": "clean-arch",
   "sourceName": "Clean.Architecture",
+  "templateFileExtensions": [ ".cs", ".csproj", ".slnx" ],
   "preferNameDirectory": true,
   "symbols": {
     "aspire": {
       "type": "parameter",
       "datatype": "bool",
-      "defaultValue": "false",
+      "defaultValue": "true",
       "description": "Include .NET Aspire."
     }
   },
   "sources": [
     {
+      "include": [
+        "**/*"
+      ],
       "exclude": [ 
         ".vs/**",
         ".vscode/**",
         ".git/**",
         ".github/**",
-        ".template.config",
+        ".template.config/**",
         "sample/**"
       ],
       "modifiers": [
@@ -43,12 +47,8 @@
           ]
         },
         {
-          "condition": "(aspire)",
-          "include": [
-            "src/Clean.Architecture.AspireHost/**",
-            "src/Clean.Architecture.ServiceDefaults/**",
-            "tests/Clean.Architecture.AspireTests/**"
-          ]
+          "condition": "true",
+          "copyOnly": [ "*.dll", "*.png", "*.ico", "*.jpg", "*.jpeg", "*.ps1" ]
         }
       ]
     }

Clean.Architecture-NoAspire.slnx

@@ -0,0 +1,28 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="CleanArchitecture.nuspec" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/Clean.Architecture.Core/Clean.Architecture.Core.csproj" />
+    <Project Path="src/Clean.Architecture.Infrastructure/Clean.Architecture.Infrastructure.csproj" />
+    <Project Path="src/Clean.Architecture.UseCases/Clean.Architecture.UseCases.csproj" />
+    <Project Path="src/Clean.Architecture.Web/Clean.Architecture.Web.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/Clean.Architecture.FunctionalTests/Clean.Architecture.FunctionalTests.csproj">
+      <BuildDependency Project="src/Clean.Architecture.Web/Clean.Architecture.Web.csproj" />
+    </Project>
+    <Project Path="tests/Clean.Architecture.IntegrationTests/Clean.Architecture.IntegrationTests.csproj">
+      <BuildDependency Project="src/Clean.Architecture.Infrastructure/Clean.Architecture.Infrastructure.csproj" />
+    </Project>
+    <Project Path="tests/Clean.Architecture.UnitTests/Clean.Architecture.UnitTests.csproj" />
+  </Folder>
+</Solution>

Clean.Architecture.sln

@@ -137,6 +137,7 @@ Global
 		{B74A78FF-B79E-4C38-A9C7-084A90990CAD}.Release|x64.Build.0 = Release|Any CPU
 		{B74A78FF-B79E-4C38-A9C7-084A90990CAD}.Release|x86.ActiveCfg = Release|Any CPU
 		{B74A78FF-B79E-4C38-A9C7-084A90990CAD}.Release|x86.Build.0 = Release|Any CPU
+#if (aspire)
 		{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{08E69B3B-4418-40BD-80EC-B38C0ECFBAE2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -173,6 +174,7 @@ Global
 		{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
+#endif
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -185,9 +187,11 @@ Global
 		{0776DC14-9000-47A4-A3F4-ECBCF8CEBC17} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{1DC7F5A0-DDF7-4975-84EB-05F4FC1B6AB5} = {B31B4797-1D9F-4288-808C-BE9A31A98C7D}
 		{B74A78FF-B79E-4C38-A9C7-084A90990CAD} = {106AE906-5075-410A-B941-912F811848EE}
+#if (aspire)
 		{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}
+#endif
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B0F19343-8185-4A9F-9165-0EA8544BC925}

Clean.Architecture.slnx

@@ -12,9 +12,9 @@
   </Folder>
   <Folder Name="/src/">
     <Project Path="src/Clean.Architecture.AspireHost/Clean.Architecture.AspireHost.csproj" />
+    <Project Path="src/Clean.Architecture.ServiceDefaults/Clean.Architecture.ServiceDefaults.csproj" />
     <Project Path="src/Clean.Architecture.Core/Clean.Architecture.Core.csproj" />
     <Project Path="src/Clean.Architecture.Infrastructure/Clean.Architecture.Infrastructure.csproj" />
-    <Project Path="src/Clean.Architecture.ServiceDefaults/Clean.Architecture.ServiceDefaults.csproj" />
     <Project Path="src/Clean.Architecture.UseCases/Clean.Architecture.UseCases.csproj" />
     <Project Path="src/Clean.Architecture.Web/Clean.Architecture.Web.csproj" />
   </Folder>

sample/src/NimblePros.SampleToDo.Core/ContributorAggregate/Contributor.cs

@@ -13,7 +13,7 @@ public Contributor(ContributorName name)
 
   public Contributor UpdateName(ContributorName newName)
   {
-    if (Name.Equals(newName)) return;
+    if (Name.Equals(newName)) return this;
     Name = newName;
     this.RegisterDomainEvent(new ContributorNameUpdatedEvent(this));
     return this;