Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add 4.8.1 and 7.0 in targeted frameworks #422

Merged
merged 3 commits into from
Jun 8, 2023
Merged

feat: add 4.8.1 and 7.0 in targeted frameworks #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2403f17
Add 4.8.1 and 7.0 in targeted frameworks
Tr00d Jun 1, 2023
1e20624
Update actions to use .net7
Tr00d Jun 1, 2023
6763958
Add specific net7.0 framework for test run
Tr00d Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions .github/workflows/multiframework-build.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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