diff --git a/libs/storage/Tsavorite/cs/benchmark/App.config b/libs/storage/Tsavorite/cs/benchmark/App.config deleted file mode 100644 index ab8cad0d5a..0000000000 --- a/libs/storage/Tsavorite/cs/benchmark/App.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/storage/Tsavorite/cs/benchmark/Properties/AssemblyInfo.cs b/libs/storage/Tsavorite/cs/benchmark/Properties/AssemblyInfo.cs deleted file mode 100644 index 0fe40d01dd..0000000000 --- a/libs/storage/Tsavorite/cs/benchmark/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -//[assembly: AssemblyTitle("Tsavorite.benchmark")] -[assembly: AssemblyDescription("")] -//[assembly: AssemblyConfiguration("")] -//[assembly: AssemblyCompany("")] -//[assembly: AssemblyProduct("Tsavorite.benchmark")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("19ed104b-3dcc-42ed-9dc0-afa825042543")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("1.0.0.0")] -//[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/libs/storage/Tsavorite/cs/benchmark/Tsavorite.benchmark.csproj b/libs/storage/Tsavorite/cs/benchmark/Tsavorite.benchmark.csproj index 57aa09c8f0..4397866d04 100644 --- a/libs/storage/Tsavorite/cs/benchmark/Tsavorite.benchmark.csproj +++ b/libs/storage/Tsavorite/cs/benchmark/Tsavorite.benchmark.csproj @@ -9,31 +9,11 @@ Exe true - Tsavorite.benchmark - prompt - PackageReference ../../../../../Garnet.snk false true - - TRACE;DEBUG - full - true - bin\x64\Debug\ - - - TRACE - pdbonly - true - bin\x64\Release\ - - - - - - diff --git a/libs/storage/Tsavorite/cs/src/core/Properties/AssemblyInfo.cs b/libs/storage/Tsavorite/cs/src/core/Properties/AssemblyInfo.cs deleted file mode 100644 index 628ec2b299..0000000000 --- a/libs/storage/Tsavorite/cs/src/core/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyDescription("")] -[assembly: AssemblyCopyright("Copyright © 2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("01002755-60ca-40ee-94d9-11c07eb58786")] \ No newline at end of file diff --git a/libs/storage/Tsavorite/cs/src/core/Tsavorite.core.csproj b/libs/storage/Tsavorite/cs/src/core/Tsavorite.core.csproj index 24863364aa..cb40b01f91 100644 --- a/libs/storage/Tsavorite/cs/src/core/Tsavorite.core.csproj +++ b/libs/storage/Tsavorite/cs/src/core/Tsavorite.core.csproj @@ -8,13 +8,8 @@ true - Tsavorite.core - Tsavorite.core - prompt true - Library - ../../../../../../Garnet.snk false true @@ -22,16 +17,7 @@ - DEBUG - full ;NU1605 - bin\$(Platform)\Debug\ - - - - - true - bin\$(Platform)\Release\ diff --git a/libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/Tsavorite.devices.AzureStorageDevice.csproj b/libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/Tsavorite.devices.AzureStorageDevice.csproj index deb25e22d9..4d75a1955d 100644 --- a/libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/Tsavorite.devices.AzureStorageDevice.csproj +++ b/libs/storage/Tsavorite/cs/src/devices/AzureStorageDevice/Tsavorite.devices.AzureStorageDevice.csproj @@ -9,30 +9,14 @@ true Tsavorite.devices - Tsavorite.devices.AzureStorageDevice - prompt true - Library - ../../../../../../../Garnet.snk false true bin\$(Platform)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - TRACE;DEBUG - full - bin\$(Platform)\Debug\ - - - - TRACE - true - bin\$(Platform)\Release\ - - diff --git a/libs/storage/Tsavorite/cs/test/BasicTests.cs b/libs/storage/Tsavorite/cs/test/BasicTests.cs index 13ee33c7e4..4a48609bab 100644 --- a/libs/storage/Tsavorite/cs/test/BasicTests.cs +++ b/libs/storage/Tsavorite/cs/test/BasicTests.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Threading.Tasks; using NUnit.Framework; +using NUnit.Framework.Internal; using Tsavorite.core; using static Tsavorite.test.TestUtils; @@ -796,16 +797,17 @@ public static void KVBasicsSampleEndToEndInDocs() Assert.AreEqual(10, output); } -#if WINDOWS [Test] [Category("TsavoriteKV")] public static void LogPathtooLong() { + if (!OperatingSystem.IsWindows()) + Assert.Ignore("Skipped"); + string testDir = new('x', Native32.WIN32_MAX_PATH - 11); // As in LSD, -11 for "." using var log = Devices.CreateLogDevice(testDir, deleteOnClose: true); // Should succeed Assert.Throws(typeof(TsavoriteException), () => Devices.CreateLogDevice(testDir + "y", deleteOnClose: true)); } -#endif [Test] [Category("TsavoriteKV")] diff --git a/libs/storage/Tsavorite/cs/test/EnqueueTests.cs b/libs/storage/Tsavorite/cs/test/EnqueueTests.cs index e8883f82d7..27b0296353 100644 --- a/libs/storage/Tsavorite/cs/test/EnqueueTests.cs +++ b/libs/storage/Tsavorite/cs/test/EnqueueTests.cs @@ -173,10 +173,9 @@ public async Task EnqueueAsyncBasicTest([Values] TestUtils.DeviceType deviceType device = TestUtils.CreateTestDevice(deviceType, filename); log = new TsavoriteLog(new TsavoriteLogSettings { LogDevice = device, SegmentSizeBits = 22, LogCommitDir = TestUtils.MethodTestDir }); -#if WINDOWS - if (deviceType == TestUtils.DeviceType.EmulatedAzure) + if (OperatingSystem.IsWindows() && deviceType == TestUtils.DeviceType.EmulatedAzure) return; -#endif + CancellationToken cancellationToken = default; ReadOnlyMemory readOnlyMemoryEntry = entry; ReadOnlySpanBatch spanBatch = new ReadOnlySpanBatch(5); diff --git a/libs/storage/Tsavorite/cs/test/GenericLogCompactionTests.cs b/libs/storage/Tsavorite/cs/test/GenericLogCompactionTests.cs index 7f5d469450..81dab93c71 100644 --- a/libs/storage/Tsavorite/cs/test/GenericLogCompactionTests.cs +++ b/libs/storage/Tsavorite/cs/test/GenericLogCompactionTests.cs @@ -70,7 +70,7 @@ public void TearDown() [Test] [Category("TsavoriteKV")] [Category("Smoke")] - public void LogCompactBasicTest([Values] DeviceType deviceType, [Values] CompactionType compactionType) + public void LogCompactBasicTest([Values] CompactionType compactionType) { MyInput input = new(); diff --git a/libs/storage/Tsavorite/cs/test/Properties/AssemblyInfo.cs b/libs/storage/Tsavorite/cs/test/Properties/AssemblyInfo.cs deleted file mode 100644 index 98da3ff087..0000000000 --- a/libs/storage/Tsavorite/cs/test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -using System.Reflection; -using System.Runtime.InteropServices; - -#pragma warning disable format -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -//[assembly: AssemblyTitle("Tsavorite.test")] -[assembly: AssemblyDescription("")] -//[assembly: AssemblyConfiguration("")] -//[assembly: AssemblyCompany("")] -//[assembly: AssemblyProduct("Tsavorite.test")] -[assembly: AssemblyCopyright("Copyright © 2016")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("7204b801-fb6f-465b-858f-f6493fe7aaf7")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -//[assembly: AssemblyVersion("1.0.0.0")] -//[assembly: AssemblyFileVersion("1.0.0.0")] - -// Make all fixtures in the test assembly run in parallel -#if false // disable parallelism until all the problems are resolved -[assembly: Parallelizable(ParallelScope.Fixtures)] -//[assembly: LevelOfParallelism(4)] // For reduced parallelization if needed -#endif -#pragma warning restore format \ No newline at end of file diff --git a/libs/storage/Tsavorite/cs/test/ReadCacheChainTests.cs b/libs/storage/Tsavorite/cs/test/ReadCacheChainTests.cs index 81e7250018..445d3c0ef7 100644 --- a/libs/storage/Tsavorite/cs/test/ReadCacheChainTests.cs +++ b/libs/storage/Tsavorite/cs/test/ReadCacheChainTests.cs @@ -751,13 +751,7 @@ unsafe void PopulateAndEvict() //[Repeat(300)] #pragma warning disable IDE0060 // Remove unused parameter (modRange is used by Setup()) public void LongRcMultiThreadTest([Values] HashModulo modRange, [Values(0, 1, 2, 8)] int numReadThreads, [Values(0, 1, 2, 8)] int numWriteThreads, - [Values(UpdateOp.Upsert, UpdateOp.RMW)] UpdateOp updateOp, -#if WINDOWS - [Values(DeviceType.LSD -#else - [Values(DeviceType.MLSD -#endif - )] DeviceType deviceType) + [Values(UpdateOp.Upsert, UpdateOp.RMW)] UpdateOp updateOp) #pragma warning restore IDE0060 // Remove unused parameter { if (numReadThreads == 0 && numWriteThreads == 0) @@ -978,13 +972,7 @@ static void ClearCountsOnError(ClientSession true - Tsavorite.test - Tsavorite.test - prompt true - Library - ../../../../../Garnet.snk false bin\$(Platform)\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml - - TRACE;DEBUG - full - bin\$(Platform)\Debug\ - - - - TRACE - pdbonly - true - bin\$(Platform)\Release\ - - 1701;1702;1591 - - true - true - true - - - WINDOWS - - - OSX - - - LINUX - - diff --git a/libs/storage/Tsavorite/cs/test/app.config b/libs/storage/Tsavorite/cs/test/app.config deleted file mode 100644 index 53ebb6e47b..0000000000 --- a/libs/storage/Tsavorite/cs/test/app.config +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file