From 2b4f1542ed2a55a05fea7366699eb7a54581988b Mon Sep 17 00:00:00 2001
From: J Burnett <jburnett@users.noreply.github.com>
Date: Mon, 6 Jun 2022 21:12:30 -0400
Subject: [PATCH] Upgrade to MSTest SDK v17 (#7)

* Upgrade to MSTest SDK v17

* Drop < .Net 6.0

* Improve CI, impl build-config matrix, drop < .NET 6.0
---
 .github/workflows/dotnet-core.yml            | 23 ++++++++------------
 AMT.LinqExtensions/AMT.LinqExtensions.csproj | 13 +----------
 common.props                                 | 13 ++++++++++-
 test/test.csproj                             | 11 ----------
 4 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
index 2585e36..7fe93ee 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet-core.yml
@@ -2,12 +2,15 @@ name: .NET Core Builds
 
 on:
   push:
-    branches: [ master, dev ]
-  pull_request:
     branches: [ master ]
+  pull_request:
+    branches: [ dev ]
 
 jobs:
   build:
+    strategy:
+      matrix:
+        build-config: [ Debug, Release ]
 
     runs-on: ubuntu-latest
 
@@ -17,17 +20,9 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 6.0.100
-    - name: Setup .NET 5.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 5.0.403
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.415
     - name: Install dependencies
       run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Test.Mutant
-      run: dotnet test --no-restore --verbosity normal ./test/test.csproj
+    - name: Build Mutant
+      run: dotnet build --configuration ${{ matrix.build-config }} --no-restore
+    - name: Test Mutant
+      run: dotnet test --configuration ${{ matrix.build-config }} --no-restore --verbosity normal ./test/test.csproj
diff --git a/AMT.LinqExtensions/AMT.LinqExtensions.csproj b/AMT.LinqExtensions/AMT.LinqExtensions.csproj
index beeda43..7508be6 100644
--- a/AMT.LinqExtensions/AMT.LinqExtensions.csproj
+++ b/AMT.LinqExtensions/AMT.LinqExtensions.csproj
@@ -16,22 +16,11 @@
     <GenerateNeutralResourcesLanguageAttribute />
 
     <Description>A few LINQ Extensions we find useful.</Description>
-    <PackageReleaseNotes>Supports .NET Core 3.1, .NET 5.0, &amp; .NET 6.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Supports .NET 6.0</PackageReleaseNotes>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/AltaModaTech/LINQExtensions</PackageProjectUrl>
     <PackageTags>LINQ</PackageTags>
     <Title>LINQ Extensions by AltaModa Technologies</Title>
   </PropertyGroup>
 
-<!--
-  .NET 6.0 (LTS) EOL 11/8/2024
-  .NET Core 3.1 (LTS) EOL 12/3/2022
-  .NET 5.0 EOL 5/8/2022
-  .NET Core 2.1 (LTS) EOL 8/21/2021
-  .NET Core 1.1 EOL 6/27/2019
--->
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
-  </PropertyGroup>
-
 </Project>
diff --git a/common.props b/common.props
index 0f6b36b..ae3c8e0 100644
--- a/common.props
+++ b/common.props
@@ -10,11 +10,22 @@
 
     <!-- Assembly version & attribute controls -->
     <PropertyGroup>
-        <VersionPrefix>3.2.0</VersionPrefix>
+        <VersionPrefix>4.0.0</VersionPrefix>
 
         <GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>
         <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
     </PropertyGroup>
 
+<!--
+  .NET 6.0 (LTS) EOL 11/8/2024
+  .NET Core 3.1 (LTS) EOL 12/3/2022
+  .NET 5.0 EOL 5/8/2022
+  .NET Core 2.1 (LTS) EOL 8/21/2021
+  .NET Core 1.1 EOL 6/27/2019
+-->
+  <PropertyGroup>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+  </PropertyGroup>
+
 </Project>
\ No newline at end of file
diff --git a/test/test.csproj b/test/test.csproj
index a7898d5..13858c0 100644
--- a/test/test.csproj
+++ b/test/test.csproj
@@ -7,17 +7,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-<!--
-  .NET 6.0 (LTS) EOL 11/8/2024
-  .NET Core 3.1 (LTS) EOL 12/3/2022
-  .NET 5.0 EOL 5/8/2022
-  .NET Core 2.1 (LTS) EOL 8/21/2021
-  .NET Core 1.1 EOL 6/27/2019
--->
-  <PropertyGroup>
-      <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
-  </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\AMT.LinqExtensions\AMT.LinqExtensions.csproj" />
   </ItemGroup>