From be77a7b014e0ae116b1f8f644a490fbecf21a168 Mon Sep 17 00:00:00 2001
From: Guillaume Faas <59444272+Tr00d@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:21:10 +0200
Subject: [PATCH] feat: add 4.8.1 and 7.0 in targeted frameworks (#422)

* Add 4.8.1 and 7.0 in targeted frameworks

* Update actions to use .net7

* Add specific net7.0 framework for test run
---
 .github/workflows/multiframework-build.yml   | 8 ++------
 .github/workflows/net6-build.yml             | 8 ++++----
 README.md                                    | 3 +++
 Vonage.Common.Test/Vonage.Common.Test.csproj | 2 +-
 Vonage.Server.Test/Vonage.Server.Test.csproj | 2 +-
 Vonage.Test.Unit/Vonage.Test.Unit.csproj     | 2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/multiframework-build.yml b/.github/workflows/multiframework-build.yml
index 55304bbab..f1b348123 100644
--- a/.github/workflows/multiframework-build.yml
+++ b/.github/workflows/multiframework-build.yml
@@ -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
diff --git a/.github/workflows/net6-build.yml b/.github/workflows/net6-build.yml
index 6b94c76e7..4c295b3ec 100644
--- a/.github/workflows/net6-build.yml
+++ b/.github/workflows/net6-build.yml
@@ -1,4 +1,4 @@
-name: NET6.0 Build
+name: NET7.0 Build
 
 on:
   push:
@@ -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
@@ -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
diff --git a/README.md b/README.md
index 3f1ff847d..bef1ec105 100644
--- a/README.md
+++ b/README.md
@@ -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
 
diff --git a/Vonage.Common.Test/Vonage.Common.Test.csproj b/Vonage.Common.Test/Vonage.Common.Test.csproj
index de8c80e41..fa08aa266 100644
--- a/Vonage.Common.Test/Vonage.Common.Test.csproj
+++ b/Vonage.Common.Test/Vonage.Common.Test.csproj
@@ -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>
diff --git a/Vonage.Server.Test/Vonage.Server.Test.csproj b/Vonage.Server.Test/Vonage.Server.Test.csproj
index 1cba79e80..858fa8934 100644
--- a/Vonage.Server.Test/Vonage.Server.Test.csproj
+++ b/Vonage.Server.Test/Vonage.Server.Test.csproj
@@ -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>
diff --git a/Vonage.Test.Unit/Vonage.Test.Unit.csproj b/Vonage.Test.Unit/Vonage.Test.Unit.csproj
index 0b61ceddb..d87be370b 100644
--- a/Vonage.Test.Unit/Vonage.Test.Unit.csproj
+++ b/Vonage.Test.Unit/Vonage.Test.Unit.csproj
@@ -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>