From 1845ba23366b6956a083367544b5ea491a3a1405 Mon Sep 17 00:00:00 2001 From: Jason Nelson Date: Mon, 20 Apr 2020 15:52:49 -0500 Subject: [PATCH] Cross target .NETSTANDARD2.1 and update playground examples to .NETCOREAPP3.1 (#262) * Update playground examples to .NETCOREAPP3.1 * Update min framework version to net461, cross target .NETSTANDARD2.1 Also updates System.Runtime.CompilerServices.Unsafe, System.Memory, System.Threading.Tasks.Extensions, and System.Interactive.Async to their latest versions. * Update Test.Sdk and NUnit * Update .NETCORE SDK to 3.1.201 * Update nuget to v5.5 and update test.dll pattern * React to net461 retargeting and update nuget packages for netstandard2.1 * Replace DotNetCoreInstaller@0 task with newer UseDotNet@2 task --- azure-pipelines.yml | 23 +++++++------- cs/benchmark/FASTER.benchmark.csproj | 2 +- cs/playground/ClassCache/ClassCache.csproj | 2 +- .../ClassCacheMT/ClassCacheMT.csproj | 2 +- .../ClassRecoveryDurablity.csproj | 3 +- cs/playground/ClassSample/ClassSample.csproj | 2 +- .../FasterKVAsyncSample.csproj | 3 +- .../FasterKVDiskReadBenchmark.csproj | 3 +- .../FasterLogSample/FasterLogSample.csproj | 3 +- .../FixedLenStructSample.csproj | 2 +- .../PeriodicCompaction.csproj | 3 +- .../StructSample/StructSample.csproj | 2 +- .../StructSampleCore/StructSampleCore.csproj | 2 +- cs/playground/SumStore/SumStore.csproj | 2 +- .../VarLenStructSample.csproj | 2 +- cs/src/core/FASTER.core.csproj | 24 +++++++++----- cs/src/core/FASTER.core.debug.nuspec | 31 ++++++++++++------- cs/src/core/FASTER.core.nuspec | 31 ++++++++++++------- .../FASTER.devices.AzureStorageDevice.csproj | 8 +++-- .../FASTER.devices.AzureStorageDevice.nuspec | 19 ++++++++---- cs/test/FASTER.test.csproj | 20 ++++++++---- 21 files changed, 111 insertions(+), 78 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 10ad3e28d..453a6a549 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,9 +25,9 @@ jobs: buildConfiguration: 'Release' steps: - - task: NuGetToolInstaller@0 + - task: NuGetToolInstaller@1 inputs: - versionSpec: '4.8.2' + versionSpec: '5.5.0' - task: NuGetCommand@2 inputs: @@ -54,8 +54,8 @@ jobs: - task: VSTest@2 inputs: testAssemblyVer2: | - **\$(BuildConfiguration)\net46*\*test*.dll - **\$(BuildConfiguration)\**\net46*\*test*.dll + **\$(BuildConfiguration)\net46*\*test.dll + **\$(BuildConfiguration)\**\net46*\*test.dll !**\*Microsoft.VisualStudio.TestPlatform* !**\obj\** !**\*TestAdapter.dll @@ -66,14 +66,14 @@ jobs: - task: VSTest@2 inputs: testAssemblyVer2: | - **\$(BuildConfiguration)\netcoreapp*\*test*.dll - **\$(BuildConfiguration)\**\netcoreapp*\*test*.dll + **\$(BuildConfiguration)\netcoreapp*\*test.dll + **\$(BuildConfiguration)\**\netcoreapp*\*test.dll !**\*Microsoft.VisualStudio.TestPlatform* !**\obj\** !**\*TestAdapter.dll platform: '$(buildPlatform)' configuration: '$(buildConfiguration)' - otherConsoleOptions: '/Framework:.NETCoreApp,Version=v2.0' + otherConsoleOptions: '/Framework:.NETCoreApp,Version=v3.1' - task: PublishTestResults@2 inputs: @@ -147,19 +147,18 @@ jobs: displayName: 'C# (Linux)' steps: - - task: NuGetToolInstaller@0 + - task: NuGetToolInstaller@1 inputs: - versionSpec: '4.8.2' + versionSpec: '5.5.0' - task: NuGetCommand@2 inputs: restoreSolution: '$(solution)' - - task: DotNetCoreInstaller@0 - displayName: 'Install' + - task: UseDotNet@2 inputs: packageType: 'sdk' - version: '2.2.401' + version: '3.1.201' - script: | mono --version diff --git a/cs/benchmark/FASTER.benchmark.csproj b/cs/benchmark/FASTER.benchmark.csproj index 304f6a288..d495ef094 100644 --- a/cs/benchmark/FASTER.benchmark.csproj +++ b/cs/benchmark/FASTER.benchmark.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/ClassCache/ClassCache.csproj b/cs/playground/ClassCache/ClassCache.csproj index ff74a3810..0d269e4a0 100644 --- a/cs/playground/ClassCache/ClassCache.csproj +++ b/cs/playground/ClassCache/ClassCache.csproj @@ -3,7 +3,7 @@ Exe true - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/ClassCacheMT/ClassCacheMT.csproj b/cs/playground/ClassCacheMT/ClassCacheMT.csproj index ff74a3810..0d269e4a0 100644 --- a/cs/playground/ClassCacheMT/ClassCacheMT.csproj +++ b/cs/playground/ClassCacheMT/ClassCacheMT.csproj @@ -3,7 +3,7 @@ Exe true - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/ClassRecoveryDurablity/ClassRecoveryDurablity.csproj b/cs/playground/ClassRecoveryDurablity/ClassRecoveryDurablity.csproj index 1088f4cf9..c7c5ededb 100644 --- a/cs/playground/ClassRecoveryDurablity/ClassRecoveryDurablity.csproj +++ b/cs/playground/ClassRecoveryDurablity/ClassRecoveryDurablity.csproj @@ -2,8 +2,7 @@ Exe - netcoreapp2.2 - preview + netcoreapp3.1 AnyCPU;x64 diff --git a/cs/playground/ClassSample/ClassSample.csproj b/cs/playground/ClassSample/ClassSample.csproj index 8294ee20a..837ad7984 100644 --- a/cs/playground/ClassSample/ClassSample.csproj +++ b/cs/playground/ClassSample/ClassSample.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/FasterKVAsyncSample/FasterKVAsyncSample.csproj b/cs/playground/FasterKVAsyncSample/FasterKVAsyncSample.csproj index 2a28a82dc..6c4acb70c 100644 --- a/cs/playground/FasterKVAsyncSample/FasterKVAsyncSample.csproj +++ b/cs/playground/FasterKVAsyncSample/FasterKVAsyncSample.csproj @@ -1,9 +1,8 @@  - netcoreapp2.2 + netcoreapp3.1 x64 - preview win7-x64;linux-x64 diff --git a/cs/playground/FasterKVDiskReadBenchmark/FasterKVDiskReadBenchmark.csproj b/cs/playground/FasterKVDiskReadBenchmark/FasterKVDiskReadBenchmark.csproj index 4aa31b708..5202719d9 100644 --- a/cs/playground/FasterKVDiskReadBenchmark/FasterKVDiskReadBenchmark.csproj +++ b/cs/playground/FasterKVDiskReadBenchmark/FasterKVDiskReadBenchmark.csproj @@ -1,9 +1,8 @@  - netcoreapp2.2 + netcoreapp3.1 x64 - preview win7-x64;linux-x64 diff --git a/cs/playground/FasterLogSample/FasterLogSample.csproj b/cs/playground/FasterLogSample/FasterLogSample.csproj index 900ba35e1..633eae992 100644 --- a/cs/playground/FasterLogSample/FasterLogSample.csproj +++ b/cs/playground/FasterLogSample/FasterLogSample.csproj @@ -1,9 +1,8 @@  - netcoreapp2.2 + netcoreapp3.1 x64 - preview win7-x64;linux-x64 diff --git a/cs/playground/FixedLenStructSample/FixedLenStructSample.csproj b/cs/playground/FixedLenStructSample/FixedLenStructSample.csproj index 7b8c2eee1..fe98b2a62 100644 --- a/cs/playground/FixedLenStructSample/FixedLenStructSample.csproj +++ b/cs/playground/FixedLenStructSample/FixedLenStructSample.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/PeriodicCompaction/PeriodicCompaction.csproj b/cs/playground/PeriodicCompaction/PeriodicCompaction.csproj index 09ff0bdfc..0d269e4a0 100644 --- a/cs/playground/PeriodicCompaction/PeriodicCompaction.csproj +++ b/cs/playground/PeriodicCompaction/PeriodicCompaction.csproj @@ -3,10 +3,9 @@ Exe true - net46 + netcoreapp3.1 x64 win7-x64 - preview diff --git a/cs/playground/StructSample/StructSample.csproj b/cs/playground/StructSample/StructSample.csproj index 8f102730a..9e310cf54 100644 --- a/cs/playground/StructSample/StructSample.csproj +++ b/cs/playground/StructSample/StructSample.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/StructSampleCore/StructSampleCore.csproj b/cs/playground/StructSampleCore/StructSampleCore.csproj index eb5638298..ad5e43f14 100644 --- a/cs/playground/StructSampleCore/StructSampleCore.csproj +++ b/cs/playground/StructSampleCore/StructSampleCore.csproj @@ -1,7 +1,7 @@  - netcoreapp2.2 + netcoreapp3.1 x64 win7-x64;linux-x64 true diff --git a/cs/playground/SumStore/SumStore.csproj b/cs/playground/SumStore/SumStore.csproj index f4ed9eed9..530fbf9dc 100644 --- a/cs/playground/SumStore/SumStore.csproj +++ b/cs/playground/SumStore/SumStore.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/playground/VarLenStructSample/VarLenStructSample.csproj b/cs/playground/VarLenStructSample/VarLenStructSample.csproj index 7b8c2eee1..fe98b2a62 100644 --- a/cs/playground/VarLenStructSample/VarLenStructSample.csproj +++ b/cs/playground/VarLenStructSample/VarLenStructSample.csproj @@ -1,7 +1,7 @@  - net46 + netcoreapp3.1 x64 win7-x64 diff --git a/cs/src/core/FASTER.core.csproj b/cs/src/core/FASTER.core.csproj index db58d1d4e..1f5be3989 100644 --- a/cs/src/core/FASTER.core.csproj +++ b/cs/src/core/FASTER.core.csproj @@ -1,9 +1,9 @@  - netstandard2.0;net46 + net461;netstandard2.0;netstandard2.1 AnyCPU;x64 - preview + 8 @@ -25,25 +25,33 @@ full bin\$(Platform)\Debug\ + TRACE pdbonly true bin\$(Platform)\Release\ - + + $(DefineConstants);DOTNETCORE - - - + + + + - + + + + + + - + diff --git a/cs/src/core/FASTER.core.debug.nuspec b/cs/src/core/FASTER.core.debug.nuspec index 4cceb19ef..fd5ca262f 100644 --- a/cs/src/core/FASTER.core.debug.nuspec +++ b/cs/src/core/FASTER.core.debug.nuspec @@ -15,28 +15,35 @@ en-US key-value store dictionary hashtable concurrent log persistent commit write-ahead - - - - + + + + - - - - - + + + + + + + + + - - - + + + + + + diff --git a/cs/src/core/FASTER.core.nuspec b/cs/src/core/FASTER.core.nuspec index f4c0513d5..192d43b7d 100644 --- a/cs/src/core/FASTER.core.nuspec +++ b/cs/src/core/FASTER.core.nuspec @@ -15,28 +15,35 @@ en-US key-value store dictionary hashtable concurrent log persistent commit write-ahead - - - - + + + + - - - - - + + + + + + + + + - - - + + + + + + diff --git a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj index a1d1766eb..5c970721d 100644 --- a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj +++ b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.csproj @@ -1,7 +1,7 @@  - netstandard2.0;net46 + net461;netstandard2.0;netstandard2.1 AnyCPU;x64 @@ -24,18 +24,20 @@ full bin\$(Platform)\Debug\ + TRACE pdbonly true bin\$(Platform)\Release\ - + + $(DefineConstants);DOTNETCORE - + diff --git a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec index 4c13700fa..32283dbed 100644 --- a/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec +++ b/cs/src/devices/AzureStorageDevice/FASTER.devices.AzureStorageDevice.nuspec @@ -15,22 +15,29 @@ en-US key-value store dictionary hashtable concurrent log persistent azure storage FASTER - - + + - + + + + + - - - + + + + + + diff --git a/cs/test/FASTER.test.csproj b/cs/test/FASTER.test.csproj index 7d5c9079c..685f68674 100644 --- a/cs/test/FASTER.test.csproj +++ b/cs/test/FASTER.test.csproj @@ -1,10 +1,10 @@  - net46;netcoreapp2.0 + net461;netcoreapp3.1 AnyCPU;x64 true - preview + 8 @@ -26,23 +26,31 @@ full bin\$(Platform)\Debug\ + TRACE pdbonly true bin\$(Platform)\Release\ - + + $(DefineConstants);DOTNETCORE + 1701;1702;1591 + - - - + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + +