Skip to content

Commit

Permalink
feat: add 4.8.1 and 7.0 in targeted frameworks (#422)
Browse files Browse the repository at this point in the history
* Add 4.8.1 and 7.0 in targeted frameworks

* Update actions to use .net7

* Add specific net7.0 framework for test run
  • Loading branch information
Tr00d authored Jun 8, 2023
1 parent ca9618e commit be77a7b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 13 deletions.
8 changes: 2 additions & 6 deletions .github/workflows/multiframework-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,10 @@ jobs:
build:
runs-on: windows-latest
steps:
- name: Setup .NET 6.0
- name: Setup .NET 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.403'
- name: Setup .NET 3.1
uses: actions/setup-dotnet@v1
with:
dotnet-version: '3.1.401'
dotnet-version: '7.0.302'
- uses: actions/checkout@v2
- name: Build
run: dotnet build --configuration Release
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/net6-build.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: NET6.0 Build
name: NET7.0 Build

on:
push:
Expand All @@ -14,10 +14,10 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.11
- name: Setup .NET 6.0
- name: Setup .NET 7.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: '6.0.403'
dotnet-version: '7.0.302'
- name: Install SonarScanner
run: |
dotnet tool update --global dotnet-sonarscanner
Expand All @@ -36,7 +36,7 @@ jobs:
- name: Build
run: dotnet build --configuration Release
- name: Test
run: dotnet-coverage collect 'dotnet test --configuration Release --no-build -f net6.0 --filter Category!=Integration' -f xml -o 'coverage.xml'
run: dotnet-coverage collect 'dotnet test --configuration Release --no-build -f net7.0 --filter Category!=Integration' -f xml -o 'coverage.xml'
env:
Vonage.Test.RsaPrivateKey: ${{ secrets.VONAGE_RSA_PRIVATE_KEY }}
- name: End SonarScanner
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ Therefore, we ensure complete compatibility no matter the version you are using.
* .NET Framework 4.7.1
* .NET Framework 4.7.2
* .NET Framework 4.8.0
* .NET Framework 4.8.1
* .NET 6.0
* .NET 6.0-Windows
* .NET 7.0
* .NET 7.0-Windows

## Configuration

Expand Down
2 changes: 1 addition & 1 deletion Vonage.Common.Test/Vonage.Common.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<LangVersion>latest</LangVersion>

<TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net481</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Vonage.Server.Test/Vonage.Server.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
<TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net6.0-windows;net7.0;net7.0-windows;net481</TargetFrameworks>
<AssemblyName>Vonage.Server.Test</AssemblyName>
<RootNamespace>Vonage.Server.Test</RootNamespace>
<PackageId>Vonage.Server.Test</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion Vonage.Test.Unit/Vonage.Test.Unit.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462;net47;net471;net472;net48;net6.0;net6.0-windows</TargetFrameworks>
<TargetFrameworks>net6.0;net6.0-windows;net462;net47;net471;net472;net48;net7.0;net7.0-windows;net481</TargetFrameworks>
<NoWarn>1701;1702;0618</NoWarn>
<IsPackable>false</IsPackable>
<Configurations>Debug;Release;ReleaseSigned</Configurations>
Expand Down

0 comments on commit be77a7b

Please sign in to comment.