Merge branch .NET 6.0 support; increment version

AltaModaTech · Nov 9, 2021 · 27c77c5 · 27c77c5
2 parents 0d75811 + 85e993f
commit 27c77c5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml
@@ -13,14 +13,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
+    - name: Setup .NET 6.0
+      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.401
+        dotnet-version: 5.0.403
     - name: Setup .NET Core 3.1
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.413
+        dotnet-version: 3.1.415
     - name: Install dependencies
       run: dotnet restore
     - name: Build

diff --git a/AMT.LinqExtensions/AMT.LinqExtensions.csproj b/AMT.LinqExtensions/AMT.LinqExtensions.csproj
@@ -16,20 +16,22 @@
     <GenerateNeutralResourcesLanguageAttribute />
 
     <Description>A few LINQ Extensions we find useful.</Description>
-    <PackageReleaseNotes>Supports .NET Core 3.1 &amp; .NET 5.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Supports .NET Core 3.1, .NET 5.0, &amp; .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</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/common.props b/common.props
@@ -10,7 +10,7 @@
 
     <!-- Assembly version & attribute controls -->
     <PropertyGroup>
-        <VersionPrefix>3.1.0</VersionPrefix>
+        <VersionPrefix>3.2.0</VersionPrefix>
 
         <GenerateAssemblyConfigurationAttribute>true</GenerateAssemblyConfigurationAttribute>
         <GenerateAssemblyCompanyAttribute>true</GenerateAssemblyCompanyAttribute>

diff --git a/test/test.csproj b/test/test.csproj
@@ -8,12 +8,14 @@
   </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</TargetFrameworks>
+      <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>