Only use DotnetDispatcher package (#47)

Author: psimsa

.github/workflows/Build_main_and_publish_to_nuget.yml

@@ -40,7 +40,7 @@ jobs:
           NuGetApiKey: ${{ secrets.NUGET_API_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Publish: artifacts'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: artifacts

.github/workflows/Continuous_build.yml

@@ -39,7 +39,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Publish: artifacts'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: artifacts

.github/workflows/Manual_publish_to_Github_Nuget.yml

@@ -36,7 +36,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Publish: artifacts'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: artifacts
           path: artifacts

build/Build.cs

@@ -23,15 +23,16 @@
     On = new[] { GitHubActionsTrigger.WorkflowDispatch },
     InvokedTargets = new[] { nameof(Pack), nameof(PublishToGitHubNuget) },
     EnableGitHubToken = true
-)]
+    )]
 [GitHubActions(
     "Build main and publish to nuget",
     GitHubActionsImage.UbuntuLatest,
     OnPushBranches = new[] { "main" },
     InvokedTargets = new[]
         { nameof(Clean), nameof(Compile), nameof(Pack), nameof(PublishToGitHubNuget), nameof(Publish) },
     ImportSecrets = new[] { nameof(NuGetApiKey) },
-    EnableGitHubToken = true)]
+    EnableGitHubToken = true
+    )]
 class Build : NukeBuild
 {
     readonly AbsolutePath ArtifactsDirectory = RootDirectory / "artifacts";
@@ -40,11 +41,11 @@ class Build : NukeBuild
     readonly Configuration Configuration = IsLocalBuild ? Configuration.Debug : Configuration.Release;
 
     [LatestNuGetVersion(
-        "DotnetDispatcher.Core",
+        "DotnetDispatcher",
         IncludePrerelease = false)]
     readonly NuGetVersion DotnetDispatcherVersion;
 
-    [Parameter] [Secret] readonly string NuGetApiKey;
+    [Parameter][Secret] readonly string NuGetApiKey;
 
     [GitRepository] readonly GitRepository Repository;
 
@@ -55,7 +56,7 @@ class Build : NukeBuild
         .Before(Restore)
         .Executes(() =>
         {
-            EnsureCleanDirectory(ArtifactsDirectory);
+            ArtifactsDirectory.CreateOrCleanDirectory();
         });
 
     Target Restore => _ => _
@@ -96,17 +97,20 @@ class Build : NukeBuild
         .Executes(() =>
         {
             var newMajor = 0;
-            var newMinor = 4;
-            var newPatch = DotnetDispatcherVersion.Patch + 1;
+            var newMinor = 8;
+            var newPatch = DotnetDispatcherVersion?.Patch ?? 0 + 1;
 
-            if (newMajor > DotnetDispatcherVersion.Major)
-            {
-                newMinor = 0;
-                newPatch = 0;
-            }
-            else if (newMinor > DotnetDispatcherVersion.Minor)
+            if (DotnetDispatcherVersion != null)
             {
-                newPatch = 0;
+                if (newMajor > DotnetDispatcherVersion.Major)
+                {
+                    newMinor = 0;
+                    newPatch = 0;
+                }
+                else if (newMinor > DotnetDispatcherVersion.Minor)
+                {
+                    newPatch = 0;
+                }
             }
 
             var newVersion = new NuGetVersion(newMajor, newMinor, newPatch,
@@ -119,8 +123,7 @@ class Build : NukeBuild
                 .SetNoRestore(true)
                 .SetVersion(newVersion.ToString())
                 .SetVerbosity(DotNetVerbosity.normal)
-                .CombineWith(Solution.GetSolutionFolder("src").Projects.Where(_ => _.Name.Contains("DotnetDispatcher")),
-                    (settings, project) => settings.SetProject(project))
+                .SetProject(Solution.src.DotnetDispatcher)
             );
         });
 

dotnet-dispatcher.sln

@@ -5,11 +5,9 @@ VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{9955EE7F-B7DF-4AF7-99E1-E17572BFB61D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDispatcher.Attributes", "src\DotnetDispatcher.Attributes\DotnetDispatcher.Attributes.csproj", "{D729374E-250F-4472-AF37-3579002969EC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDispatcher.Generator", "src\DotnetDispatcher.Generator\DotnetDispatcher.Generator.csproj", "{623EB4EA-907F-4650-AB13-5F9BE39B6A8C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDispatcher.Core", "src\DotnetDispatcher.Core\DotnetDispatcher.Core.csproj", "{D5233C43-C155-476C-92FD-436842364008}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDispatcher", "src\DotnetDispatcher\DotnetDispatcher.csproj", "{D5233C43-C155-476C-92FD-436842364008}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{BF6A64D8-4626-4316-8DC7-1A96B445F0AE}"
 EndProject
@@ -25,10 +23,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D729374E-250F-4472-AF37-3579002969EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D729374E-250F-4472-AF37-3579002969EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D729374E-250F-4472-AF37-3579002969EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D729374E-250F-4472-AF37-3579002969EC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{623EB4EA-907F-4650-AB13-5F9BE39B6A8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{623EB4EA-907F-4650-AB13-5F9BE39B6A8C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{623EB4EA-907F-4650-AB13-5F9BE39B6A8C}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -52,7 +46,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{D729374E-250F-4472-AF37-3579002969EC} = {9955EE7F-B7DF-4AF7-99E1-E17572BFB61D}
 		{623EB4EA-907F-4650-AB13-5F9BE39B6A8C} = {9955EE7F-B7DF-4AF7-99E1-E17572BFB61D}
 		{D5233C43-C155-476C-92FD-436842364008} = {9955EE7F-B7DF-4AF7-99E1-E17572BFB61D}
 		{D8732E0B-60EA-4619-A8E8-8F6E12342780} = {289AEDBE-E0C7-4BAD-96E1-928F794759E1}

src/DotnetDispatcher.Attributes/DotnetDispatcher.Attributes.csproj

@@ -12,7 +12,7 @@
         <PackageProjectUrl>https://github.com/psimsa/dotnet-dispatcher</PackageProjectUrl>
         <RepositoryUrl>https://github.com/psimsa/dotnet-dispatcher</RepositoryUrl>
         <Product>$(AssemblyName)</Product>
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
@@ -35,7 +35,4 @@
             <PackagePath>\</PackagePath>
         </None>
     </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\DotnetDispatcher.Attributes\DotnetDispatcher.Attributes.csproj" />
-    </ItemGroup>
 </Project>

src/DotnetDispatcher.Attributes/GenerateDispatcherAttribute.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace DotnetDispatcher.Attributes;
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+public class GenerateDispatcherAttribute : Attribute
+{
+    private readonly Type _handlerType;
+    private readonly Type _queryType;
+
+    public GenerateDispatcherAttribute(Type queryType)
+    {
+        _queryType = queryType;
+    }
+
+    public GenerateDispatcherAttribute(Type queryType, Type handlerType)
+    {
+        _queryType = queryType;
+        _handlerType = handlerType;
+    }
+}