Merge pull request #108 from dominikus1993/feature/upgrade-to-net8

upgrade to net 8
mayuki · Jan 3, 2024 · a6c52f6 · a6c52f6
2 parents c2bfb6d + c16cb1f
commit a6c52f6
Show file tree

Hide file tree

Showing 42 changed files with 104 additions and 90 deletions.
diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml
@@ -23,7 +23,7 @@ jobs:
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: 7.0.x
+        version: 8.0.x
     - script: dotnet restore
       displayName: dotnet restore
 
@@ -78,7 +78,7 @@ jobs:
     - task: UseDotNet@2
       inputs:
         packageType: 'sdk'
-        version: 7.0.x
+        version: 8.0.x
     - script: dotnet restore
       displayName: dotnet restore
 

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -21,7 +21,7 @@ jobs:
         dotnet-version: |
           3.1.x
           6.0.x
-          7.0.x
+          8.0.x
 
     # Build
     - run: dotnet restore

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "7.0.100",
+    "version": "8.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj b/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj
@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <nullable>annotations</nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
-    <PackageReference Include="CliFx" Version="0.0.8" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="CliFx" Version="2.3.5" />
     <PackageReference Include="clipr" Version="1.6.1" />
-    <PackageReference Include="CommandLineParser" Version="2.7.82" />
-    <PackageReference Include="ConsoleAppFramework" Version="2.0.2" />
-    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="2.5.0" />
-    <PackageReference Include="PowerArgs" Version="3.6.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="ConsoleAppFramework" Version="4.2.4" />
+    <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
+    <PackageReference Include="PowerArgs" Version="4.0.3" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20071.2" />
   </ItemGroup>
 

diff --git a/perf/Cocona.Benchmark.External/Commands/CliFxCommand.cs b/perf/Cocona.Benchmark.External/Commands/CliFxCommand.cs
@@ -1,5 +1,5 @@
 using CliFx.Attributes;
-using CliFx.Services;
+using CliFx.Infrastructure;
 
 namespace Cocona.Benchmark.External.Commands;
 
@@ -14,6 +14,6 @@ public class CliFxCommand : CliFx.ICommand
 
     [CommandOption("bool", 'b')]
     public bool BoolOption { get; set; }
-
-    public Task ExecuteAsync(IConsole console) => Task.CompletedTask;
-}
+    
+    public ValueTask ExecuteAsync(IConsole console) => ValueTask.CompletedTask;
+}
diff --git a/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj b/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj
@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
     <PackageReference Include="Cocona" Version="1.1.0" />
   </ItemGroup>
 

diff --git a/...les/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj b/...les/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj b/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj b/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj b/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-      <TargetFramework>net6.0</TargetFramework>
+      <TargetFramework>net8.0</TargetFramework>
       <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj b/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj b/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj b/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/...s/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj b/...s/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/...Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj b/...Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj b/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj b/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj b/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj b/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj b/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj b/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj b/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj b/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj b/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj b/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj b/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj b/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj b/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj b/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 

diff --git a/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj b/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj b/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj b/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj b/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/src/Cocona.Core/Cocona.Core.csproj b/src/Cocona.Core/Cocona.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Cocona</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -11,15 +11,15 @@
   </PropertyGroup>
 
   <ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0') Or ('$(TargetFramework)' == 'netstandard2.1')">
-      <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+      <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cocona.Lite/Cocona.Lite.csproj b/src/Cocona.Lite/Cocona.Lite.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Cocona</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ jobs: @@
             dotnet-version: |
 .1.x
 .0.x
-.0.x
+.0.x
         # Build
         - run: dotnet restore
@@ Expand Down @@