Revert "[Infra] Update to net50"

reegeek · reegeek · commit 68475e9a126e · 2020-11-13T16:12:49.000+01:00
This reverts commit f532dc3.
diff --git a/Build/Common.Benchmark.props b/Build/Common.Benchmark.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="Framework">
-    <DefaultTargetFrameworks>net50;net48</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks>netcoreapp3.1;net48</DefaultTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.0" />
   </ItemGroup>
 
   <Import Project="$(RootDir)\Build\DeleteGenerateBindingRedirects.target"/>
diff --git a/Build/Common.Tests.props b/Build/Common.Tests.props
@@ -1,19 +1,19 @@
 <Project>
   <PropertyGroup Label="Framework">
-    <DefaultTargetFrameworks>net50;net48</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks>netcoreapp3.1;net48</DefaultTargetFrameworks>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="FluentAssertions" Version="5.6.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
   <Import Project="$(RootDir)\Build\DeleteGenerateBindingRedirects.target"/>
 
-</Project>
+</Project>
diff --git a/Build/Common.props b/Build/Common.props
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <PropertyGroup Label="Common properties">
-    <LangVersion>Latest</LangVersion>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
 
diff --git a/Build/Nuke/NukeBuild.csproj b/Build/Nuke/NukeBuild.csproj
@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net50</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\..</NukeRootDirectory>
     <NukeScriptDirectory>..\..</NukeScriptDirectory>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Nuke.Common" Version="5.0.0" />
+    <PackageReference Include="Nuke.Common" Version="0.25.0" />
     <PackageDownload Include="GitVersion.Tool" Version="[5.1.1]" />
   </ItemGroup>
 
diff --git a/src/StructLinq.BCL.Tests/StructLinq.BCL.Tests.csproj b/src/StructLinq.BCL.Tests/StructLinq.BCL.Tests.csproj
@@ -1,8 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;net462;net472;net48;netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1;net50</TargetFrameworks>
-	<NoWarn>NETSDK1138;CS1701;NU1701</NoWarn>
+    <TargetFrameworks>net452;net462;net472;net48;netcoreapp1.0;netcoreapp1.1;netcoreapp2.0;netcoreapp2.1;netcoreapp2.2;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/StructLinq.BCL/Dictionary/DictionaryEnumerator.cs b/src/StructLinq.BCL/Dictionary/DictionaryEnumerator.cs
@@ -25,7 +25,7 @@ public bool MoveNext()
             while (++index <= length)
             {
                 ref var entry = ref entries[index];
-#if (NETCOREAPP3_0 || NET5_0)
+#if (NETCOREAPP3_0 )
                 if (entry.Next >= -1)
 #endif
 #if (NET452 || NETCOREAPP1_0 || NETCOREAPP2_0)
diff --git a/src/StructLinq.BCL/Dictionary/DictionaryLayout.cs b/src/StructLinq.BCL/Dictionary/DictionaryLayout.cs
@@ -15,7 +15,7 @@ internal struct Entry<TKey, TValue>
         internal TValue Value;         // Value of entry
     }
 #endif
-#if (NETCOREAPP3_0)
+#if (NETCOREAPP3_0 )
     
     internal struct Entry<TKey, TValue>
     {
@@ -25,14 +25,4 @@ internal struct Entry<TKey, TValue>
         internal TValue Value;         // Value of entry
     }
 #endif
-#if (NET5_0)
-    
-    internal struct Entry<TKey, TValue>
-    {
-        public uint HashCode;
-        public int Next;
-        internal TKey Key;           // Key of entry
-        internal TValue Value;         // Value of entry
-    }
-#endif
 }
diff --git a/src/StructLinq.BCL/List/ListLayout.cs b/src/StructLinq.BCL/List/ListLayout.cs
@@ -14,7 +14,7 @@ internal class ListLayout<T>
     }
 #endif
 
-#if (NETCOREAPP3_0 || NET5_0)
+#if (NETCOREAPP3_0)
     
     internal class ListLayout<T>
     {
diff --git a/src/StructLinq.BCL/StructLinq.BCL.csproj b/src/StructLinq.BCL/StructLinq.BCL.csproj
@@ -1,8 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0;net50</TargetFrameworks>
-	<NoWarn>NETSDK1138;CS1701</NoWarn>
+    <TargetFrameworks>net452;netcoreapp1.0;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Nuget">
diff --git a/src/StructLinq.Benchmark/Aggregate.cs b/src/StructLinq.Benchmark/Aggregate.cs
@@ -5,7 +5,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Aggregate
     {
         private readonly RangeEnumerable _rangeEnumerable;
diff --git a/src/StructLinq.Benchmark/Contains.cs b/src/StructLinq.Benchmark/Contains.cs
@@ -4,7 +4,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [DisassemblyDiagnoser( 4),MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4),MemoryDiagnoser]
     public class Contains
     {
         private const int Count = 10_000;
diff --git a/src/StructLinq.Benchmark/ContainsWhere.cs b/src/StructLinq.Benchmark/ContainsWhere.cs
@@ -4,7 +4,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [DisassemblyDiagnoser( 4),MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4),MemoryDiagnoser]
     public class ContainsWhere
     {
         private const int Count = 10_000;
diff --git a/src/StructLinq.Benchmark/Dictionary.cs b/src/StructLinq.Benchmark/Dictionary.cs
@@ -5,7 +5,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     [SimpleJob(RuntimeMoniker.Net48, baseline:true)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
     public class Dictionary
diff --git a/src/StructLinq.Benchmark/EnumeratorsComparison.cs b/src/StructLinq.Benchmark/EnumeratorsComparison.cs
@@ -6,7 +6,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     [SimpleJob(RuntimeMoniker.Net48)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
     public class EnumeratorsComparison
diff --git a/src/StructLinq.Benchmark/EnumeratorsOfClassComparison.cs b/src/StructLinq.Benchmark/EnumeratorsOfClassComparison.cs
@@ -5,7 +5,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     [SimpleJob(RuntimeMoniker.Net48)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
     public class EnumeratorsOfClassComparison
diff --git a/src/StructLinq.Benchmark/ForEachDuckTyping.cs b/src/StructLinq.Benchmark/ForEachDuckTyping.cs
@@ -5,7 +5,7 @@
 namespace StructLinq.Benchmark
 {
     
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     public class ForEachDuckTyping
     {
         private const int Count = 10_000;
diff --git a/src/StructLinq.Benchmark/ImpactOfUsingOnForEach.cs b/src/StructLinq.Benchmark/ImpactOfUsingOnForEach.cs
@@ -11,7 +11,7 @@ namespace StructLinq.Benchmark
     
     [SimpleJob(RuntimeMoniker.Net48)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
-    [DisassemblyDiagnoser( 4)]
+    [DisassemblyDiagnoser(recursiveDepth: 4)]
     public class ImpactOfUsingOnForEach
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/Max.cs b/src/StructLinq.Benchmark/Max.cs
@@ -3,7 +3,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Max
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/Min.cs b/src/StructLinq.Benchmark/Min.cs
@@ -4,7 +4,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Min
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/OrderByArrayOfInt.cs b/src/StructLinq.Benchmark/OrderByArrayOfInt.cs
@@ -6,7 +6,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class OrderByArrayOfInt
     {
         private const int Count = 10_000;
diff --git a/src/StructLinq.Benchmark/Select.cs b/src/StructLinq.Benchmark/Select.cs
@@ -4,7 +4,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Select
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/SkipOnArray.cs b/src/StructLinq.Benchmark/SkipOnArray.cs
@@ -3,7 +3,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class SkipOnArray
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/Sum.cs b/src/StructLinq.Benchmark/Sum.cs
@@ -4,7 +4,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Sum
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/TakeOnArray.cs b/src/StructLinq.Benchmark/TakeOnArray.cs
@@ -4,7 +4,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class TakeOnArray
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/ToArrayComparison.cs b/src/StructLinq.Benchmark/ToArrayComparison.cs
@@ -9,7 +9,7 @@
 namespace StructLinq.Benchmark
 {
    
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     [SimpleJob(RuntimeMoniker.Net48)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
     public class ToArrayComparison
diff --git a/src/StructLinq.Benchmark/ToArrayOnArraySelect.cs b/src/StructLinq.Benchmark/ToArrayOnArraySelect.cs
@@ -3,7 +3,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     public class ToArrayOnArraySelect
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/ToArrayOnArraySelectOfClass.cs b/src/StructLinq.Benchmark/ToArrayOnArraySelectOfClass.cs
@@ -3,7 +3,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     public class ToArrayOnArraySelectOfClass
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Benchmark/ToListComparison.cs b/src/StructLinq.Benchmark/ToListComparison.cs
@@ -10,7 +10,7 @@
 namespace StructLinq.Benchmark
 {
 
-    [DisassemblyDiagnoser( 4), MemoryDiagnoser]
+    [DisassemblyDiagnoser(recursiveDepth: 4), MemoryDiagnoser]
     [SimpleJob(RuntimeMoniker.Net48)]
     [SimpleJob(RuntimeMoniker.NetCoreApp31)]
     public class ToListComparison
diff --git a/src/StructLinq.Benchmark/Where.cs b/src/StructLinq.Benchmark/Where.cs
@@ -3,7 +3,7 @@
 
 namespace StructLinq.Benchmark
 {
-    [MemoryDiagnoser, DisassemblyDiagnoser( 4)]
+    [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]
     public class Where
     {
         private const int Count = 10000;
diff --git a/src/StructLinq.Tests/SumTests.cs b/src/StructLinq.Tests/SumTests.cs
@@ -1,4 +1,5 @@
 ﻿using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
 using Xunit;
 
 namespace StructLinq.Tests

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public bool MoveNext()`
`25`	`25`	`while (++index <= length)`
`26`	`26`	`{`
`27`	`27`	`ref var entry = ref entries[index];`
`28`		`-#if (NETCOREAPP3_0 \|\| NET5_0)`
	`28`	`+#if (NETCOREAPP3_0 )`
`29`	`29`	`if (entry.Next >= -1)`
`30`	`30`	`#endif`
`31`	`31`	`#if (NET452 \|\| NETCOREAPP1_0 \|\| NETCOREAPP2_0)`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ internal struct Entry<TKey, TValue>`
`15`	`15`	`internal TValue Value; // Value of entry`
`16`	`16`	`}`
`17`	`17`	`#endif`
`18`		`-#if (NETCOREAPP3_0)`
	`18`	`+#if (NETCOREAPP3_0 )`
`19`	`19`
`20`	`20`	`internal struct Entry<TKey, TValue>`
`21`	`21`	`{`
`@@ -25,14 +25,4 @@ internal struct Entry<TKey, TValue>`
`25`	`25`	`internal TValue Value; // Value of entry`
`26`	`26`	`}`
`27`	`27`	`#endif`
`28`		`-#if (NET5_0)`
`29`		`-`
`30`		`- internal struct Entry<TKey, TValue>`
`31`		`- {`
`32`		`- public uint HashCode;`
`33`		`- public int Next;`
`34`		`- internal TKey Key; // Key of entry`
`35`		`- internal TValue Value; // Value of entry`
`36`		`- }`
`37`		`-#endif`
`38`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ internal class ListLayout<T>`
`14`	`14`	`}`
`15`	`15`	`#endif`
`16`	`16`
`17`		`-#if (NETCOREAPP3_0 \|\| NET5_0)`
	`17`	`+#if (NETCOREAPP3_0)`
`18`	`18`
`19`	`19`	`internal class ListLayout<T>`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace StructLinq.Benchmark`
`7`	`7`	`{`
`8`		`- [MemoryDiagnoser, DisassemblyDiagnoser( 4)]`
	`8`	`+ [MemoryDiagnoser, DisassemblyDiagnoser(recursiveDepth: 4)]`
`9`	`9`	`public class Aggregate`
`10`	`10`	`{`
`11`	`11`	`private readonly RangeEnumerable _rangeEnumerable;`