Stop Dual-Targetting to avoid Flakiness

iwillspeak · Nov 11, 2021 · 18f0411 · 18f0411
1 parent 0ba4be2
commit 18f0411
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/examples/HelloWorld/HelloWorld.scmproj b/examples/HelloWorld/HelloWorld.scmproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <PackAsTool>True</PackAsTool>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Default compile items. We don't to just glob default compile items because ordering matters. -->

diff --git a/src/Feersum.Core/Feersum.Core.scmproj b/src/Feersum.Core/Feersum.Core.scmproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <UpdateAssemblyInfo>false</UpdateAssemblyInfo>
     <GenerateGitVersionInformation>false</GenerateGitVersionInformation>
   </PropertyGroup>

diff --git a/src/Serehfa/Equivalence.cs b/src/Serehfa/Equivalence.cs
@@ -96,11 +96,7 @@ public override int GetHashCode(object o)
                 return o switch
                 {
                     ConsPair p =>
-#if NETSTANDARD2_0
                      (p.Car, p.Cdr).GetHashCode(),
-#else
-                     HashCode.Combine(p.Car, p.Cdr),
-#endif
                     object[] v => ArrayHash(v),
                     bool[] bv => ArrayHash(bv),
                     _ => EqualityComparer<object>.Default.GetHashCode(o),

diff --git a/src/Serehfa/Serehfa.csproj b/src/Serehfa/Serehfa.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net5.0</TargetFrameworks>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>Latest</LangVersion>
     <Title>The Feersum Scheme core types library</Title>
     <Description>