Bump .NET versions

zapto-dev · Dec 21, 2023 · 72c8893 · 72c8893
1 parent 0fc0119
commit 72c8893
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml
@@ -16,8 +16,9 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            3.1.x
             6.0.x
+            7.0.x
+            8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -15,29 +15,21 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: | 
-            3.1.x
             6.0.x
+            7.0.x
+            8.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Build
         run: dotnet build --configuration Release --no-restore
       - name: Test Mediator.SourceGenerator
         run: dotnet test --no-restore --verbosity normal tests/Mediator.SourceGenerator.Tests/Mediator.SourceGenerator.Tests.csproj
-      - name: Publish Mediator
-        uses: alirezanet/publish-nuget@v3.0.4
+      - name: Publish
+        uses: GerardSmit/publish-nuget@v3.1.2
         with:
-          VERSION_FILE_PATH: src/Directory.Build.props
-          PROJECT_FILE_PATH: src/Mediator/Mediator.csproj
-          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-      - name: Publish Mediator.DependencyInjection
-        uses: alirezanet/[email protected]
-        with:
-          VERSION_FILE_PATH: src/Directory.Build.props
-          PROJECT_FILE_PATH: src/Mediator.DependencyInjection/Mediator.DependencyInjection.csproj
           NUGET_KEY: ${{secrets.NUGET_API_KEY}}
-      - name: Publish Mediator.SourceGenerator
-        uses: alirezanet/[email protected]
-        with:
           VERSION_FILE_PATH: src/Directory.Build.props
-          PROJECT_FILE_PATH: src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj
-          NUGET_KEY: ${{secrets.NUGET_API_KEY}}
+          PROJECT_FILE_PATH: |
+            src/Mediator/Mediator.csproj
+            src/Mediator.DependencyInjection/Mediator.DependencyInjection.csproj
+            src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj
diff --git a/src/Mediator.DependencyInjection/Generic/NotificationAttributeHandler.cs b/src/Mediator.DependencyInjection/Generic/NotificationAttributeHandler.cs
@@ -83,7 +83,8 @@ private class HandlerRegistration : IHandlerRegistration
 
         public HandlerRegistration(
             INotificationCache owner,
-            Func<T, IServiceProvider, object, CancellationToken, ValueTask> invoke, T handler,
+            Func<T, IServiceProvider, object, CancellationToken, ValueTask> invoke,
+            T handler,
             Func<Func<Task>, Task>? middleware)
         {
             Invoke = invoke;

diff --git a/src/Mediator.DependencyInjection/ServiceProviderMediator.cs b/src/Mediator.DependencyInjection/ServiceProviderMediator.cs
@@ -163,7 +163,7 @@ public async ValueTask Publish<TNotification>(MediatorNamespace ns, TNotificatio
     }
 
     /// <inheritdoc />
-    public IDisposable RegisterNotificationHandler(object handler, Func<Func<Task>, Task>? invokeAsync = null, bool queue = false)
+    public IDisposable RegisterNotificationHandler(object handler, Func<Func<Task>, Task>? invokeAsync = null, bool queue = true)
     {
         if (queue)
         {

diff --git a/src/Mediator.DependencyInjection/Wrappers/StreamRequestWrapper.cs b/src/Mediator.DependencyInjection/Wrappers/StreamRequestWrapper.cs
@@ -65,15 +65,15 @@ public IAsyncEnumerable<TResponse> Handle(MediatorNamespace ns, object streamReq
 
     async IAsyncEnumerable<object?> IStreamRequestWrapper.Handle(MediatorNamespace ns, object streamRequest, CancellationToken cancellationToken, IMediator mediator)
     {
-        await foreach(var response in Handle(ns, (TRequest)streamRequest, cancellationToken, mediator))
+        await foreach(var response in Handle(ns, streamRequest, cancellationToken, mediator))
         {
             yield return response;
         }
     }
 
     async IAsyncEnumerable<object?> IStreamRequestWrapper.Handle(object streamRequest, CancellationToken cancellationToken, IMediator mediator)
     {
-        await foreach(var response in Handle((TRequest)streamRequest, cancellationToken, mediator))
+        await foreach(var response in Handle(streamRequest, cancellationToken, mediator))
         {
             yield return response;
         }

diff --git a/src/Mediator/IPublisher.cs b/src/Mediator/IPublisher.cs
@@ -50,5 +50,5 @@ ValueTask Publish<TNotification>(MediatorNamespace ns, TNotification notificatio
     /// <param name="invokeAsync">Middleware to invoke the handler</param>
     /// <param name="queue">Queue the handler instead of invoking it immediately</param>
     /// <returns>A disposable object that can be used to unregister the handler.</returns>
-    IDisposable RegisterNotificationHandler(object handler, Func<Func<Task>, Task>? invokeAsync = null, bool queue = false);
+    IDisposable RegisterNotificationHandler(object handler, Func<Func<Task>, Task>? invokeAsync = null, bool queue = true);
 }
diff --git a/tests/Mediator.DependencyInjection.Tests/Mediator.DependencyInjection.Tests.csproj b/tests/Mediator.DependencyInjection.Tests/Mediator.DependencyInjection.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net461;netcoreapp3.1;net6.0</TargetFrameworks>
+        <TargetFrameworks>net461;net6.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>10</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>false</IsPackable>