.net10.0 support

Author: Dreamescaper

.github/workflows/dotnetcore.yml

@@ -12,7 +12,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 9.0.x
+        dotnet-version: 10.0.x
     - name: Tests
       run: dotnet test
     - name: Pack

GenerateAspNetCoreClient.Command/ClientModelBuilder.cs

@@ -345,7 +345,7 @@ private List<Parameter> GetParameters(ApiDescription apiDescription)
 
             var xmlLines = xmlElement.Elements()
                 .Select(e => e.ToString())
-                .SelectMany(s => s.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries))
+                .SelectMany(s => s.Split(["\r\n", "\r", "\n"], StringSplitOptions.RemoveEmptyEntries))
                 .Select(line => line.Trim().Replace("cref=\"T:", "cref=\""));
 
             var xmlDoc = string.Join(Environment.NewLine, xmlLines).Indent("/// ");

GenerateAspNetCoreClient.Command/Extensions/StringExtensions.cs

@@ -48,7 +48,7 @@ static string PartToPascalCase(string part)
 
         public static string Indent(this string @this, string indent)
         {
-            var lines = @this.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
+            var lines = @this.Split(["\r\n", "\r", "\n"], StringSplitOptions.None);
             var indentedLines = lines.Select(line => line.Length == 0 ? line : indent + line);
             return string.Join(Environment.NewLine, indentedLines);
         }

GenerateAspNetCoreClient.Command/GenerateAspNetCoreClient.Command.csproj

@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
-    <PackageReference Include="Namotion.Reflection" Version="3.4.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
+    <PackageReference Include="Namotion.Reflection" Version="3.4.3" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <ProjectReference Include="..\GenerateAspNetCoreClient.Options\GenerateAspNetCoreClient.Options.csproj" />
   </ItemGroup>
-  
+
 </Project>

GenerateAspNetCoreClient.Command/GenerateClientCommand.cs

@@ -291,7 +291,7 @@ private static void SetAppContextBaseDirectory(string? path)
                 var setDataMethod = typeof(AppContext).GetMethod("SetData");
 
                 if (setDataMethod != null)
-                    setDataMethod.Invoke(null, new[] { "APP_CONTEXT_BASE_DIRECTORY", path });
+                    setDataMethod.Invoke(null, ["APP_CONTEXT_BASE_DIRECTORY", path]);
             }
         }
     }

GenerateAspNetCoreClient.Command/HostFactoryResolver.cs

@@ -108,7 +108,7 @@ private static TimeSpan SetupDefaultTimout()
                 return null;
             }
 
-            return args => (T)factory!.Invoke(null, new object[] { args })!;
+            return args => (T)factory!.Invoke(null, [args])!;
         }
 
         // TReturn Factory(string[] args);
@@ -167,7 +167,7 @@ static bool IsApplicationNameArg(string arg)
 
                     args = args.Any(arg => IsApplicationNameArg(arg)) || assembly.FullName is null
                         ? args
-                        : args.Concat(new[] { "--applicationName", assembly.FullName }).ToArray();
+                        : args.Concat(["--applicationName", assembly.FullName]).ToArray();
 
                     var host = hostFactory(args);
                     return GetServiceProvider(host);
@@ -180,7 +180,7 @@ static bool IsApplicationNameArg(string arg)
         private static object? Build(object builder)
         {
             var buildMethod = builder.GetType().GetMethod("Build");
-            return buildMethod?.Invoke(builder, Array.Empty<object>());
+            return buildMethod?.Invoke(builder, []);
         }
 
         private static IServiceProvider? GetServiceProvider(object? host)
@@ -236,11 +236,11 @@ public object CreateHost()
                         var parameters = _entryPoint.GetParameters();
                         if (parameters.Length == 0)
                         {
-                            _entryPoint.Invoke(null, Array.Empty<object>());
+                            _entryPoint.Invoke(null, []);
                         }
                         else
                         {
-                            _entryPoint.Invoke(null, new object[] { _args });
+                            _entryPoint.Invoke(null, [_args]);
                         }
 
                         // Try to set an exception if the entry point returns gracefully, this will force

GenerateAspNetCoreClient.Command/ServiceProviderResolver.cs

@@ -36,32 +36,32 @@ public static IServiceProvider GetServiceProvider(Assembly assembly)
 
                 if (buildWebHostMethod != null)
                 {
-                    var result = buildWebHostMethod.Invoke(null, new object[] { args });
+                    var result = buildWebHostMethod.Invoke(null, [args]);
                     serviceProvider = ((IWebHost)result).Services;
                 }
                 else
                 {
                     var createWebHostMethod =
-                        entryPointType?.GetRuntimeMethod("CreateWebHostBuilder", new[] { typeof(string[]) }) ??
+                        entryPointType?.GetRuntimeMethod("CreateWebHostBuilder", [typeof(string[])]) ??
                         entryPointType?.GetRuntimeMethod("CreateWebHostBuilder", Type.EmptyTypes);
 
                     if (createWebHostMethod != null)
                     {
                         var webHostBuilder = (IWebHostBuilder)createWebHostMethod.Invoke(
-                            null, createWebHostMethod.GetParameters().Length > 0 ? new object[] { args } : Array.Empty<object>());
+                            null, createWebHostMethod.GetParameters().Length > 0 ? [args] : []);
                         serviceProvider = webHostBuilder.Build().Services;
                     }
                     else
                     {
                         var createHostMethod =
-                            entryPointType?.GetRuntimeMethod("CreateHostBuilder", new[] { typeof(string[]) }) ??
+                            entryPointType?.GetRuntimeMethod("CreateHostBuilder", [typeof(string[])]) ??
                             entryPointType?.GetRuntimeMethod("CreateHostBuilder", Type.EmptyTypes);
 
                         if (createHostMethod != null)
                         {
-                            var webHostBuilder = (IHostBuilder)createHostMethod.Invoke(
-                                null, createHostMethod.GetParameters().Length > 0 ? new object[] { args } : Array.Empty<object>());
-                            serviceProvider = webHostBuilder.Build().Services;
+                            var hostBuilder = (IHostBuilder)createHostMethod.Invoke(
+                                null, createHostMethod.GetParameters().Length > 0 ? [args] : []);
+                            serviceProvider = hostBuilder.Build().Services;
                         }
                     }
                 }
@@ -145,7 +145,7 @@ void OnEntryPointExit(Exception exception)
 #if NET6_0_OR_GREATER
                 var assemblyName = assembly.GetName()?.FullName ?? string.Empty;
                 // We should set the application name to the startup assembly to avoid falling back to the entry assembly.
-                var services = ((IHost)factory(new[] { $"--{HostDefaults.ApplicationKey}={assemblyName}" })).Services;
+                var services = ((IHost)factory([$"--{HostDefaults.ApplicationKey}={assemblyName}"])).Services;
 #else
                 var services = ((IHost)factory(Array.Empty<string>())).Services;
 #endif

GenerateAspNetCoreClient.Options/GenerateAspNetCoreClient.Options.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

GenerateAspNetCoreClient/GenerateAspNetCoreClient.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-    
+    <TargetFramework>net10.0</TargetFramework>
+
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotnet-generate-client</ToolCommandName>
     <PackageOutputPath>./nupkg</PackageOutputPath>
-    <Version>3.2</Version>
+    <Version>4.0</Version>
     <RepositoryUrl>https://github.com/Dreamescaper/GenerateAspNetCoreClient</RepositoryUrl>
     <PackageId>GenerateAspNetCoreClient.Refit</PackageId>
     <Description>DotNet tool to generate Refit HTTP client types from ASP.NET Core API controllers.</Description>
@@ -31,5 +31,5 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-  
+
 </Project>

GenerateAspNetCoreClient/Program.cs

@@ -33,7 +33,7 @@ internal static void CreateClient(GenerateClientOptions options)
 
             commandAssembly.GetTypes().First(t => t.Name == "GenerateClientCommand")
                 .GetMethod("Invoke")
-                .Invoke(null, new object[] { webProjectAssembly, options });
+                .Invoke(null, [webProjectAssembly, options]);
         }
 
         private static string GetAssemblyPath(string path)