Merge pull request #56 from Cysharp/feature/net8.0

Adopt to .NET 8
Cysharp · Aug 1, 2024 · 87d1e03 · 87d1e03
2 parents bfef7fe + fca73e7
commit 87d1e03
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 34 deletions.
diff --git a/src/DFrame.Controller/Controller/DFrameControllerLogger.cs b/src/DFrame.Controller/Controller/DFrameControllerLogger.cs
@@ -51,7 +51,7 @@ public DFrameControllerLogger(DFrameControllerLogBuffer router)
             this.router = router;
         }
 
-        public IDisposable BeginScope<TState>(TState state)
+        IDisposable ILogger.BeginScope<TState>(TState state)
         {
             return NilDisposable.Instance;
         }

diff --git a/src/DFrame.Controller/DFrame.Controller.csproj b/src/DFrame.Controller/DFrame.Controller.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<OutputType>Library</OutputType>
 		<Nullable>enable</Nullable>
 		<RootNamespace>DFrame</RootNamespace>

diff --git a/src/DFrame.Controller/RunDFrameController.cs b/src/DFrame.Controller/RunDFrameController.cs
@@ -35,39 +35,38 @@ public static Task RunDFrameControllerAsync(this WebApplicationBuilder appBuilde
 
     static async Task RunDFrameControllerAsync(WebApplicationBuilder appBuilder, DFrameControllerOptions options, Action<WebHostBuilderContext, DFrameControllerOptions> configureOptions)
     {
-        appBuilder.WebHost.ConfigureServices((WebHostBuilderContext ctx, IServiceCollection services) =>
+        appBuilder.Services.AddGrpc();
+        appBuilder.Services.AddMagicOnion(x =>
         {
-            services.AddGrpc();
-            services.AddMagicOnion(x =>
+            // Should use same options between DFrame.Controller(this) and DFrame.Worker
+            x.MessageSerializer = MessagePackMagicOnionSerializerProvider.Default;
+        });
+
+        appBuilder.Services.AddRazorPages()
+            .ConfigureApplicationPartManager(manager =>
             {
-                // Should use same options between DFrame.Controller(this) and DFrame.Worker
-                x.MessageSerializer = MessagePackMagicOnionSerializerProvider.Default;
+                // import libraries razor pages
+                var assembly = typeof(DFrameControllerWebApplicationBuilderExtensions).Assembly;
+                var assemblyPart = new CompiledRazorAssemblyPart(assembly);
+                manager.ApplicationParts.Add(assemblyPart);
             });
 
-            services.AddRazorPages()
-                .ConfigureApplicationPartManager(manager =>
-                {
-                    // import libraries razor pages
-                    var assembly = typeof(DFrameControllerWebApplicationBuilderExtensions).Assembly;
-                    var assemblyPart = new CompiledRazorAssemblyPart(assembly);
-                    manager.ApplicationParts.Add(assemblyPart);
-                });
-
-            services.AddServerSideBlazor();
-
-            // DFrame Options
-            services.TryAddSingleton<DFrameControllerExecutionEngine>();
-            services.TryAddSingleton<DFrameControllerLogBuffer>();
-            services.AddSingleton<ILoggerProvider, DFrameControllerLoggerProvider>();
-            services.AddScoped<LocalStorageAccessor>();
-            configureOptions(ctx, options);
-            services.AddSingleton(options);
-
-            // If user sets custom provdier, use it.
-            services.TryAddSingleton<IExecutionResultHistoryProvider, InMemoryExecutionResultHistoryProvider>();
-
-            services.AddMessagePipe();
-        });
+        appBuilder.Services.AddServerSideBlazor();
+
+        // DFrame Options
+        appBuilder.Services.TryAddSingleton<DFrameControllerExecutionEngine>();
+        appBuilder.Services.TryAddSingleton<DFrameControllerLogBuffer>();
+        appBuilder.Services.AddSingleton<ILoggerProvider, DFrameControllerLoggerProvider>();
+        appBuilder.Services.AddScoped<LocalStorageAccessor>();
+#pragma warning disable ASP0012 // Suggest using builder.Services over Host.ConfigureServices or WebHost.ConfigureServices
+        appBuilder.WebHost.ConfigureServices((ctx, services) => configureOptions(ctx, options));
+#pragma warning restore ASP0012 // Suggest using builder.Services over Host.ConfigureServices or WebHost.ConfigureServices
+        appBuilder.Services.AddSingleton(options);
+
+        // If user sets custom provider, use it.
+        appBuilder.Services.TryAddSingleton<IExecutionResultHistoryProvider, InMemoryExecutionResultHistoryProvider>();
+
+        appBuilder.Services.AddMessagePipe();
 
         var app = appBuilder.Build();
 

diff --git a/src/DFrame.RestSdk/DFrame.RestSdk.csproj b/src/DFrame.RestSdk/DFrame.RestSdk.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 

diff --git a/src/DFrame.Worker/DFrame.Worker.csproj b/src/DFrame.Worker/DFrame.Worker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<!-- for share with Unity, disable. -->
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>enable</Nullable>

diff --git a/src/DFrame/DFrame.csproj b/src/DFrame/DFrame.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<RootNamespace>DFrame</RootNamespace>

diff --git a/src/DFrame/DFrameApp.cs b/src/DFrame/DFrameApp.cs
@@ -27,6 +27,10 @@ public static DFrameAppBuilder CreateBuilder(int portWeb, int portListenWorker,
     }
 }
 
+#pragma warning disable ASP0011 // Suggest using builder.Logging instead of ConfigureLogging (https://aka.ms/aspnet/analyzers)
+#pragma warning disable ASP0012 // Suggest using builder.Services instead of ConfigureServices (https://aka.ms/aspnet/analyzers)
+#pragma warning disable ASP0013 // Suggest using WebApplicationBuilder.Configuration instead of ConfigureAppConfiguration (https://aka.ms/aspnet/analyzers)
+
 public class DFrameAppBuilder
 {
     Action<WebHostBuilderContext, DFrameControllerOptions> configureController;