From e9f2fde1e90d47c7a1cdcc841867ec6f5cb18bb0 Mon Sep 17 00:00:00 2001
From: Scott Offen <3513626+scottoffen@users.noreply.github.com>
Date: Tue, 19 Nov 2024 15:51:51 -0700
Subject: [PATCH] Modify workflow

---
 .github/workflows/main-pr-build-test.yaml | 9 +++++++--
 src/Grapeseed/Grapeseed.csproj            | 4 ++--
 src/Grapevine/Grapevine.csproj            | 4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/main-pr-build-test.yaml b/.github/workflows/main-pr-build-test.yaml
index f5e4e93..83c12ea 100644
--- a/.github/workflows/main-pr-build-test.yaml
+++ b/.github/workflows/main-pr-build-test.yaml
@@ -26,14 +26,19 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
 
-    # The steps below will run in order for each of strageies defined in the matrix
+    # The steps below will run in order for each of strategies defined in the matrix
     steps:
 
     # Installs the most recent versions of the .NET SDKs
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: |
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+          8.0.x
 
     # Displays the available .NET SDKs for verification
     - name: Display Available .NET SDKs
diff --git a/src/Grapeseed/Grapeseed.csproj b/src/Grapeseed/Grapeseed.csproj
index 1425ed7..6300036 100644
--- a/src/Grapeseed/Grapeseed.csproj
+++ b/src/Grapeseed/Grapeseed.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <NoWarn>$(NoWarn);NETSDK1138;CS1591;CS1573;CS1711;CS1574;CS1572</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -37,7 +37,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[5.0.0, 6.0.0)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, 6.0.0)" />
   </ItemGroup>
diff --git a/src/Grapevine/Grapevine.csproj b/src/Grapevine/Grapevine.csproj
index 8d20c02..e99ffaf 100644
--- a/src/Grapevine/Grapevine.csproj
+++ b/src/Grapevine/Grapevine.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <NoWarn>$(NoWarn);NETSDK1138;CS1591;CS1572</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -45,7 +45,7 @@
     <None Include="..\..\grapevine.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'net5.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0'">
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="[5.0.0, 6.0.0)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[5.0.0, 6.0.0)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[5.0.0, 6.0.0)" />