[C#] Add .NET 7 support, deprecate .NET 5, remove NetCoreApp3.1 from …

…tests (#759) * remove .net5, add .net7 * update client and server nuspecs * update full yml * remove netcoreapp3.1 from tests * Also update output in the default SimpleFunctions. Co-authored-by: Badrish Chandramouli <badrishc@microsoft.com>
microsoft · Nov 13, 2022 · e35cde2 · e35cde2
1 parent 39b7610
commit e35cde2
Show file tree

Hide file tree

Showing 44 changed files with 126 additions and 87 deletions.
diff --git a/azure-pipelines-full.yml b/azure-pipelines-full.yml
@@ -27,6 +27,18 @@ 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: NodeTool@0
     inputs:
        versionSpec: 13.x
@@ -132,6 +144,18 @@ 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'
+
   - bash: |
       sudo npm install -g azurite
       sudo mkdir azurite

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -27,9 +27,21 @@ 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: NodeTool@0
     inputs:
-       versionSpec: 13.x
+      versionSpec: 13.x
 
   - script : npm install -g azurite
     displayName: Install Azurite
@@ -132,6 +144,18 @@ 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'
+
   - bash: |
       sudo npm install -g azurite
       sudo mkdir azurite

diff --git a/cs/benchmark/FASTER.benchmark.csproj b/cs/benchmark/FASTER.benchmark.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -12,7 +12,6 @@
     <RootNamespace>FASTER.benchmark</RootNamespace>
     <ErrorReport>prompt</ErrorReport>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <Prefer32Bit>true</Prefer32Bit>
     <AssemblyOriginatorKeyFile>../FASTER.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
     <SignAssembly>true</SignAssembly>

diff --git a/cs/performance/BenchmarkDotNet/BenchmarkDotNetTests.csproj b/cs/performance/BenchmarkDotNet/BenchmarkDotNetTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
  </PropertyGroup>
   <PropertyGroup>
     <PlatformTarget>AnyCPU</PlatformTarget>

diff --git a/cs/playground/AsyncStress/AsyncStress.csproj b/cs/playground/AsyncStress/AsyncStress.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Platforms>x64</Platforms>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/cs/playground/CacheStoreConcurrent/CacheStoreConcurrent.csproj b/cs/playground/CacheStoreConcurrent/CacheStoreConcurrent.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/cs/playground/ClassRecoveryDurability/ClassRecoveryDurability.csproj b/cs/playground/ClassRecoveryDurability/ClassRecoveryDurability.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/cs/playground/FasterLogMLSDTest/FasterLogStress.csproj b/cs/playground/FasterLogMLSDTest/FasterLogStress.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Platforms>x64</Platforms>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/cs/playground/SumStore/SumStore.csproj b/cs/playground/SumStore/SumStore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -12,7 +12,6 @@
     <RootNamespace>SumStore</RootNamespace>
     <ErrorReport>prompt</ErrorReport>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/cs/playground/TstRunner/TstRunner.csproj b/cs/playground/TstRunner/TstRunner.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Platforms>x64</Platforms>
         <LangVersion>latest</LangVersion>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/cs/remote/FASTER.client.nuspec b/cs/remote/FASTER.client.nuspec
@@ -23,10 +23,10 @@
 		<group targetFramework="netstandard2.1">
 			<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
 		</group>
-		<group targetFramework="net5.0">
+		<group targetFramework="net6.0">
 			<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
 		</group>
-		<group targetFramework="net6.0">
+		<group targetFramework="net7.0">
 			<dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
 		</group>
 	</dependencies>
@@ -46,18 +46,19 @@
 	<file src="src\FASTER.client\bin\AnyCPU\Release\netstandard2.1\FASTER.client.pdb" target="lib\netstandard2.1" />
 	<file src="src\FASTER.client\bin\AnyCPU\Release\netstandard2.1\FASTER.client.xml" target="lib\netstandard2.1" />
 
-    <file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.dll" target="lib\net5.0" />
-	<file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.pdb" target="lib\net5.0" />
-	<file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.xml" target="lib\net5.0" />
-    <file src="src\FASTER.client\bin\AnyCPU\Release\net5.0\FASTER.client.dll" target="lib\net5.0" />
-	<file src="src\FASTER.client\bin\AnyCPU\Release\net5.0\FASTER.client.pdb" target="lib\net5.0" />
-	<file src="src\FASTER.client\bin\AnyCPU\Release\net5.0\FASTER.client.xml" target="lib\net5.0" />
-
     <file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.dll" target="lib\net6.0" />
 	<file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.pdb" target="lib\net6.0" />
 	<file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.xml" target="lib\net6.0" />
     <file src="src\FASTER.client\bin\AnyCPU\Release\net6.0\FASTER.client.dll" target="lib\net6.0" />
 	<file src="src\FASTER.client\bin\AnyCPU\Release\net6.0\FASTER.client.pdb" target="lib\net6.0" />
 	<file src="src\FASTER.client\bin\AnyCPU\Release\net6.0\FASTER.client.xml" target="lib\net6.0" />
+
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.dll" target="lib\net7.0" />
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.pdb" target="lib\net7.0" />
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.xml" target="lib\net7.0" />
+    <file src="src\FASTER.client\bin\AnyCPU\Release\net7.0\FASTER.client.dll" target="lib\net7.0" />
+	<file src="src\FASTER.client\bin\AnyCPU\Release\net7.0\FASTER.client.pdb" target="lib\net7.0" />
+	<file src="src\FASTER.client\bin\AnyCPU\Release\net7.0\FASTER.client.xml" target="lib\net7.0" />
+
   </files>
 </package>
diff --git a/cs/remote/FASTER.server.nuspec b/cs/remote/FASTER.server.nuspec
@@ -26,12 +26,12 @@
 		  <dependency id="Microsoft.FASTER.Core" version="$version$" />
 		  <dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
       </group>
-	  <group targetFramework="net5.0">
+	  <group targetFramework="net6.0">
 		  <dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
 		  <dependency id="Microsoft.FASTER.Core" version="$version$" />
 		  <dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
       </group>
-	  <group targetFramework="net6.0">
+	  <group targetFramework="net7.0">
 		  <dependency id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" />
 		  <dependency id="Microsoft.FASTER.Core" version="$version$" />
 		  <dependency id="Microsoft.Extensions.Logging" version="6.0.0" />
@@ -53,18 +53,18 @@
 	<file src="src\FASTER.server\bin\AnyCPU\Release\netstandard2.1\FASTER.server.pdb" target="lib\netstandard2.1" />
 	<file src="src\FASTER.server\bin\AnyCPU\Release\netstandard2.1\FASTER.server.xml" target="lib\netstandard2.1" />
 
-    <file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.dll" target="lib\net5.0" />
-	<file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.pdb" target="lib\net5.0" />
-	<file src="src\FASTER.common\bin\AnyCPU\Release\net5.0\FASTER.common.xml" target="lib\net5.0" />
-	<file src="src\FASTER.server\bin\AnyCPU\Release\net5.0\FASTER.server.dll" target="lib\net5.0" />
-	<file src="src\FASTER.server\bin\AnyCPU\Release\net5.0\FASTER.server.pdb" target="lib\net5.0" />
-	<file src="src\FASTER.server\bin\AnyCPU\Release\net5.0\FASTER.server.xml" target="lib\net5.0" />
-
     <file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.dll" target="lib\net6.0" />
 	<file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.pdb" target="lib\net6.0" />
 	<file src="src\FASTER.common\bin\AnyCPU\Release\net6.0\FASTER.common.xml" target="lib\net6.0" />
 	<file src="src\FASTER.server\bin\AnyCPU\Release\net6.0\FASTER.server.dll" target="lib\net6.0" />
 	<file src="src\FASTER.server\bin\AnyCPU\Release\net6.0\FASTER.server.pdb" target="lib\net6.0" />
 	<file src="src\FASTER.server\bin\AnyCPU\Release\net6.0\FASTER.server.xml" target="lib\net6.0" />
+
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.dll" target="lib\net7.0" />
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.pdb" target="lib\net7.0" />
+	<file src="src\FASTER.common\bin\AnyCPU\Release\net7.0\FASTER.common.xml" target="lib\net7.0" />
+	<file src="src\FASTER.server\bin\AnyCPU\Release\net7.0\FASTER.server.dll" target="lib\net7.0" />
+	<file src="src\FASTER.server\bin\AnyCPU\Release\net7.0\FASTER.server.pdb" target="lib\net7.0" />
+	<file src="src\FASTER.server\bin\AnyCPU\Release\net7.0\FASTER.server.xml" target="lib\net7.0" />
   </files>
 </package>
diff --git a/cs/remote/benchmark/FASTER.benchmark/FASTER.benchmark.csproj b/cs/remote/benchmark/FASTER.benchmark/FASTER.benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
     <LangVersion>latest</LangVersion>

diff --git a/cs/remote/samples/FixedLenClient/FixedLenClient.csproj b/cs/remote/samples/FixedLenClient/FixedLenClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
     <LangVersion>latest</LangVersion>

diff --git a/cs/remote/samples/FixedLenServer/FixedLenServer.csproj b/cs/remote/samples/FixedLenServer/FixedLenServer.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
     <LangVersion>latest</LangVersion>

diff --git a/cs/remote/samples/VarLenClient/VarLenClient.csproj b/cs/remote/samples/VarLenClient/VarLenClient.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Platforms>AnyCPU;x64</Platforms>
     <LangVersion>latest</LangVersion>

diff --git a/cs/remote/samples/VarLenServer/VarLenServer.csproj b/cs/remote/samples/VarLenServer/VarLenServer.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net6.0</TargetFramework>
+		<TargetFramework>net7.0</TargetFramework>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<Platforms>AnyCPU;x64</Platforms>
 		<LangVersion>latest</LangVersion>

diff --git a/cs/remote/src/FASTER.client/FASTER.client.csproj b/cs/remote/src/FASTER.client/FASTER.client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/cs/remote/src/FASTER.common/FASTER.common.csproj b/cs/remote/src/FASTER.common/FASTER.common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/cs/remote/src/FASTER.server/FASTER.server.csproj b/cs/remote/src/FASTER.server/FASTER.server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/cs/remote/test/FASTER.remote.test/FASTER.remote.test.csproj b/cs/remote/test/FASTER.remote.test/FASTER.remote.test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/cs/samples/AzureBackedStore/AzureBackedStore.csproj b/cs/samples/AzureBackedStore/AzureBackedStore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -12,7 +12,6 @@
     <RootNamespace>AzureBackedStore</RootNamespace>
     <ErrorReport>prompt</ErrorReport>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

diff --git a/cs/samples/CacheStore/CacheStore.csproj b/cs/samples/CacheStore/CacheStore.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>x64</Platforms>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>

diff --git a/cs/samples/EpvsSample/EpvsBench.cs b/cs/samples/EpvsSample/EpvsBench.cs
@@ -19,20 +19,20 @@ internal class EpvsBench
 
         internal class Worker
         {
-            private byte[] scratchPad;
+            readonly byte[] scratchPad;
 
-            private HashAlgorithm hasher;
+            readonly HashAlgorithm hasher;
 
             // private long scratchPad;
-            private EpvsBench parent;
-            private List<int> versionChangeIndexes;
-            private int numOps, versionChangeDelay, numaStyle, threadId;
+            readonly EpvsBench parent;
+            readonly List<int> versionChangeIndexes;
+            readonly int numOps, versionChangeDelay, numaStyle, threadId;
 
-            private byte syncMode;
+            readonly byte syncMode;
 
             internal Worker(EpvsBench parent, Options options, Random random, int threadId)
             {
-                hasher = new SHA256Managed();
+                hasher = SHA256.Create();
                 scratchPad = new byte[hasher.HashSize / 8];
                 this.parent = parent;
                 versionChangeIndexes = new List<int>();

diff --git a/cs/samples/EpvsSample/EpvsSample.csproj b/cs/samples/EpvsSample/EpvsSample.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>