Remove .net6 and .net7 (#582)

microsoft · Aug 15, 2024 · 0e5e560 · 0e5e560
1 parent d7a16b0
commit 0e5e560
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 186 deletions.
diff --git a/.azure/pipelines/azure-pipelines-compliance.yml b/.azure/pipelines/azure-pipelines-compliance.yml
@@ -17,14 +17,6 @@ jobs:
      clean: False
      submodules: recursive
      persistCredentials: True
-   - task: UseDotNet@2
-     displayName: 'Use .NET Core sdk 6.0.x'
-     inputs:
-       version: 6.0.x
-   - task: UseDotNet@2
-     displayName: 'Use .NET Core sdk 7.0.x'
-     inputs:
-       version: 7.0.x
    - task: UseDotNet@2
      displayName: 'Use .NET Core sdk 8.0.x'
      inputs:

diff --git a/.azure/pipelines/azure-pipelines-external-release.yml b/.azure/pipelines/azure-pipelines-external-release.yml
@@ -27,14 +27,6 @@ jobs:
     clean: False
     submodules: recursive
     persistCredentials: True
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk 6.0.x
-    inputs:
-      version: 6.0.x
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk 7.0.x
-    inputs:
-      version: 7.0.x
   - task: UseDotNet@2
     displayName: Use .NET Core sdk 8.0.x
     inputs:

diff --git a/.azure/pipelines/azure-pipelines-internal-release.yml b/.azure/pipelines/azure-pipelines-internal-release.yml
@@ -21,14 +21,6 @@ jobs:
     clean: False
     submodules: recursive
     persistCredentials: True
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk 6.0.x
-    inputs:
-      version: 6.0.x
-  - task: UseDotNet@2
-    displayName: Use .NET Core sdk 7.0.x
-    inputs:
-      version: 7.0.x
   - task: UseDotNet@2
     displayName: Use .NET Core sdk 8.0.x
     inputs:

diff --git a/.azure/pipelines/azure-pipelines-performance.yml b/.azure/pipelines/azure-pipelines-performance.yml
@@ -28,18 +28,6 @@ jobs:
   timeoutInMinutes: 75
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:
@@ -199,16 +187,6 @@ jobs:
     submodules: recursive
     persistCredentials: True
 
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk 6.0.x'
-    inputs:
-      version: 6.0.x
-
-  - task: UseDotNet@2
-    displayName: 'Use .NET Core sdk 7.0.x'
-    inputs:
-      version: 7.0.x
-
   - task: UseDotNet@2
     displayName: 'Use .NET Core sdk 8.0.x'
     inputs:

diff --git a/.azure/pipelines/azure-pipelines-tsavorite-codecoverage.yml b/.azure/pipelines/azure-pipelines-tsavorite-codecoverage.yml
@@ -17,18 +17,6 @@ jobs:
   timeoutInMinutes: 125
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:
@@ -120,18 +108,6 @@ jobs:
   timeoutInMinutes: 125
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:

diff --git a/.azure/pipelines/azure-pipelines-tsavorite.yml b/.azure/pipelines/azure-pipelines-tsavorite.yml
@@ -25,18 +25,6 @@ jobs:
         buildConfiguration: 'Release'
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:
@@ -132,18 +120,6 @@ jobs:
         buildConfiguration: 'Release'
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:

diff --git a/.azure/pipelines/azure-pipelines.yml b/.azure/pipelines/azure-pipelines.yml
@@ -25,18 +25,6 @@ jobs:
         buildConfiguration: 'Release'
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:
@@ -125,18 +113,6 @@ jobs:
         buildConfiguration: 'Release'
 
   steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 6.0
-    inputs:
-      packageType: 'sdk'
-      version: '6.0.x'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 7.0
-    inputs:
-      packageType: 'sdk'
-      version: '7.0.x'
-
   - task: UseDotNet@2
     displayName: Use .NET 8.0
     inputs:

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup Label="Targets">
-    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Configuration">

diff --git a/Garnet.nuspec b/Garnet.nuspec
@@ -31,30 +31,6 @@
   </metadata>
   <files>
     <file src="README.md" target="README.md" />
-    <file src="libs\server\bin\Release\net6.0\Garnet.server.dll" target="lib\net6.0" />
-    <file src="libs\server\bin\Release\net6.0\Garnet.server.pdb" target="lib\net6.0" />
-    <file src="libs\server\bin\Release\net6.0\Garnet.server.xml" target="lib\net6.0" />
-    <file src="libs\common\bin\Release\net6.0\Garnet.common.dll" target="lib\net6.0" />
-    <file src="libs\common\bin\Release\net6.0\Garnet.common.pdb" target="lib\net6.0" />
-    <file src="libs\common\bin\Release\net6.0\Garnet.common.xml" target="lib\net6.0" />
-    <file src="libs\client\bin\Release\net6.0\Garnet.client.dll" target="lib\net6.0" />
-    <file src="libs\client\bin\Release\net6.0\Garnet.client.pdb" target="lib\net6.0" />
-    <file src="libs\client\bin\Release\net6.0\Garnet.client.xml" target="lib\net6.0" />
-    <file src="libs\cluster\bin\Release\net6.0\Garnet.cluster.dll" target="lib\net6.0" />
-    <file src="libs\cluster\bin\Release\net6.0\Garnet.cluster.pdb" target="lib\net6.0" />
-    <file src="libs\cluster\bin\Release\net6.0\Garnet.cluster.xml" target="lib\net6.0" />
-    <file src="libs\host\bin\Release\net6.0\Garnet.host.dll" target="lib\net6.0" />
-    <file src="libs\host\bin\Release\net6.0\Garnet.host.pdb" target="lib\net6.0" />
-    <file src="libs\host\bin\Release\net6.0\Garnet.host.xml" target="lib\net6.0" />
-    <file src="metrics\HdrHistogram\bin\Release\net6.0\HdrHistogram.dll" target="lib\net6.0" />
-    <file src="metrics\HdrHistogram\bin\Release\net6.0\HdrHistogram.pdb" target="lib\net6.0" />
-    <file src="metrics\HdrHistogram\bin\Release\net6.0\HdrHistogram.xml" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\core\bin\Release\net6.0\Tsavorite.core.dll" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\core\bin\Release\net6.0\Tsavorite.core.pdb" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\core\bin\Release\net6.0\Tsavorite.core.xml" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\devices\AzureStorageDevice\bin\Release\net6.0\Tsavorite.devices.AzureStorageDevice.dll" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\devices\AzureStorageDevice\bin\Release\net6.0\Tsavorite.devices.AzureStorageDevice.pdb" target="lib\net6.0" />
-    <file src="libs\storage\Tsavorite\cs\src\devices\AzureStorageDevice\bin\Release\net6.0\Tsavorite.devices.AzureStorageDevice.xml" target="lib\net6.0" />
 
     <file src="libs\server\bin\Release\net8.0\Garnet.server.dll" target="lib\net8.0" />
     <file src="libs\server\bin\Release\net8.0\Garnet.server.pdb" target="lib\net8.0" />

diff --git a/benchmark/BDN.benchmark/Program.cs b/benchmark/BDN.benchmark/Program.cs
@@ -18,7 +18,6 @@
 
 public class BaseConfig : ManualConfig
 {
-    public Job Net6BaseJob { get; }
     public Job Net8BaseJob { get; }
 
     public BaseConfig()
@@ -29,12 +28,10 @@ public BaseConfig()
 
         var baseJob = Job.Default.WithGcServer(true);
 
-        Net6BaseJob = baseJob.WithRuntime(CoreRuntime.Core60);
         Net8BaseJob = baseJob.WithRuntime(CoreRuntime.Core80)
             .WithEnvironmentVariables(new EnvironmentVariable("DOTNET_TieredPGO", "0"));
 
         AddJob(
-            Net6BaseJob.WithId(".NET 6"),
             Net8BaseJob.WithId(".NET 8")
             );
     }

diff --git a/benchmark/Resp.benchmark/Program.cs b/benchmark/Resp.benchmark/Program.cs
@@ -27,8 +27,6 @@ namespace Resp.benchmark
     ///   "--op GEOADDREM --dbsize 2048 -b 256 -t 1,2"
     /// </summary>
 
-    // Disabling for keeping compatibility with net6.0 and net7.0
-#pragma warning disable IDE0028
     class Program
     {
         public static IConnectionMultiplexer redis;

diff --git a/libs/cluster/Session/RespClusterSlotManagementCommands.cs b/libs/cluster/Session/RespClusterSlotManagementCommands.cs
@@ -35,7 +35,7 @@ private bool NetworkClusterAddSlots(int count, out bool invalidParameters)
             readHead = (int)(ptr - recvBufferPtr);
 
             // The slot parsing may give errorMessage even if the methods TryParseSlots true.
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();
@@ -81,7 +81,7 @@ private bool NetworkClusterAddSlotsRange(int count, out bool invalidParameters)
             readHead = (int)(ptr - recvBufferPtr);
 
             //The slot parsing may give errorMessage even if the TryParseSlots returns true.
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();
@@ -210,7 +210,7 @@ private bool NetworkClusterDelSlots(int count, out bool invalidParameters)
             readHead = (int)(ptr - recvBufferPtr);
 
             //The slot parsing may give errorMessage even if the TryParseSlots returns true.
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();
@@ -256,7 +256,7 @@ private bool NetworkClusterDelSlotsRange(int count, out bool invalidParameters)
             readHead = (int)(ptr - recvBufferPtr);
 
             //The slot parsing may give errorMessage even if the TryParseSlots returns true.
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();
@@ -335,7 +335,7 @@ private bool NetworkClusterDelKeysInSlotRange(int count, out bool invalidParamet
             readHead = (int)(ptr - recvBufferPtr);
 
             //The slot parsing may give errorMessage even if the TryParseSlots returns true.
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();
@@ -560,7 +560,7 @@ private bool NetworkClusterSetSlotsRange(int count, out bool invalidParameters)
 
             // Try to parse slot ranges. The parsing may give errorMessage even if the TryParseSlots returns true.
             var slotsParsed = TryParseSlots(_count, ref ptr, out var slots, out var errorMessage, range: true);
-            if (slotsParsed && errorMessage != default)
+            if (slotsParsed && !errorMessage.IsEmpty)
             {
                 while (!RespWriteUtils.WriteError(errorMessage, ref dcurr, dend))
                     SendAndReset();

diff --git a/libs/common/AsciiUtils.cs b/libs/common/AsciiUtils.cs
@@ -48,13 +48,7 @@ public static byte ToUpper(byte c)
     /// </summary>
     public static void ToUpperInPlace(Span<byte> command)
     {
-#if NET8_0_OR_GREATER
         Ascii.ToUpperInPlace(command, out _);
-#else
-        foreach (ref var c in command)
-            if (c > 96 && c < 123)
-                c -= 32;
-#endif
     }
 
     /// <inheritdoc cref="EqualsUpperCaseSpanIgnoringCase(ReadOnlySpan{byte}, ReadOnlySpan{byte})"/>

diff --git a/libs/common/HashSlotUtils.cs b/libs/common/HashSlotUtils.cs
@@ -14,11 +14,7 @@ public static unsafe class HashSlotUtils
         /// This table is based on the CRC-16-CCITT polynomial (0x1021)
         /// </summary>
 #pragma warning disable IDE0300 // Simplify collection initialization. Ignored to avoid dotnet-format bug, see https://github.com/dotnet/sdk/issues/39898
-#if NET7_0_OR_GREATER
         private static ReadOnlySpan<ushort> Crc16Table => new ushort[256]
-#else
-        private static readonly ushort[] Crc16Table = new ushort[256]
-#endif
         {
             0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
             0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
@@ -65,11 +61,7 @@ internal static unsafe ushort Hash(byte* data, int len)
         {
             ushort result = 0;
 
-#if NET7_0_OR_GREATER
             ref var crc16Base = ref MemoryMarshal.GetReference(Crc16Table);
-#else
-            ref var crc16Base = ref MemoryMarshal.GetArrayDataReference(Crc16Table);
-#endif
             var end = data + len;
             while (data < end)
             {

diff --git a/libs/server/Objects/SortedSet/SortedSetObjectImpl.cs b/libs/server/Objects/SortedSet/SortedSetObjectImpl.cs
@@ -900,7 +900,7 @@ private void GetRank(ref ObjectInput input, ref SpanByteAndMemory output, bool a
                     if (inRange < 0 || (inRange == 0 && minValueExclusive))
                         continue;
 
-                    var outRange = maxValueChars == default ? -1 : new ReadOnlySpan<byte>(item.Item2).SequenceCompareTo(maxValueChars);
+                    var outRange = maxValueChars.IsEmpty ? -1 : new ReadOnlySpan<byte>(item.Item2).SequenceCompareTo(maxValueChars);
                     if (outRange > 0 || (outRange == 0 && maxValueExclusive))
                         break;