From 99931a8416402675c7c623a5792a0f1e9d9f9ff2 Mon Sep 17 00:00:00 2001 From: Simon Ensslen Date: Wed, 22 May 2024 13:45:44 +0200 Subject: [PATCH] remove .net 7, as it is now out of support --- .github/workflows/action.yml | 20 ++++--------------- .github/workflows/release.yml | 6 ------ src/NuGetLicenseCore/NuGetLicenseCore.csproj | 2 +- src/NuGetUtility/NuGetUtility.csproj | 4 ++-- .../NuGetUtility.Test.csproj | 2 +- 5 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/workflows/action.yml b/.github/workflows/action.yml index 39caef02..1abe7421 100644 --- a/.github/workflows/action.yml +++ b/.github/workflows/action.yml @@ -15,14 +15,11 @@ jobs: matrix: os: [ubuntu-latest, macos-latest] - framework: [net6.0, net7.0, net8.0] + framework: [net6.0, net8.0] include: - framework: net6.0 dotnetVersion: "6.0.x" - - - framework: net7.0 - dotnetVersion: "7.0.x" - framework: net8.0 dotnetVersion: "8.0.x" @@ -49,14 +46,11 @@ jobs: runs-on: windows-latest strategy: matrix: - framework: [net6.0, net7.0, net8.0, net472] + framework: [net6.0, net8.0, net472] include: - framework: net6.0 dotnetVersion: "6.0.x" - - - framework: net7.0 - dotnetVersion: "7.0.x" - framework: net8.0 dotnetVersion: "8.0.x" @@ -102,15 +96,12 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - targetFramework: [net6.0, net7.0, net8.0] + targetFramework: [net6.0, net8.0] project: [App, Tests, ProjectWithReferenceContainingLicenseExpression] include: - targetFramework: net6.0 dotnetVersion: "6.0.x" - - - targetFramework: net7.0 - dotnetVersion: "7.0.x" - targetFramework: net8.0 dotnetVersion: "8.0.x" @@ -188,14 +179,11 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - targetFramework: [net6.0, net7.0, net8.0] + targetFramework: [net6.0, net8.0] include: - targetFramework: net6.0 dotnetVersion: "6.0.x" - - - targetFramework: net7.0 - dotnetVersion: "7.0.x" - targetFramework: net8.0 dotnetVersion: "8.0.x" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 924480a8..1dcece2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,10 +14,6 @@ jobs: uses: actions/setup-dotnet@v4 with: dotnet-version: "6.0.x" - - name: Setup dotnet 7.0.x - uses: actions/setup-dotnet@v4 - with: - dotnet-version: "7.0.x" - name: Setup dotnet 8.0.x uses: actions/setup-dotnet@v4 with: @@ -56,8 +52,6 @@ jobs: - name: Publish the application binaries (.net6) run: dotnet publish ./src/NuGetLicenseCore/NuGetLicenseCore.csproj -c Release --no-restore -o ${{ steps.artifacts_path.outputs.path }}/net6 -f net6.0 -p:Version=${{ steps.version.outputs.full_without_prefix }} - - name: Publish the application binaries (.net7) - run: dotnet publish ./src/NuGetLicenseCore/NuGetLicenseCore.csproj -c Release --no-restore -o ${{ steps.artifacts_path.outputs.path }}/net7 -f net7.0 -p:Version=${{ steps.version.outputs.full_without_prefix }} - name: Publish the application binaries (.net8) run: dotnet publish ./src/NuGetLicenseCore/NuGetLicenseCore.csproj -c Release --no-restore -o ${{ steps.artifacts_path.outputs.path }}/net8 -f net8.0 -p:Version=${{ steps.version.outputs.full_without_prefix }} - name: Publish the application binaries (.net472) diff --git a/src/NuGetLicenseCore/NuGetLicenseCore.csproj b/src/NuGetLicenseCore/NuGetLicenseCore.csproj index eb14ac45..df1fb5fc 100644 --- a/src/NuGetLicenseCore/NuGetLicenseCore.csproj +++ b/src/NuGetLicenseCore/NuGetLicenseCore.csproj @@ -2,7 +2,7 @@ Exe - net6.0;net7.0;net8.0 + net6.0;net8.0 true true DotnetTool diff --git a/src/NuGetUtility/NuGetUtility.csproj b/src/NuGetUtility/NuGetUtility.csproj index e6ff6fdd..96183e1e 100644 --- a/src/NuGetUtility/NuGetUtility.csproj +++ b/src/NuGetUtility/NuGetUtility.csproj @@ -1,7 +1,7 @@ - + - net472;net6.0;net7.0;net8.0 + net472;net6.0;net8.0 git 100.100.100 false diff --git a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj index f71af1b3..46b5a2e0 100644 --- a/tests/NuGetUtility.Test/NuGetUtility.Test.csproj +++ b/tests/NuGetUtility.Test/NuGetUtility.Test.csproj @@ -1,7 +1,7 @@ - net472;net6.0;net7.0;net8.0 + net472;net6.0;net8.0 enable enable