Added platform check to disable net48 runs on Ubuntu runners

csrakowski · Nov 19, 2023 · 6e6cab5 · 6e6cab5
1 parent bc24099
commit 6e6cab5
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 24 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,6 +22,13 @@
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
+		<DefineConstants>OS_WINDOWS</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Linux'))">
+		<DefineConstants>OS_LINUX</DefineConstants>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
 	</ItemGroup>

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/CompareWith_Parallel_ForEachAsync.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/CompareWith_Parallel_ForEachAsync.cs
@@ -24,6 +24,7 @@ namespace CSRakowski.Parallel.Benchmarks
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
     [CategoriesColumn]
     [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class CompareWith_Parallel_ForEachAsync
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/Computations.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/Computations.cs
@@ -18,10 +18,13 @@ namespace CSRakowski.Parallel.Benchmarks
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
     [CategoriesColumn]
-    //[SimpleJob(RuntimeMoniker.Net48, baseline: true)]
-    //[SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net50, baseline: true)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
+    [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class Computations
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/FuncOverloading.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/FuncOverloading.cs
@@ -17,10 +17,13 @@ namespace CSRakowski.Parallel.Benchmarks
 {
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory, BenchmarkLogicalGroupRule.ByParams)]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class FuncOverloading
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks.cs
@@ -18,10 +18,13 @@ namespace CSRakowski.Parallel.Benchmarks
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
     [CategoriesColumn]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class ParallelAsyncBenchmarks
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks_AsyncStreams.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks_AsyncStreams.cs
@@ -20,10 +20,13 @@ namespace CSRakowski.Parallel.Benchmarks
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
     [CategoriesColumn]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class ParallelAsyncBenchmarks_AsyncStreams
     {
         private const int NumberOfItemsInCollection = 10000;
@@ -62,18 +65,18 @@ public async Task<int> IEnumerable_ForEachAsyncStream()
         {
             int count = 0;
 
-            #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
 
             await foreach (var r in ParallelAsync.ForEachAsyncStream(InputNumbers, TestFunctions.JustAddOne_WithCancellationToken, MaxBatchSize, AllowOutOfOrder, NumberOfItemsInCollection, CancellationToken.None))
             {
                 count++;
             }
 
-            #else
+#else
 
             await Task.CompletedTask;
 
-            #endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
+#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
 
             return count;
         }
@@ -83,18 +86,18 @@ public async Task<int> IAsyncEnumerable_ForEachAsyncStream()
         {
             int count = 0;
 
-            #if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
 
             await foreach (var r in ParallelAsync.ForEachAsyncStream(InputNumbersAsync, TestFunctions.JustAddOne_WithCancellationToken, MaxBatchSize, AllowOutOfOrder, NumberOfItemsInCollection, CancellationToken.None))
             {
                 count++;
             }
 
-            #else
+#else
 
             await Task.CompletedTask;
 
-            #endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
+#endif //NETSTANDARD2_1_OR_GREATER || NETCOREAPP3_0_OR_GREATER
 
             return count;
         }

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks_IAsyncEnumerable.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncBenchmarks_IAsyncEnumerable.cs
@@ -20,10 +20,13 @@ namespace CSRakowski.Parallel.Benchmarks
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
     [CategoriesColumn]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class ParallelAsyncBenchmarks_IAsyncEnumerable
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncTestBenchmarks.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/ParallelAsyncTestBenchmarks.cs
@@ -17,10 +17,13 @@ namespace CSRakowski.Parallel.Benchmarks
 {
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByMethod, BenchmarkLogicalGroupRule.ByParams)]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class ParallelAsyncTestBenchmarks
     {
         private const int NumberOfItemsInCollection = 10000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/UsingForEachForOrdered.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/UsingForEachForOrdered.cs
@@ -19,10 +19,13 @@ namespace CSRakowski.Parallel.Benchmarks
 {
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class UsingForEachForOrdered
     {
         private const int NumberOfItemsInCollection = 100000;

diff --git a/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/UsingForEachForUnbatched.cs b/tests/CSRakowski.Parallel.Benchmarks/Benchmarks/UsingForEachForUnbatched.cs
@@ -19,10 +19,13 @@ namespace CSRakowski.Parallel.Benchmarks
 {
     [MemoryDiagnoser]
     [GroupBenchmarksBy(BenchmarkLogicalGroupRule.ByCategory)]
-    [SimpleJob(RuntimeMoniker.Net48, baseline: true)]
+#if OS_WINDOWS
+    [SimpleJob(RuntimeMoniker.Net48, baseline: false)]
+#endif
     [SimpleJob(RuntimeMoniker.NetCoreApp31, baseline: false)]
     [SimpleJob(RuntimeMoniker.Net50, baseline: false)]
-    [SimpleJob(RuntimeMoniker.Net60, baseline: false)]
+    [SimpleJob(RuntimeMoniker.Net60, baseline: true)]
+    [SimpleJob(RuntimeMoniker.Net80, baseline: false)]
     public class UsingForEachForUnbatched
     {
         private const int NumberOfItemsInCollection = 1000000;