From cf2baa8a6b4328f1aa346bbea91160aa2e5f3a8d Mon Sep 17 00:00:00 2001 From: Austin Drenski Date: Tue, 16 Jan 2024 15:14:31 -0500 Subject: [PATCH] refactor: Add TFMs for net{6,7,8}.0 (#172) Signed-off-by: Austin Drenski --- .github/workflows/ci.yml | 6 +++--- .github/workflows/code-coverage.yml | 4 +--- .github/workflows/dotnet-format.yml | 4 +--- .github/workflows/e2e.yml | 6 +++--- .github/workflows/release.yml | 2 +- global.json | 2 +- src/OpenFeature/OpenFeature.csproj | 4 ++-- test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj | 2 +- test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj | 2 +- test/OpenFeature.Tests/OpenFeature.Tests.csproj | 2 +- 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index df23b66b..e9ff3649 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 6.0.x, 7.0.x + - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: | @@ -27,7 +27,7 @@ jobs: - name: Run Tests run: dotnet test test/OpenFeature.Tests/ --configuration Release --logger GitHubActions - + unit-tests-windows: runs-on: windows-latest steps: @@ -35,7 +35,7 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 6.0.x, 7.0.x + - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: | diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index e9077dcb..5e6fb5d4 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -21,10 +21,8 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 7.0.x + - name: Setup .NET SDK uses: actions/setup-dotnet@v4 - with: - dotnet-version: '7.0.x' - name: Run Test run: dotnet test --verbosity normal /p:CollectCoverage=true /p:CoverletOutputFormat=opencover diff --git a/.github/workflows/dotnet-format.yml b/.github/workflows/dotnet-format.yml index ad691216..3455a1e0 100644 --- a/.github/workflows/dotnet-format.yml +++ b/.github/workflows/dotnet-format.yml @@ -20,10 +20,8 @@ jobs: - name: Check out code uses: actions/checkout@v4 - - name: Setup .NET Core 7.0 + - name: Setup .NET SDK uses: actions/setup-dotnet@v4 - with: - dotnet-version: 7.0.x - name: Install format tool run: dotnet tool install -g dotnet-format diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index c13d1d54..c0927b60 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -10,7 +10,7 @@ on: paths-ignore: - '**.md' -jobs: +jobs: e2e-tests: runs-on: ubuntu-latest services: @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 6.0.x, 7.0.x + - name: Setup .NET SDK uses: actions/setup-dotnet@v4 with: dotnet-version: | @@ -31,7 +31,7 @@ jobs: 7.0.x - name: Initialize Tests - run: | + run: | git submodule update --init --recursive cp test-harness/features/evaluation.feature test/OpenFeature.E2ETests/Features/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 644342a7..cb0a0f5a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 6.0.x, 7.0.x + - name: Setup .NET SDK if: ${{ steps.release.outputs.releases_created }} uses: actions/setup-dotnet@v4 with: diff --git a/global.json b/global.json index 7664239a..0aca8b12 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "rollForward": "latestFeature", - "version": "7.0.404" + "version": "8.0.100" } } diff --git a/src/OpenFeature/OpenFeature.csproj b/src/OpenFeature/OpenFeature.csproj index 271b8ec2..3bff79e3 100644 --- a/src/OpenFeature/OpenFeature.csproj +++ b/src/OpenFeature/OpenFeature.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net462 + netstandard2.0;net6.0;net7.0;net8.0;net462 OpenFeature README.md @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj b/test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj index 25e613b7..60c2231b 100644 --- a/test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj +++ b/test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj @@ -1,7 +1,7 @@ - net6.0 + net6.0;net7.0;net8.0 OpenFeature.Benchmark Exe diff --git a/test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj b/test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj index 69ee2770..628b4b31 100644 --- a/test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj +++ b/test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 $(TargetFrameworks);net462 OpenFeature.E2ETests diff --git a/test/OpenFeature.Tests/OpenFeature.Tests.csproj b/test/OpenFeature.Tests/OpenFeature.Tests.csproj index d1b77419..83689e5a 100644 --- a/test/OpenFeature.Tests/OpenFeature.Tests.csproj +++ b/test/OpenFeature.Tests/OpenFeature.Tests.csproj @@ -1,7 +1,7 @@ - net6.0;net7.0 + net6.0;net7.0;net8.0 $(TargetFrameworks);net462 OpenFeature.Tests