Move from netcoreapp2.0 to netcoreapp3.0.

StephenCleary · Dec 8, 2023 · 199ecd6 · 199ecd6
1 parent dbe5ff8
commit 199ecd6
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [6.3.0] - TBD
+### Fixed
+- Changed `netcoreapp2.0` support to `netcoreapp3.0` to avoid high-security vulnerabilities. Technically, this is a breaking change, but I'm treating it as a fix since the vulnerabilities will never be patched.
+
 ## [6.2.2] - 2021-09-25
 ### Changed
 - Bump Rx and Ix dependencies.

diff --git a/src/Comparers.Ix/Comparers.Ix.csproj b/src/Comparers.Ix/Comparers.Ix.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This old package just forwards to Nito.Comparers.Ix.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net461;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <IsMetapackage>true</IsMetapackage>
   </PropertyGroup>

diff --git a/src/Comparers.Rx/Comparers.Rx.csproj b/src/Comparers.Rx/Comparers.Rx.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This old package just forwards to Nito.Comparers.Rx.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net461;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <IsMetapackage>true</IsMetapackage>
   </PropertyGroup>

diff --git a/src/Comparers/Comparers.csproj b/src/Comparers/Comparers.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>This old package just forwards to Nito.Comparers.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp3.0;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <IsMetapackage>true</IsMetapackage>
   </PropertyGroup>

diff --git a/src/Nito.Comparers.Core/Internals/Murmur3Hash.cs b/src/Nito.Comparers.Core/Internals/Murmur3Hash.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-#if !NET461 && !NETCOREAPP2_0 && !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NETSTANDARD2_1
+#if !NET461 && !NETCOREAPP3_0 && !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NETSTANDARD2_1
 using static System.Numerics.BitOperations;
 #endif
 
@@ -69,7 +69,7 @@ public void Combine(int data)
             }
         }
 
-#if NET461 || NETCOREAPP2_0 || NETSTANDARD1_0 || NETSTANDARD2_0 || NETSTANDARD2_1
+#if NET461 || NETCOREAPP3_0 || NETSTANDARD1_0 || NETSTANDARD2_0 || NETSTANDARD2_1
         private static uint RotateLeft(uint value, int bits) => (value << bits) | (value >> (32 - bits));
 #endif
     }

diff --git a/src/Nito.Comparers.Core/Nito.Comparers.Core.csproj b/src/Nito.Comparers.Core/Nito.Comparers.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>The last comparison library you'll ever need!</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net461;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <RootNamespace>Nito.Comparers</RootNamespace>
   </PropertyGroup>

diff --git a/src/Nito.Comparers.Ix/Nito.Comparers.Ix.csproj b/src/Nito.Comparers.Ix/Nito.Comparers.Ix.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Comparer extensions for System Interactive (Ix).</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net461;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <RootNamespace>Nito.Comparers</RootNamespace>
   </PropertyGroup>

diff --git a/src/Nito.Comparers.Linq/Linq/EnumerableExtensions.cs b/src/Nito.Comparers.Linq/Linq/EnumerableExtensions.cs
@@ -278,7 +278,7 @@ public static Dictionary<TKey, TElement> ToDictionary<TSource, TKey, TElement>(t
             return source.ToDictionary(keySelector, elementSelector, comparer);
         }
 
-#if NET472 || NETCOREAPP2_0
+#if NET472 || NETCOREAPP3_0
         /// <summary>
         /// Creates a hash set from a sequence.
         /// </summary>

diff --git a/src/Nito.Comparers.Linq/Nito.Comparers.Linq.csproj b/src/Nito.Comparers.Linq/Nito.Comparers.Linq.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Comparer extension methods for System.Linq.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp3.0;net8.0</TargetFrameworks>
     <RootNamespace>Nito.Comparers</RootNamespace>
   </PropertyGroup>
 

diff --git a/src/Nito.Comparers.Rx/Nito.Comparers.Rx.csproj b/src/Nito.Comparers.Rx/Nito.Comparers.Rx.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Comparer extension methods for System.Reactive.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;net461;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <RootNamespace>Nito.Comparers</RootNamespace>
   </PropertyGroup>

diff --git a/src/Nito.Comparers/Nito.Comparers.csproj b/src/Nito.Comparers/Nito.Comparers.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>The last comparison library you'll ever need!</Description>
-    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard1.3;netstandard2.0;net461;net472;netcoreapp3.0;net8.0</TargetFrameworks>
     <PackageTags>comparer;equalitycomparer;icomparable;iequatable</PackageTags>
     <IsMetapackage>true</IsMetapackage>
   </PropertyGroup>