From c0b0c3e50078eac240d7cd04c5877c8709967439 Mon Sep 17 00:00:00 2001 From: Jeff Kluge Date: Mon, 8 Sep 2025 10:33:54 -0700 Subject: [PATCH] Update packages, drop support for .NET 6 --- .github/workflows/CI.yml | 30 ++++--------------- .github/workflows/Official.yml | 2 +- Directory.Build.props | 1 + Directory.Packages.props | 5 ++-- ...tAbstractions.TestHelpers.UnitTests.csproj | 3 +- ...EnvironmentAbstractions.TestHelpers.csproj | 2 +- .../EnvironmentAbstractions.UnitTests.csproj | 3 +- .../EnvironmentAbstractions.csproj | 2 +- 8 files changed, 13 insertions(+), 35 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index dab7956..682b6db 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -13,7 +13,6 @@ on: env: ArtifactsDirectoryName: 'artifacts' - TestResultsDirectoryName: 'coverage' CommonTestArguments: '--no-restore --no-build --logger trx /noautorsp' BuildConfiguration: 'Debug' BuildPlatform: 'Any CPU' @@ -30,7 +29,7 @@ jobs: testarguments: '' - os: ubuntu-latest name: Linux - testarguments: '--collect:"XPlat Code Coverage"' + testarguments: '' - os: macos-latest name: MacOS testarguments: '' @@ -45,17 +44,17 @@ jobs: with: fetch-depth: 0 - - name: Install .NET 6.x and 8.x + - name: Install .NET 8.x and 9.x uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.x 8.x + 9.x - - name: Install .NET 9.0 + - name: Install .NET 10.0 uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.x + dotnet-version: 10.x dotnet-quality: 'preview' - name: Build Solution @@ -65,31 +64,12 @@ jobs: if: ${{ matrix.name == 'Windows' }} run: dotnet test ${{ env.CommonTestArguments }} ${{ matrix.TestArguments}} --framework net472 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net472.binlog" - - name: Run Unit Tests (.NET 6.0) - run: dotnet test ${{ env.CommonTestArguments }} ${{ matrix.TestArguments}} --framework net6.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net6.0.binlog" - - name: Run Unit Tests (.NET 8.0) run: dotnet test ${{ env.CommonTestArguments }} ${{ matrix.TestArguments}} --framework net8.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net8.0.binlog" - name: Run Unit Tests (.NET 9.0) run: dotnet test ${{ env.CommonTestArguments }} ${{ matrix.TestArguments}} --framework net9.0 "/Property:Platform=${{ env.BuildPlatform }};Configuration=${{ env.BuildConfiguration }}" "/BinaryLogger:${{ env.ArtifactsDirectoryName }}/test-net9.0.binlog" - - name: Code Coverage Report - if: ${{ matrix.name == 'Linux' }} - uses: irongut/CodeCoverageSummary@v1.3.0 - with: - filename: '**/TestResults/**/coverage.cobertura.xml' - badge: true - format: markdown - hide_complexity: true - indicators: true - output: both - thresholds: '60 80' - - - name: Add Code Coverage Report to Summary - if: ${{ matrix.name == 'Linux' }} - run: cat code-coverage-results.md >> $GITHUB_STEP_SUMMARY - - name: Upload Test Results uses: actions/upload-artifact@v4 if: success() || failure() diff --git a/.github/workflows/Official.yml b/.github/workflows/Official.yml index 8e6814b..ad8390b 100644 --- a/.github/workflows/Official.yml +++ b/.github/workflows/Official.yml @@ -27,7 +27,7 @@ jobs: - name: Install .NET SDKs uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.x + dotnet-version: 10.x dotnet-quality: 'preview' - name: Build Solution diff --git a/Directory.Build.props b/Directory.Build.props index a310df1..a575af0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,5 +8,6 @@ enable true true + true \ No newline at end of file diff --git a/Directory.Packages.props b/Directory.Packages.props index 14e0de0..bbd7fed 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -3,13 +3,12 @@ true - - + - + diff --git a/src/EnvironmentAbstractions.TestHelpers.UnitTests/EnvironmentAbstractions.TestHelpers.UnitTests.csproj b/src/EnvironmentAbstractions.TestHelpers.UnitTests/EnvironmentAbstractions.TestHelpers.UnitTests.csproj index 2399924..f66d124 100644 --- a/src/EnvironmentAbstractions.TestHelpers.UnitTests/EnvironmentAbstractions.TestHelpers.UnitTests.csproj +++ b/src/EnvironmentAbstractions.TestHelpers.UnitTests/EnvironmentAbstractions.TestHelpers.UnitTests.csproj @@ -1,10 +1,9 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 false - diff --git a/src/EnvironmentAbstractions.TestHelpers/EnvironmentAbstractions.TestHelpers.csproj b/src/EnvironmentAbstractions.TestHelpers/EnvironmentAbstractions.TestHelpers.csproj index f8f3c61..b020ade 100644 --- a/src/EnvironmentAbstractions.TestHelpers/EnvironmentAbstractions.TestHelpers.csproj +++ b/src/EnvironmentAbstractions.TestHelpers/EnvironmentAbstractions.TestHelpers.csproj @@ -1,6 +1,6 @@ - netstandard2.0;net6.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0 Provides implementations of IEnvironmentVariableProvider so that unit tests can mock calls that retrieve environment variable. Environment Variable Abstraction env var test helper $(BaseArtifactsPath)\$(MSBuildProjectName)\ diff --git a/src/EnvironmentAbstractions.UnitTests/EnvironmentAbstractions.UnitTests.csproj b/src/EnvironmentAbstractions.UnitTests/EnvironmentAbstractions.UnitTests.csproj index 81ba123..9387054 100644 --- a/src/EnvironmentAbstractions.UnitTests/EnvironmentAbstractions.UnitTests.csproj +++ b/src/EnvironmentAbstractions.UnitTests/EnvironmentAbstractions.UnitTests.csproj @@ -1,10 +1,9 @@  - net472;net6.0;net8.0;net9.0 + net472;net8.0;net9.0 false - diff --git a/src/EnvironmentAbstractions/EnvironmentAbstractions.csproj b/src/EnvironmentAbstractions/EnvironmentAbstractions.csproj index 40566db..255af8e 100644 --- a/src/EnvironmentAbstractions/EnvironmentAbstractions.csproj +++ b/src/EnvironmentAbstractions/EnvironmentAbstractions.csproj @@ -1,6 +1,6 @@  - netstandard2.0;net6.0;net8.0;net9.0 + netstandard2.0;net8.0;net9.0 Provides an abstraction for retrieving environment variable so that these calls can be made to be more testable. Environment Variable Abstraction env var $(BaseArtifactsPath)\$(MSBuildProjectName)\