From fafaa44461896370b4d34a304d76d3b22c01180f Mon Sep 17 00:00:00 2001 From: Ken Swan <49496839+kenswan@users.noreply.github.com> Date: Wed, 12 Nov 2025 09:19:53 -0600 Subject: [PATCH 1/2] Upgrade to .NET 10 --- .../workflows/template-build-test-project.yml | 8 +++--- .../template-build-test-solution.yml | 3 +-- .github/workflows/template-release-docs.yml | 2 +- .../template-release-nuget-package.yml | 2 +- Directory.Packages.props | 27 +++++++------------ .../src/AutomationIoC.CommandLine.csproj | 2 +- .../AutomationIoC.CommandLine.Test.csproj | 2 +- .../src/AutomationIoC.PowerShell.csproj | 2 +- .../test/AutomationIoC.PowerShell.Test.csproj | 2 +- .../src/AutomationIoC.PowerShell.Tools.csproj | 2 +- ...AutomationIoC.PowerShell.Tools.Test.csproj | 2 +- src/Runtime/src/AutomationIoC.Runtime.csproj | 2 +- .../test/AutomationIoC.Runtime.Test.csproj | 2 +- 13 files changed, 24 insertions(+), 34 deletions(-) diff --git a/.github/workflows/template-build-test-project.yml b/.github/workflows/template-build-test-project.yml index 16318d3..7f8cc34 100644 --- a/.github/workflows/template-build-test-project.yml +++ b/.github/workflows/template-build-test-project.yml @@ -30,12 +30,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - dotnet-target-framework: ["net8.0", "net9.0"] + dotnet-target-framework: ["net10.0"] include: - - dotnet-install-framework: 8.0.x - dotnet-target-framework: net8.0 - - dotnet-install-framework: 9.0.x - dotnet-target-framework: net9.0 + - dotnet-install-framework: 10.0.x + dotnet-target-framework: net10.0 env: source-directory: ${{ inputs.source-directory }} source-project: ${{ inputs.source-project }} diff --git a/.github/workflows/template-build-test-solution.yml b/.github/workflows/template-build-test-solution.yml index 58e6df0..931d6fd 100644 --- a/.github/workflows/template-build-test-solution.yml +++ b/.github/workflows/template-build-test-solution.yml @@ -28,8 +28,7 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: | - 8.0.x - 9.0.x + 10.0.x include-prerelease: true - name: Install Dependencies diff --git a/.github/workflows/template-release-docs.yml b/.github/workflows/template-release-docs.yml index 6325b1b..1bb6594 100644 --- a/.github/workflows/template-release-docs.yml +++ b/.github/workflows/template-release-docs.yml @@ -48,7 +48,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x include-prerelease: true - name: Install DocFx diff --git a/.github/workflows/template-release-nuget-package.yml b/.github/workflows/template-release-nuget-package.yml index c1bd958..dd0b410 100644 --- a/.github/workflows/template-release-nuget-package.yml +++ b/.github/workflows/template-release-nuget-package.yml @@ -38,7 +38,7 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x include-prerelease: true - name: Install Dependencies diff --git a/Directory.Packages.props b/Directory.Packages.props index 2f93b91..73d822d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,37 +5,30 @@ + + - - - - - + + + - - - - - - - - + - - - + + + - + diff --git a/src/CommandLine/src/AutomationIoC.CommandLine.csproj b/src/CommandLine/src/AutomationIoC.CommandLine.csproj index fe4185a..f60b19d 100644 --- a/src/CommandLine/src/AutomationIoC.CommandLine.csproj +++ b/src/CommandLine/src/AutomationIoC.CommandLine.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net9.0 + netstandard2.1;net10.0 diff --git a/src/CommandLine/test/AutomationIoC.CommandLine.Test.csproj b/src/CommandLine/test/AutomationIoC.CommandLine.Test.csproj index f50b43a..1d0dbf8 100644 --- a/src/CommandLine/test/AutomationIoC.CommandLine.Test.csproj +++ b/src/CommandLine/test/AutomationIoC.CommandLine.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 false true diff --git a/src/PowerShell/PowerShell/src/AutomationIoC.PowerShell.csproj b/src/PowerShell/PowerShell/src/AutomationIoC.PowerShell.csproj index 2b12e44..569f6e6 100644 --- a/src/PowerShell/PowerShell/src/AutomationIoC.PowerShell.csproj +++ b/src/PowerShell/PowerShell/src/AutomationIoC.PowerShell.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net9.0 + netstandard2.1;net10.0 diff --git a/src/PowerShell/PowerShell/test/AutomationIoC.PowerShell.Test.csproj b/src/PowerShell/PowerShell/test/AutomationIoC.PowerShell.Test.csproj index d31928c..fd76624 100644 --- a/src/PowerShell/PowerShell/test/AutomationIoC.PowerShell.Test.csproj +++ b/src/PowerShell/PowerShell/test/AutomationIoC.PowerShell.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 false true diff --git a/src/PowerShell/Tools/src/AutomationIoC.PowerShell.Tools.csproj b/src/PowerShell/Tools/src/AutomationIoC.PowerShell.Tools.csproj index 525d76a..02d5dff 100644 --- a/src/PowerShell/Tools/src/AutomationIoC.PowerShell.Tools.csproj +++ b/src/PowerShell/Tools/src/AutomationIoC.PowerShell.Tools.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net9.0 + netstandard2.1;net10.0 diff --git a/src/PowerShell/Tools/test/AutomationIoC.PowerShell.Tools.Test.csproj b/src/PowerShell/Tools/test/AutomationIoC.PowerShell.Tools.Test.csproj index d474002..88a2a00 100644 --- a/src/PowerShell/Tools/test/AutomationIoC.PowerShell.Tools.Test.csproj +++ b/src/PowerShell/Tools/test/AutomationIoC.PowerShell.Tools.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 false true diff --git a/src/Runtime/src/AutomationIoC.Runtime.csproj b/src/Runtime/src/AutomationIoC.Runtime.csproj index ed610ef..3c163eb 100644 --- a/src/Runtime/src/AutomationIoC.Runtime.csproj +++ b/src/Runtime/src/AutomationIoC.Runtime.csproj @@ -1,7 +1,7 @@ - netstandard2.1;net8.0;net9.0 + netstandard2.1;net10.0 diff --git a/src/Runtime/test/AutomationIoC.Runtime.Test.csproj b/src/Runtime/test/AutomationIoC.Runtime.Test.csproj index c5aba6b..12bfe17 100644 --- a/src/Runtime/test/AutomationIoC.Runtime.Test.csproj +++ b/src/Runtime/test/AutomationIoC.Runtime.Test.csproj @@ -1,7 +1,7 @@ - net8.0;net9.0 + net10.0 false true From 3a36c13b6f88c5f3868654a2ec12af16439f008d Mon Sep 17 00:00:00 2001 From: Ken Swan <49496839+kenswan@users.noreply.github.com> Date: Wed, 12 Nov 2025 09:28:41 -0600 Subject: [PATCH 2/2] Update Sample Projects Target Framework --- .../CommandLineSample.csproj | 2 +- samples/Directory.Packages.props | 19 +++++++++---------- .../EFCorePowerShellSample.csproj | 2 +- .../PowerShellSample/PowerShellSample.csproj | 2 +- .../PowerShellToolsSample.csproj | 2 +- samples/RuntimeSample/RuntimeSample.csproj | 2 +- .../Shared/AutomationSamples.Shared.csproj | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/samples/CommandLineSample/CommandLineSample.csproj b/samples/CommandLineSample/CommandLineSample.csproj index 9c59008..16aae57 100644 --- a/samples/CommandLineSample/CommandLineSample.csproj +++ b/samples/CommandLineSample/CommandLineSample.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props index aa22ff8..1c6bab9 100644 --- a/samples/Directory.Packages.props +++ b/samples/Directory.Packages.props @@ -5,23 +5,22 @@ - - - - + + + + - - - + + + - - - + + diff --git a/samples/EFCorePowerShellSample/EFCorePowerShellSample.csproj b/samples/EFCorePowerShellSample/EFCorePowerShellSample.csproj index 3cd3845..f660dc6 100644 --- a/samples/EFCorePowerShellSample/EFCorePowerShellSample.csproj +++ b/samples/EFCorePowerShellSample/EFCorePowerShellSample.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 diff --git a/samples/PowerShellSample/PowerShellSample.csproj b/samples/PowerShellSample/PowerShellSample.csproj index a13ed58..9b2d893 100644 --- a/samples/PowerShellSample/PowerShellSample.csproj +++ b/samples/PowerShellSample/PowerShellSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 true true true diff --git a/samples/PowerShellToolsSample/PowerShellToolsSample.csproj b/samples/PowerShellToolsSample/PowerShellToolsSample.csproj index 94d7c82..cf93b00 100644 --- a/samples/PowerShellToolsSample/PowerShellToolsSample.csproj +++ b/samples/PowerShellToolsSample/PowerShellToolsSample.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 false true diff --git a/samples/RuntimeSample/RuntimeSample.csproj b/samples/RuntimeSample/RuntimeSample.csproj index 00641ed..d90f796 100644 --- a/samples/RuntimeSample/RuntimeSample.csproj +++ b/samples/RuntimeSample/RuntimeSample.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 diff --git a/samples/Shared/AutomationSamples.Shared.csproj b/samples/Shared/AutomationSamples.Shared.csproj index ec8e722..93779e1 100644 --- a/samples/Shared/AutomationSamples.Shared.csproj +++ b/samples/Shared/AutomationSamples.Shared.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0