Merge remote-tracking branch 'remotes/github/main' into dev

Author: seveneleven

.github/workflows/build.yaml

@@ -16,10 +16,6 @@ on:
 env:
   dotnet_sdk_version: '8.0.100-preview.5.23303.2'
   REPOSITORY_NAME: ${{ github.event.repository.name }}
-  MORYX_PACKAGE_TARGET_DEV: 'https://www.myget.org/F/moryx/api/v2/package'
-  MORYX_PACKAGE_TARGET_V3_DEV: 'https://www.myget.org/F/moryx/api/v3/index.json'
-  MORYX_PACKAGE_TARGET_FUTURE: 'https://www.myget.org/F/moryx-future/api/v2/package'
-  MORYX_PACKAGE_TARGET_V3_FUTURE: 'https://www.myget.org/F/moryx-future/api/v3/index.json'
   MORYX_PACKAGE_TARGET_RELEASE: 'https://api.nuget.org/v3/index.json'
   MORYX_PACKAGE_TARGET_V3_RELEASE: 'https://api.nuget.org/v3/index.json'
 
@@ -31,8 +27,8 @@ jobs:
     outputs:
       dotnet_sdk_version: ${{ env.dotnet_sdk_version }}
       REPOSITORY_NAME: ${{ env.REPOSITORY_NAME }}
-      MORYX_PACKAGE_TARGET: ${{ env.MORYX_PACKAGE_TARGET_DEV }}
-      MORYX_PACKAGE_TARGET_V3: ${{ env.MORYX_PACKAGE_TARGET_V3_DEV }}
+      MORYX_PACKAGE_TARGET: ${{ env.MORYX_PACKAGE_TARGET_RELEASE }}
+      MORYX_PACKAGE_TARGET_V3: ${{ env.MORYX_PACKAGE_TARGET_V3_RELEASE }}
 
   Build:
     needs: [SetupEnvironment]
@@ -42,15 +38,15 @@ jobs:
       REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
       SETUP_NODE: false
 
-  UnitTests:
-    needs: [SetupEnvironment, Build]
-    uses: moryx-industry/tools/.github/workflows/unittest-tool.yml@main
-    with:
-      dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
-      REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
+  # UnitTests:
+  #   needs: [SetupEnvironment, Build]
+  #   uses: moryx-industry/tools/.github/workflows/unittest-tool.yml@main
+  #   with:
+  #     dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}
+  #     REPOSITORY_NAME: ${{ needs.SetupEnvironment.outputs.REPOSITORY_NAME }}
 
   Publish:
-    needs: [SetupEnvironment, UnitTests]
+    needs: [SetupEnvironment, Build]
     uses: moryx-industry/tools/.github/workflows/publish-tool.yml@main
     with:
       dotnet_sdk_version: ${{ needs.SetupEnvironment.outputs.dotnet_sdk_version }}

src/Moryx.Cli.Tests/TemplateTests.cs

@@ -45,7 +45,7 @@ public void CheckStepFilesGetRemoved()
             var list = _resourceNames
                 .WithoutStep();
 
-            Assert.That(list, Has.Count.EqualTo(NumberOfResources - 7));
+            Assert.That(list, Has.Count.EqualTo(NumberOfResources - 10));
         }        
 
         [Test]
@@ -90,7 +90,7 @@ public void CheckStepFilesGetReturned()
             var list = _resourceNames
                 .Step();
 
-            Assert.That(list, Has.Count.EqualTo(7));
+            Assert.That(list, Has.Count.EqualTo(10));
         }
 
         [Test]
@@ -158,7 +158,7 @@ public void BareFileStructureHasApplicationFiles()
             var fileStructure = Template.Template.PrepareFileStructure(SolutionName, filteredResourceNames, projects);
 
             var flattened = fileStructure.SelectMany(item => item.Value);
-            Assert.That(flattened.Count, Is.EqualTo(32));
+            Assert.That(flattened.Count, Is.EqualTo(29));
         }
 
         [Test]
@@ -167,7 +167,7 @@ public void FileCountForBareSetup()
             var resourceNames = _resourceNames;
             var filteredResourceNames = resourceNames.BareProjectFiles();
 
-            Assert.That(filteredResourceNames, Has.Count.EqualTo(32));
+            Assert.That(filteredResourceNames, Has.Count.EqualTo(29));
         }
     }
 }