add tfm net8.0;

stratosblue · Nov 15, 2023 · cb149c2 · cb149c2
1 parent 2ef57b2
commit cb149c2
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 23 deletions.
diff --git a/.github/workflows/PublishNugetPackage.yml b/.github/workflows/PublishNugetPackage.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core SDK
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: restore dependencies
       run: dotnet restore
     - name: build

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,13 +1,13 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
     <LangVersion>latest</LangVersion>
     <IsPackable>false</IsPackable>
 
-    <Version>1.0.0-preview-005</Version>
+    <Version>1.0.0-preview-006</Version>
   </PropertyGroup>
 </Project>
diff --git a/src/FluentWorkflow.Core/Exceptions/WorkflowException.cs b/src/FluentWorkflow.Core/Exceptions/WorkflowException.cs
@@ -26,6 +26,7 @@ public WorkflowException(string message, Exception inner) : base(message, inner)
     #region Protected 构造函数
 
     /// <inheritdoc cref="WorkflowException"/>
+    [Obsolete("see https://github.com/dotnet/docs/issues/34893")]
     protected WorkflowException(SerializationInfo info, StreamingContext context) : base(info, context)
     {
     }

diff --git a/src/FluentWorkflow.Core/Exceptions/WorkflowInvalidOperationException.cs b/src/FluentWorkflow.Core/Exceptions/WorkflowInvalidOperationException.cs
@@ -25,6 +25,7 @@ public WorkflowInvalidOperationException(string message, Exception inner) : base
     #region Protected 构造函数
 
     /// <inheritdoc cref="WorkflowInvalidOperationException"/>
+    [Obsolete("see https://github.com/dotnet/docs/issues/34893")]
     protected WorkflowInvalidOperationException(SerializationInfo info, StreamingContext context) : base(info, context)
     {
     }

diff --git a/src/FluentWorkflow.Core/FluentWorkflow.Core.csproj b/src/FluentWorkflow.Core/FluentWorkflow.Core.csproj
@@ -11,9 +11,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FluentWorkflow.Core/Implement/InMemoryWorkflowMessageDispatcher.cs b/src/FluentWorkflow.Core/Implement/InMemoryWorkflowMessageDispatcher.cs
@@ -30,10 +30,7 @@ public InMemoryWorkflowMessageDispatcher(IServiceScopeFactory serviceScopeFactor
                                              WorkflowBuildStateCollection workflowBuildStates,
                                              ILogger<InMemoryWorkflowMessageDispatcher> logger)
     {
-        if (workflowBuildStates is null)
-        {
-            throw new ArgumentNullException(nameof(workflowBuildStates));
-        }
+        ArgumentNullException.ThrowIfNull(workflowBuildStates);
 
         _serviceScopeFactory = serviceScopeFactory ?? throw new ArgumentNullException(nameof(serviceScopeFactory));
         _eventSubscribeDescriptors = workflowBuildStates.SelectMany(m => m)
@@ -48,10 +45,7 @@ public InMemoryWorkflowMessageDispatcher(IServiceScopeFactory serviceScopeFactor
     /// <inheritdoc/>
     Task IWorkflowMessageDispatcher.PublishAsync<TMessage>(TMessage message, CancellationToken cancellationToken)
     {
-        if (message is null)
-        {
-            throw new ArgumentNullException(nameof(message));
-        }
+        ArgumentNullException.ThrowIfNull(message);
 
         if (!_eventSubscribeDescriptors.TryGetValue(TMessage.EventName, out var invokerDescriptors))
         {

diff --git a/src/FluentWorkflow.Core/TracingContext.cs b/src/FluentWorkflow.Core/TracingContext.cs
@@ -46,10 +46,7 @@ public readonly struct TracingContext
     /// <inheritdoc cref="TracingContext"/>
     public TracingContext(Activity activity)
     {
-        if (activity is null)
-        {
-            throw new ArgumentNullException(nameof(activity));
-        }
+        ArgumentNullException.ThrowIfNull(activity);
 
         var context = activity.Context;
         TraceId = context.TraceId.ToHexString();

diff --git a/src/FluentWorkflow.Generator/FluentWorkflow.Generator.csproj b/src/FluentWorkflow.Generator/FluentWorkflow.Generator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>netstandard2.0</TargetFramework>
+		<TargetFrameworks>netstandard2.0</TargetFrameworks>
 
 		<IncludeBuildOutput>false</IncludeBuildOutput>
 

diff --git a/src/FluentWorkflow.RabbitMQ/FluentWorkflow.RabbitMQ.csproj b/src/FluentWorkflow.RabbitMQ/FluentWorkflow.RabbitMQ.csproj
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.5.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
+    <PackageReference Include="RabbitMQ.Client" Version="6.6.0" />
 
     <Using Include="FluentWorkflow.RabbitMQ.Tracing" Static="true" />
   </ItemGroup>

diff --git a/test/FluentWorkflow.Test.Base/RabbitMQTestServiceProviderProvider.cs b/test/FluentWorkflow.Test.Base/RabbitMQTestServiceProviderProvider.cs
@@ -36,7 +36,8 @@ public override async Task CleanupProviderAsync()
         var options = ServiceProvider.GetRequiredService<IOptions<RabbitMQOptions>>();
         var connectionProvider = ServiceProvider.GetRequiredService<IRabbitMQConnectionProvider>();
         using var connection = await connectionProvider.GetAsync(default);
-        connection.CreateModel().QueueDeleteNoWait(options.Value.ConsumeQueueName, false, false);
+        using var model = connection.CreateModel();
+        model.QueueDeleteNoWait(options.Value.ConsumeQueueName, false, false);
         await base.CleanupProviderAsync();
     }
 
@@ -47,6 +48,7 @@ protected override void ConfigureServices(HostBuilderContext context, IServiceCo
         services.AddFluentWorkflow()
                 .UseRabbitMQMessageDispatcher(options =>
                 {
+                    options.ExchangeName = $"fwf-test-exchange-{Environment.Version.Major}_{Environment.Version.Minor}";
                     options.ConsumeQueueName = $"RabbitMQTestQueue-{DateTime.Now:yyyy:MM:dd:HH.mm.ss.ffff}";
                     options.Uri = new Uri(context.Configuration.GetRequiredSection("RabbitMQ").Value!);
                 });

diff --git a/test/FluentWorkflow.Test.Base/RabbitMQTestServiceProviderProviderWithActivity.cs b/test/FluentWorkflow.Test.Base/RabbitMQTestServiceProviderProviderWithActivity.cs
@@ -42,7 +42,8 @@ public override async Task CleanupProviderAsync()
         var options = ServiceProvider.GetRequiredService<IOptions<RabbitMQOptions>>();
         var connectionProvider = ServiceProvider.GetRequiredService<IRabbitMQConnectionProvider>();
         using var connection = await connectionProvider.GetAsync(default);
-        connection.CreateModel().QueueDeleteNoWait(options.Value.ConsumeQueueName, false, false);
+        using var model = connection.CreateModel();
+        model.QueueDeleteNoWait(options.Value.ConsumeQueueName, false, false);
         await base.CleanupProviderAsync();
         _activityListener?.Dispose();
         _activityListener = null;
@@ -64,6 +65,7 @@ protected override void ConfigureServices(HostBuilderContext context, IServiceCo
         services.AddFluentWorkflow()
                 .UseRabbitMQMessageDispatcher(options =>
                 {
+                    options.ExchangeName = $"fwf-test-exchange-{Environment.Version.Major}_{Environment.Version.Minor}";
                     options.ConsumeQueueName = $"RabbitMQTestQueue-{DateTime.Now:yyyy:MM:dd:HH.mm.ss.ffff}";
                     options.Uri = new Uri(context.Configuration.GetRequiredSection("RabbitMQ").Value!);
                 });