diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml index f709555f..3dcb30b0 100644 --- a/.azure-pipelines/build.yml +++ b/.azure-pipelines/build.yml @@ -24,6 +24,10 @@ jobs: inputs: packageType: 'sdk' version: 8.0.x + - task: UseDotNet@2 + inputs: + packageType: 'sdk' + version: 9.0.x - script: dotnet test -c Release --logger trx displayName: dotnet test @@ -45,6 +49,10 @@ jobs: inputs: packageType: 'sdk' version: 8.0.x + - task: UseDotNet@2 + inputs: + packageType: 'sdk' + version: 9.0.x - script: dotnet test -c Release --logger trx displayName: dotnet test - task: PublishTestResults@2 diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 63e08cec..890b5c90 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -34,6 +34,7 @@ jobs: 3.1.x 6.0.x 8.0.x + 9.0.x env: NUGET_AUTH_TOKEN: ${{ steps.op-load-secret.outputs.NUGET_AUTH_TOKEN }} diff --git a/global.json b/global.json index 501e79a8..cdbb589e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "9.0.100", "rollForward": "latestFeature" } -} \ No newline at end of file +} diff --git a/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj b/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj index a62dd814..c847bb24 100644 --- a/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj +++ b/perf/Cocona.Benchmark.External/Cocona.Benchmark.External.csproj @@ -2,20 +2,23 @@ Exe - net8.0 + net9.0 enable annotations - + - - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + - + diff --git a/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj b/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj index 0ca757a1..2456bd03 100644 --- a/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj +++ b/perf/Cocona.Benchmark.Performance/Cocona.Benchmark.Performance.csproj @@ -2,13 +2,13 @@ Exe - net8.0 + net9.0 enable - - + + diff --git a/samples/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj b/samples/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj index 2823c137..913ec6c8 100644 --- a/samples/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj +++ b/samples/Advanced.CommandMethodForwarding/CoconaSample.Advanced.CommandMethodForwarding.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj b/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj index 8d1e8040..26373b06 100644 --- a/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj +++ b/samples/Advanced.GenericHost/CoconaSample.Advanced.GenericHost.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj b/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj index fed66508..e7086c79 100644 --- a/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj +++ b/samples/Advanced.HelpOnDemand/CoconaSample.Advanced.HelpOnDemand.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj b/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj index 8d11cd81..b5626aa6 100644 --- a/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj +++ b/samples/Advanced.HelpTransformer/CoconaSample.Advanced.HelpTransformer.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj b/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj index 934ff4d7..3fdb734d 100644 --- a/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj +++ b/samples/Advanced.JsonValueConverter/CoconaSample.Advanced.JsonValueConverter.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj b/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj index e025a1b9..41b5f335 100644 --- a/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj +++ b/samples/Advanced.Localization/CoconaSample.Advanced.Localization.csproj @@ -2,13 +2,13 @@ Exe - net8.0 + net9.0 enable enable - + diff --git a/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj b/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj index 2823c137..913ec6c8 100644 --- a/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj +++ b/samples/Advanced.OptionLikeCommand/CoconaSample.Advanced.OptionLikeCommand.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj b/samples/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj index 8d1e8040..26373b06 100644 --- a/samples/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj +++ b/samples/Advanced.PreventMultipleInstances/CoconaSample.Advanced.PreventMultipleInstances.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj b/samples/Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj index 2823c137..913ec6c8 100644 --- a/samples/Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj +++ b/samples/Advanced.ShellCompletionCandidates/CoconaSample.Advanced.ShellCompletionCandidates.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/CoconaSample.Advanced.GenericHost.HostApplicationBuilder/CoconaSample.Advanced.GenericHost.HostApplicationBuilder.csproj b/samples/CoconaSample.Advanced.GenericHost.HostApplicationBuilder/CoconaSample.Advanced.GenericHost.HostApplicationBuilder.csproj index d3678679..62e26437 100644 --- a/samples/CoconaSample.Advanced.GenericHost.HostApplicationBuilder/CoconaSample.Advanced.GenericHost.HostApplicationBuilder.csproj +++ b/samples/CoconaSample.Advanced.GenericHost.HostApplicationBuilder/CoconaSample.Advanced.GenericHost.HostApplicationBuilder.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj b/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj index 8d1e8040..26373b06 100644 --- a/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj +++ b/samples/GettingStarted.MinimalApp/CoconaSample.GettingStarted.MinimalApp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj b/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj index 8d1e8040..26373b06 100644 --- a/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj +++ b/samples/GettingStarted.SubCommandApp/CoconaSample.GettingStarted.SubCommandApp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj b/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj index 8d1e8040..26373b06 100644 --- a/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj +++ b/samples/GettingStarted.TypicalSimpleApp/CoconaSample.GettingStarted.TypicalSimpleApp.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj b/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj index 736dc52c..ee5a36cd 100644 --- a/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj +++ b/samples/InAction.AppConfiguration/CoconaSample.InAction.AppConfiguration.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj b/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj +++ b/samples/InAction.CommandFilter/CoconaSample.InAction.CommandFilter.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj b/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj +++ b/samples/InAction.CommandOptionOverload/CoconaSample.InAction.CommandOptionOverload.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj b/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj +++ b/samples/InAction.CommandOptions/CoconaSample.InAction.CommandOptions.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj b/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj +++ b/samples/InAction.DependencyInjection/CoconaSample.InAction.DependencyInjection.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj b/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj +++ b/samples/InAction.ExitCode/CoconaSample.InAction.ExitCode.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj b/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj +++ b/samples/InAction.HandleShutdownSignal/CoconaSample.InAction.HandleShutdownSignal.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj b/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj +++ b/samples/InAction.ManyArguments/CoconaSample.InAction.ManyArguments.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj b/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj +++ b/samples/InAction.MultipleCommandTypes/CoconaSample.InAction.MultipleCommandTypes.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj b/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj index 8d1e8040..26373b06 100644 --- a/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj +++ b/samples/InAction.ParameterSet/CoconaSample.InAction.ParameterSet.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj b/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj index fed66508..e7086c79 100644 --- a/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj +++ b/samples/InAction.Validation/CoconaSample.InAction.Validation.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable diff --git a/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj b/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj index 50852b37..16c4c1fb 100644 --- a/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj +++ b/samples/MinimalApi.InAction/CoconaSample.MinimalApi.InAction.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj b/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj index b567b99d..4df13f60 100644 --- a/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj +++ b/samples/MinimalApi.MultipleCommands/CoconaSample.MinimalApi.MultipleCommands.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj b/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj index b567b99d..4df13f60 100644 --- a/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj +++ b/samples/MinimalApi.QuickStart/CoconaSample.MinimalApi.QuickStart.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj b/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj index 50852b37..16c4c1fb 100644 --- a/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj +++ b/samples/MinimalApi.SubCommand/CoconaSample.MinimalApi.SubCommand.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable diff --git a/src/Cocona.Core/Cocona.Core.csproj b/src/Cocona.Core/Cocona.Core.csproj index 92b15467..449c26c6 100644 --- a/src/Cocona.Core/Cocona.Core.csproj +++ b/src/Cocona.Core/Cocona.Core.csproj @@ -1,7 +1,7 @@  - net8.0;net6.0;netstandard2.0;netstandard2.1 + net9.0;net8.0;net6.0;netstandard2.0;netstandard2.1 Cocona enable enable @@ -15,7 +15,7 @@ - + diff --git a/src/Cocona.Lite/Cocona.Lite.csproj b/src/Cocona.Lite/Cocona.Lite.csproj index b9a84224..bfc65726 100644 --- a/src/Cocona.Lite/Cocona.Lite.csproj +++ b/src/Cocona.Lite/Cocona.Lite.csproj @@ -1,7 +1,7 @@  - net8.0;net6.0;netstandard2.0;netstandard2.1 + net9.0;net8.0;net6.0;netstandard2.0;netstandard2.1 Cocona enable enable diff --git a/src/Cocona/Cocona.csproj b/src/Cocona/Cocona.csproj index 4fed0903..f472b39a 100644 --- a/src/Cocona/Cocona.csproj +++ b/src/Cocona/Cocona.csproj @@ -1,7 +1,7 @@  - net8.0;net6.0;netstandard2.0;netstandard2.1 + net9.0;net8.0;net6.0;netstandard2.0;netstandard2.1 true enable @@ -16,10 +16,16 @@ - - - - + + + + + + + + + + diff --git a/test/Cocona.Lite.Test/Cocona.Lite.Test.csproj b/test/Cocona.Lite.Test/Cocona.Lite.Test.csproj index c718d686..c6b0409d 100644 --- a/test/Cocona.Lite.Test/Cocona.Lite.Test.csproj +++ b/test/Cocona.Lite.Test/Cocona.Lite.Test.csproj @@ -7,7 +7,7 @@ $(NoWarn);1701;1702;CS1998 annotations enable - net8.0 + net9.0 Library @@ -28,14 +28,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Cocona.Test/Cocona.Test.csproj b/test/Cocona.Test/Cocona.Test.csproj index 3ba0caac..9fa57ad5 100644 --- a/test/Cocona.Test/Cocona.Test.csproj +++ b/test/Cocona.Test/Cocona.Test.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0 + net6.0;net8.0;net9.0 false true ..\..\src\Cocona\StrongNameKey.snk @@ -13,14 +13,14 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive