From 79d8dcd3304357bd2ab7290129391a17c83b565e Mon Sep 17 00:00:00 2001
From: Ash Neilson <ash@ricado.co.nz>
Date: Wed, 21 Dec 2022 23:01:59 +1300
Subject: [PATCH] Upgraded to .NET 7

---
 .github/workflows/codeql-analysis.yml         | 28 ++++---------------
 .github/workflows/main.yml                    |  4 ++-
 README.md                                     |  2 +-
 .../RICADO.MettlerToledo.csproj               |  8 +++---
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index be187dd..b681615 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -8,7 +8,6 @@ on:
 
 # Workflow Jobs
 jobs:
-  # Analyze Job
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
@@ -23,26 +22,9 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@v3
       
-      # Step 2 - Initialize CodeQL
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+      # Step 2 - Run CodeQL
+      - name: Run CodeQL
+        uses: ricado-group/dotnet-library-codeql-action@v1
         with:
-          languages: csharp
-          queries: security-and-quality
-      
-      # Step 3 - Setup .NET 6 with GitHub Packages Authentication
-      - name: Setup .NET 6 with GitHub Packages Authentication
-        uses: actions/setup-dotnet@v3.0.2
-        with:
-          dotnet-version: 6.0.x
-          source-url: https://nuget.pkg.github.com/ricado-group/index.json
-        env:
-          NUGET_AUTH_TOKEN: ${{ secrets.GH_PACKAGES_PAT }}
-      
-      # Step 4 - Build the Library
-      - name: Run CodeQL Autobuild
-        uses: github/codeql-action/autobuild@v2
-      
-      # Step 5 - Perform CodeQL Analysis
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+          private-nuget-url: 'https://nuget.pkg.github.com/ricado-group/index.json'
+          private-nuget-token: ${{ secrets.GH_PACKAGES_PAT }}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f09834..51c257c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,6 +8,7 @@ on:
       - master
     tags:
       - '*.*.*'
+  pull_request:
 
 # Workflow Jobs
 jobs:
@@ -20,7 +21,7 @@ jobs:
       
       # Step 2 - Build and Publish
       - name: Build and Publish
-        uses: ricado-group/dotnet-library-build-release-action@v1.3
+        uses: ricado-group/dotnet-library-build-release-action@v1
         with:
           project-name: 'RICADO.MettlerToledo'
           github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -28,3 +29,4 @@ jobs:
           private-nuget-token: ${{ secrets.GH_PACKAGES_PAT }}
           public-nuget-token: ${{ secrets.NUGET_APIKEY }}
           publish-public: true
+          dotnet-version: 7.0.x
diff --git a/README.md b/README.md
index f5b87f7..119fa94 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,2 @@
 # RICADO.MettlerToledo
-A .NET 6 and .NET Standard 2.0 Library for Communicating with Mettler Toledo Indicators
+A .NET 6/7 and .NET Standard 2.0 Library for Communicating with Mettler Toledo Indicators
diff --git a/RICADO.MettlerToledo/RICADO.MettlerToledo.csproj b/RICADO.MettlerToledo/RICADO.MettlerToledo.csproj
index 8a0739d..11ad2ff 100644
--- a/RICADO.MettlerToledo/RICADO.MettlerToledo.csproj
+++ b/RICADO.MettlerToledo/RICADO.MettlerToledo.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
     <Authors>RICADO Group</Authors>
     <Company>RICADO Group LP</Company>
-    <Description>A .NET 6 and .NET Standard 2.0 Library for Communicating with Mettler Toledo Indicators</Description>
-    <Copyright>Copyright © RICADO Group LP 2009 - 2022</Copyright>
+    <Description>A .NET 6/7 and .NET Standard 2.0 Library for Communicating with Mettler Toledo Indicators</Description>
+    <Copyright>Copyright © RICADO Group LP 2009 - 2023</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>packageIcon.png</PackageIcon>
     <RepositoryUrl>https://github.com/ricado-group/dotnet-mettlertoledo</RepositoryUrl>
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RICADO.Sockets" Version="1.2.0" />
+    <PackageReference Include="RICADO.Sockets" Version="1.3.0" />
   </ItemGroup>
 
 </Project>