Upgraded to .NET 7

Author: ashneilson

.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 }}

.github/workflows/main.yml

@@ -8,6 +8,7 @@ on:
       - main
     tags:
       - '*.*.*'
+  pull_request:
 
 # Workflow Jobs
 jobs:
@@ -20,11 +21,12 @@ 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.Threading'
           github-token: ${{ secrets.GITHUB_TOKEN }}
           private-nuget-url: 'https://nuget.pkg.github.com/ricado-group/index.json'
           private-nuget-token: ${{ secrets.GH_PACKAGES_PAT }}
           public-nuget-token: ${{ secrets.NUGET_APIKEY }}
           publish-public: true
+          dotnet-version: 7.0.x

README.md

@@ -1,2 +1,2 @@
 # RICADO.Threading
-A Threading Helper Library utilizing System.Threading for .NET 6 and .NET Standard 2.0 Applications
+A Threading Helper Library utilizing System.Threading for .NET 6/7 and .NET Standard 2.0 Applications

RICADO.Threading/RICADO.Threading.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 Threading Helper Library utilizing System.Threading for .NET 6 and .NET Standard 2.0 Applications</Description>
-    <Copyright>Copyright © RICADO Group LP 2009 - 2021</Copyright>
+    <Description>A Threading Helper Library utilizing System.Threading for .NET 6/7 and .NET Standard 2.0 Applications</Description>
+    <Copyright>Copyright © RICADO Group LP 2009 - 2023</Copyright>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIcon>packageIcon.png</PackageIcon>
     <RepositoryUrl>https://github.com/ricado-group/dotnet-threading</RepositoryUrl>
@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="RICADO.Logging" Version="1.2.2" />
+    <PackageReference Include="RICADO.Logging" Version="1.3.0" />
   </ItemGroup>
 
 </Project>