Skip to content

Commit

Permalink
refactor: Add TFMs for net{6,7,8}.0 (#172)
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Drenski <[email protected]>
  • Loading branch information
austindrenski authored Jan 16, 2024
1 parent c1a189a commit cf2baa8
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -27,15 +27,15 @@ jobs:
- name: Run Tests
run: dotnet test test/OpenFeature.Tests/ --configuration Release --logger GitHubActions

unit-tests-windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@v4
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: |
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/dotnet-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
paths-ignore:
- '**.md'

jobs:
jobs:
e2e-tests:
runs-on: ubuntu-latest
services:
Expand All @@ -23,15 +23,15 @@ 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: |
6.0.x
7.0.x
- name: Initialize Tests
run: |
run: |
git submodule update --init --recursive
cp test-harness/features/evaluation.feature test/OpenFeature.E2ETests/Features/
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "7.0.404"
"version": "8.0.100"
}
}
4 changes: 2 additions & 2 deletions src/OpenFeature/OpenFeature.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net462</TargetFrameworks>
<RootNamespace>OpenFeature</RootNamespace>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Expand All @@ -23,4 +23,4 @@
<None Include="../../README.md" Pack="true" PackagePath="/" />
</ItemGroup>

</Project>
</Project>
2 changes: 1 addition & 1 deletion test/OpenFeature.Benchmarks/OpenFeature.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<RootNamespace>OpenFeature.Benchmark</RootNamespace>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OpenFeature.E2ETests/OpenFeature.E2ETests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
<RootNamespace>OpenFeature.E2ETests</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/OpenFeature.Tests/OpenFeature.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks Condition="$(OS) == 'Windows_NT'">$(TargetFrameworks);net462</TargetFrameworks>
<RootNamespace>OpenFeature.Tests</RootNamespace>
</PropertyGroup>
Expand Down

0 comments on commit cf2baa8

Please sign in to comment.