.NET Core 2.1 -> .NET 5.0 (#1637)

* use httpS

* update project files to net5.0

* don't use CLASSIC and CORE #if defines

* enable ThreadingDiagnoserTests tests that were disabled so far (APIs not available prior to .NET Core 3)

* update samples

* update remaining tests

* get warnings to 0

* update build scripts

* fix MultipleRuntimesTest (.NET Core is not called Core anymore ;) )

* disable ThreadingDiagnoserTests for the InProcessToolchain

* disable the failing CoreRT tests

* disable some MemoryDiagnoser tests due to #1542

Author: adamsitnik

azure-pipelines.Ubuntu.yml

@@ -15,8 +15,8 @@ jobs:
     scriptFileName: ./build.sh
     initialization:
       - bash: |
-          echo "deb http://llvm.org/apt/xenial/ llvm-toolchain-xenial-3.9 main" | sudo tee /etc/apt/sources.list.d/llvm.list
-          wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+          echo "deb https://llvm.org/apt/xenial/ llvm-toolchain-xenial-3.9 main" | sudo tee /etc/apt/sources.list.d/llvm.list
+          wget -O - https://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
           sudo apt-get update
       - bash: |
           sudo apt-get install cmake clang-3.9 libicu55 uuid-dev libcurl4-openssl-dev zlib1g-dev libkrb5-dev

build.cake

@@ -121,9 +121,9 @@ Task("FastTests")
     .Does(() =>
     {
 		string[] targetVersions = IsRunningOnWindows() ?
-                new []{"net461", "netcoreapp2.1"}
+                new []{"net461", "net5.0"}
                 :
-                new []{"netcoreapp2.1"};
+                new []{"net5.0"};
 
         foreach(var version in targetVersions)
         {
@@ -144,7 +144,7 @@ Task("SlowTestsNetCore2")
 	.WithCriteria(!skipTests)
 	.Does(() =>
 	{
-		DotNetCoreTest(integrationTestsProjectPath, GetTestSettingsParameters("netcoreapp2.1"));
+		DotNetCoreTest(integrationTestsProjectPath, GetTestSettingsParameters("net5.0"));
 	});          
 
 Task("Pack")

build.ps1

@@ -32,7 +32,7 @@ Param(
 )
 
 $CakeVersion = "0.37.0"
-$DotNetVersion = "2.1.503";
+$DotNetVersion = "5.0.101";
 $DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 $NugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 

build.sh

@@ -47,7 +47,7 @@ if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then
   mkdir "$SCRIPT_DIR/.dotnet"
 fi
 curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
-bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 2.1.503 --install-dir .dotnet --no-path
+bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version 5.0.101 --install-dir .dotnet --no-path
 export PATH="$SCRIPT_DIR/.dotnet":$PATH
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 export DOTNET_CLI_TELEMETRY_OPTOUT=1

build/common.props

@@ -20,13 +20,6 @@
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingStyle.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(IsVisualBasic)' != 'true' And $(TargetFramework.StartsWith('net4')) ">
-    <DefineConstants>$(DefineConstants);CLASSIC</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(IsVisualBasic)' != 'true' And ('$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'netcoreapp2.1') ">
-    <DefineConstants>$(DefineConstants);CORE</DefineConstants>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)strongNameKey.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

docs/_changelog/ChangeLogBuilder/ChangeLogBuilder.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
   </PropertyGroup>
   <ItemGroup>

samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;net5.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

samples/BenchmarkDotNet.Samples.FSharp/Program.fs

@@ -34,7 +34,7 @@ type StringKeyComparison () =
     [<Benchmark>]
     member self.OrdinalLookup () = lookup arr dict2
 
-#if !NETCOREAPP2_1
+#if NETFRAMEWORK
 [<BenchmarkDotNet.Diagnostics.Windows.Configs.TailCallDiagnoser>]
 #endif
 type TailCallDetector () =

samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\..\build\common.props" />
   <PropertyGroup>
     <AssemblyTitle>BenchmarkDotNet.Samples</AssemblyTitle>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;net5.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <AssemblyName>BenchmarkDotNet.Samples</AssemblyName>
     <OutputType>Exe</OutputType>

samples/BenchmarkDotNet.Samples/IntroDisassemblyAllJits.cs

@@ -21,11 +21,8 @@ public MultipleJits()
 
                 AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(ClrRuntime.Net461));
 
-                // RyuJit for .NET Core 2.0
-                AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(CoreRuntime.Core20));
-
-                // RyuJit for .NET Core 2.1
-                AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(CoreRuntime.Core21));
+                // RyuJit for .NET Core 5.0
+                AddJob(Job.ShortRun.WithJit(Jit.RyuJit).WithPlatform(Platform.X64).WithRuntime(CoreRuntime.Core50));
 
                 AddDiagnoser(new DisassemblyDiagnoser(new DisassemblyDiagnoserConfig(maxDepth: 3, exportDiff: true)));
             }