Move to .NET 3.0 and C# 8.0 (#4097)

Mpdreamz · Mpdreamz · commit 7e2a163559e0 · 2019-09-26T17:19:25.000+02:00
* initial move to .NET Core 3.0 * bump to .net sdk 3.0.100 and update our build files to install it for now while the images catch up * move scripts to 3.0 since we call dotnet run on them, exclude new types from codestandards test that all types live in Elasticsearch.Net/NEST namespace * build tooling moved from 2.2 to 3.0 * move all netcoreapp over to 3.0 * move to range on RegexCollection no longer accepts Last() * update our own dependencies * make 2.2 available for canary so that rewrite using 2.2 tools still works * fix yaml indentation * disable ingest-attachemnt for now, installl has stderr on 8.0.0 which abstractions does not yet handle * move rewriter and differ to local dotnet tools * no longer need to install 2.2 sdk for differ (cherry picked from commit 9bbffad)
diff --git a/NuGet.config b/NuGet.config
@@ -1,9 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<packageSources>
-		<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-		<add key="Elastic Abstractions CI" value="https://ci.appveyor.com/nuget/elasticsearch-net-abstractions" />
-		<add key="AssemblyRewriter" value="https://ci.appveyor.com/nuget/assemblyrewriter" />
-		<add key="AssemblyDiffer" value="https://ci.appveyor.com/nuget/assemblydiffer" />
-	</packageSources>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
 </configuration>
diff --git a/appveyor.yml b/appveyor.yml
@@ -5,6 +5,8 @@ test: off
 environment:
     DOTNET_CLI_TELEMETRY_OPTOUT: true
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+install:
+    - cmd: choco install dotnetcore-sdk --version 3.0.100
 build_script:
     - cmd: build.bat canary
 
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -3,6 +3,9 @@ jobs:
   pool:
     vmImage: 'ubuntu-16.04'
   steps:
+  - task: UseDotNet@2
+    inputs:
+        version: '3.0.100'
   - script: ./build.sh test-one
     displayName: 'build and unit test'
   - task: PublishTestResults@2
@@ -15,6 +18,9 @@ jobs:
   pool:
     vmImage: 'vs2017-win2016'
   steps:
+  - task: UseDotNet@2
+    inputs:
+      version: '3.0.100'
   - script: build.bat canary
     displayName: 'build and unit test'
   - task: PublishTestResults@2
@@ -39,6 +45,9 @@ jobs:
       latest7:
         esVersion: 'latest-7'
   steps:
+      - task: UseDotNet@2
+        inputs:
+            version: '3.0.100'
       - script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
         displayName: '$(esVersion) windows integration tests'
       - task: PublishTestResults@2
@@ -64,6 +73,9 @@ jobs:
         latest7:
           esVersion: 'latest-7'
   steps:
+      - task: UseDotNet@2
+        inputs:
+            version: '3.0.100'
       - script: './build.sh integrate-one $(esVersion) "readonly,writable"'
         displayName: '$(esVersion) linux integration tests'
       - task: PublishTestResults@2
diff --git a/build/scripts/Benchmarking.fs b/build/scripts/Benchmarking.fs
@@ -14,7 +14,7 @@ module Benchmarker =
         let password = match args.CommandArguments with | Benchmark b -> b.Password | _ -> None
         let runInteractive = not args.NonInteractive
         let credentials  = (username, password)
-        let runCommandPrefix = "run -f netcoreapp2.1 -c Release"
+        let runCommandPrefix = "run -f netcoreapp3.0 -c Release"
         let runCommand =
             match (runInteractive, url, credentials) with
             | (false, Some url, (Some username, Some password)) -> sprintf "%s -- --all \"%s\" \"%s\" \"%s\"" runCommandPrefix url username password
diff --git a/build/scripts/Differ.fs b/build/scripts/Differ.fs
@@ -6,6 +6,8 @@ open Commandline
 module Differ =
 
     let Run args =
+       Tooling.DotNet.Exec ["tool"; "restore"]
+        
        let differ = "assembly-differ"
        let args = args.RemainingArguments |> String.concat " "
        let command = sprintf @"%s %s -o ../../%s" differ args Paths.BuildOutput
diff --git a/build/scripts/Documentation.fs b/build/scripts/Documentation.fs
@@ -10,7 +10,7 @@ module Documentation =
 
     let Generate args = 
         let docGenerator = PrivateProject(DocGenerator)
-        let path = Paths.ProjectOutputFolder docGenerator DotNetFramework.NetCoreApp2_1
+        let path = Paths.ProjectOutputFolder docGenerator DotNetFramework.NetCoreApp3_0
         let generator = sprintf "%s.dll" docGenerator.Name
         
         let (|NotNullOrEmpty|_|) (candidate:string) =
diff --git a/build/scripts/Projects.fs b/build/scripts/Projects.fs
@@ -7,13 +7,13 @@ module Projects =
     type DotNetFramework = 
         | NetStandard2_0
         | Net461
-        | NetCoreApp2_1
+        | NetCoreApp3_0
         static member All = [NetStandard2_0; Net461]
-        static member AllTests = [NetCoreApp2_1; Net461] 
+        static member AllTests = [NetCoreApp3_0; Net461] 
         member this.Identifier = 
             match this with
             | NetStandard2_0 -> { MSBuild = "netstandard2.0"; Nuget = "netstandard2.0"; DefineConstants = ""; }
-            | NetCoreApp2_1 -> { MSBuild = "netcoreapp2.1"; Nuget = "netcoreapp2.1"; DefineConstants = ""; }
+            | NetCoreApp3_0 -> { MSBuild = "netcoreapp3.0"; Nuget = "netcoreapp3.0"; DefineConstants = ""; }
             | Net461 -> { MSBuild = "net461"; Nuget = "net461"; DefineConstants = ""; }
 
     type Project =
diff --git a/build/scripts/ReposTooling.fs b/build/scripts/ReposTooling.fs
@@ -11,7 +11,7 @@ module ReposTooling =
         let clusterName = Option.defaultValue "" <| match args.CommandArguments with | Cluster c -> Some c.Name | _ -> None
         let clusterVersion = Option.defaultValue "" <|match args.CommandArguments with | Cluster c -> c.Version | _ -> None
         
-        let testsProjectDirectory = Path.Combine(Path.GetFullPath(Paths.Output("Tests.ClusterLauncher")), "netcoreapp2.1")
+        let testsProjectDirectory = Path.Combine(Path.GetFullPath(Paths.Output("Tests.ClusterLauncher")), "netcoreapp3.0")
         let tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
         
         printfn "%s" testsProjectDirectory
diff --git a/build/scripts/ShadowDependencies.fs b/build/scripts/ShadowDependencies.fs
@@ -8,6 +8,9 @@ module ShadowDependencies =
     let private assemblyRewriter = "assembly-rewriter"
     let private keyFile = Paths.Keys "keypair.snk"
     let Rewrite majorVersion framework projects =
+        
+        Tooling.DotNet.Exec ["tool"; "restore"]
+        
         let project = projects |> Seq.head
         let folder = Paths.ProjectOutputFolder project framework
         
diff --git a/build/scripts/Testing.fs b/build/scripts/Testing.fs
@@ -40,7 +40,7 @@ module Tests =
             let p = ["test"; "."; "-c"; "RELEASE"]
             //make sure we only test netcoreapp on linux or requested on the command line to only test-one
             match (target, Environment.isLinux) with 
-            | (_, true) -> ["--framework"; "netcoreapp2.1"] |> List.append p
+            | (_, true) -> ["--framework"; "netcoreapp3.0"] |> List.append p
             | (Commandline.MultiTarget.One, _) ->
                 let random = new Random()
                 let fw = DotNetFramework.AllTests |> List.sortBy (fun _ -> random.Next()) |> List.head
diff --git a/build/scripts/Tooling.fs b/build/scripts/Tooling.fs
@@ -58,9 +58,9 @@ module Tooling =
         member this.ExecIn workingDirectory arguments = this.ExecInWithTimeout workingDirectory arguments timeout
         member this.Exec arguments = this.ExecWithTimeout arguments timeout
 
-    let nugetFile = Path.GetFullPath "build/scripts/bin/Release/netcoreapp2.2/NuGet.exe" 
+    let nugetFile = Path.GetFullPath "build/scripts/bin/Release/netcoreapp3.0/NuGet.exe" 
     let Nuget = BuildTooling(None, nugetFile)
-    let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp2.2/ILRepack.exe")
+    let ILRepack = BuildTooling(None, "build/scripts/bin/Release/netcoreapp3.0/ILRepack.exe")
     let DotNet = BuildTooling(Some <| TimeSpan.FromMinutes(5.), "dotnet")
 
     
diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <!-- Type Providers are restored using net461, fine for netcoreapp2.2 so we kill the warning -->
     <NoWarn>$(NoWarn);NU1701</NoWarn>
@@ -31,7 +31,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bullseye" Version="3.0.0-rc.1" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190806T115008" />
+    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190925T065816" />
     <PackageReference Include="Fake.Core.Environment" Version="5.15.0" />
     <PackageReference Include="Fake.Core.SemVer" Version="5.15.0" />
     <PackageReference Include="Fake.IO.FileSystem" Version="5.15.0" />
@@ -42,10 +42,6 @@
     <PackageReference Include="NuGet.CommandLine" Version="4.9.4" />
     <PackageReference Include="Octokit" Version="0.32.0" />
     <PackageReference Include="Proc" Version="0.6.1" />
-
-    <DotNetCliToolReference Include="dotnet-assembly-rewriter" Version="1.0.0-alpha20190401T093210" />
-    <DotNetCliToolReference Include="dotnet-assembly-differ" Version="1.0.0-alpha20190403T095656" />
-  
   </ItemGroup>
   <Target Name="CopyToolPackages" AfterTargets="Build">
     <Copy SourceFiles="$(PkgILRepack)\tools\ILRepack.exe" DestinationFolder="$(OutDir)" />
diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-assembly-rewriter": {
+      "version": "1.0.0-ci20190926102235",
+      "commands": [
+        "assembly-rewriter"
+      ]
+    },
+    "dotnet-assembly-differ": {
+      "version": "1.0.0-ci20190926135713",
+      "commands": [
+        "assembly-differ"
+      ]
+    }
+  }
+}
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "2.2.103"
+    "version": "3.0.100"
   },
   "version": "7.3.0"
 }
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,9 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+	<packageSources>
+		<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+		<add key="Elastic Abstractions CI" value="https://ci.appveyor.com/nuget/elasticsearch-net-abstractions" />
+		<add key="AssemblyRewriter" value="https://ci.appveyor.com/nuget/assemblyrewriter" />
+		<add key="AssemblyDiffer" value="https://ci.appveyor.com/nuget/assemblydiffer" />
+	</packageSources>
+</configuration>
diff --git a/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj b/src/CodeGeneration/ApiGenerator/ApiGenerator.csproj
@@ -3,12 +3,11 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <VersionPrefix>7.0.0</VersionPrefix>
     <VersionSuffix>alpha</VersionSuffix>
     <NoWarn>NU1701</NoWarn>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <LangVersion>Latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.1.0-beta3-final" />
diff --git a/src/CodeGeneration/ApiGenerator/Domain/Code/LowLevel/LowLevelClientMethod.cs b/src/CodeGeneration/ApiGenerator/Domain/Code/LowLevel/LowLevelClientMethod.cs
@@ -29,13 +29,14 @@ public string UrlInCode
 			{
 				string Evaluator(Match m)
 				{
-					var arg = m.Groups.Last().Value.ToCamelCase();
+
+					var arg = m.Groups[^1].Value.ToCamelCase();
 					return $"{{{arg}:{arg}}}";
 				}
 
 				var url = Path.TrimStart('/');
 				var options = Url.OriginalParts?.Select(p => p.Key) ?? Enumerable.Empty<string>();
-				
+
 				var pattern = string.Join("|", options);
 				var urlCode = $"\"{url}\"";
 				if (Path.Contains("{"))
diff --git a/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs b/src/CodeGeneration/DocGenerator/AsciiDoc/GeneratedAsciidocVisitor.cs
@@ -230,7 +230,7 @@ public override void VisitAttributeEntry(AttributeEntry attributeEntry)
 			string configuration = null;
 			if (Program.BuildOutputPath.Contains("src"))
 			{
-				//bin/Debug|Release/netcoreapp2.1
+				//bin/Debug|Release/netcoreapp3.0
 				configuration = new DirectoryInfo(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location)).Parent?.Name;
 				return;
 			}
diff --git a/src/CodeGeneration/DocGenerator/DocGenerator.csproj b/src/CodeGeneration/DocGenerator/DocGenerator.csproj
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <VersionSuffix>alpha</VersionSuffix>
     <!-- CAC001: We dont need to set ConfigureAwait(false) here -->
     <NoWarn>NU1701,NU1605,CAC001</NoWarn>
diff --git a/src/CodeGeneration/DocGenerator/Program.cs b/src/CodeGeneration/DocGenerator/Program.cs
@@ -35,8 +35,9 @@ string P(string path)
 			}
 
 			var globalJsonVersion = string.Join(".", Regex.Matches(File.ReadAllText(globalJson), "\"version\": \"(.*)\"")
-										 .Last().Groups
-										 .Last().Value
+										 .Last()
+										 .Groups[^1]
+										 .Value
 										 .Split(".")
 										 .Take(2));
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,5 +1,7 @@
 <Project>
 	<PropertyGroup>
-		<LangVersion>latest</LangVersion>
+		<LangVersion>8.0</LangVersion>
+    <!-- We'll work on a project by project approach to enable this -->
+<!--    <Nullable>enable</Nullable>-->
 	</PropertyGroup>
 </Project>
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.cs
@@ -77,7 +77,7 @@ protected internal TRequestParams RequestParams<TRequestParams>(TRequestParams r
 		{
 			if (contentType.IsNullOrEmpty()) return requestParams;
 
-			requestParams = requestParams ?? new TRequestParams();
+			requestParams ??= new TRequestParams();
 			if (requestParams.RequestConfiguration == null) requestParams.RequestConfiguration = new RequestConfiguration();
 			if (!contentType.IsNullOrEmpty() && requestParams.RequestConfiguration.ContentType.IsNullOrEmpty())
 				requestParams.RequestConfiguration.ContentType = contentType;
diff --git a/src/Library.build.props b/src/Library.build.props
@@ -16,8 +16,11 @@
 
     	<DefineConstants Condition="'$(TargetFramework)'=='net461'">$(DefineConstants);FULLFRAMEWORK</DefineConstants>
 		<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)'=='netstandard2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
 		<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
 		<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.1'">$(DefineConstants);DOTNETCORE</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.2'">$(DefineConstants);DOTNETCORE</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)'=='netcoreapp3.0'">$(DefineConstants);DOTNETCORE</DefineConstants>
 
 		<RepoUri>https://raw.githubusercontent.com/elastic/elasticsearch-net</RepoUri>
 		<Authors>Elasticsearch BV</Authors>
@@ -27,7 +30,6 @@
 		<ReleaseNotes>See https://github.com/elastic/elasticsearch-net/releases</ReleaseNotes>
 		<PackageIconUrl>https://raw.githubusercontent.com/elastic/elasticsearch-net/master/build/nuget-icon.png</PackageIconUrl>
     
-		<LangVersion>latest</LangVersion>
 	</PropertyGroup>
 	<ItemGroup>
         <PackageReference Condition="'$(OS)' != 'Windows_NT' and '$(TargetFramework)'=='net461'" Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0-preview.2" />
diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj
@@ -3,7 +3,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\PublishArtifacts.build.props" />
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Elasticsearch.Net\Elasticsearch.Net.csproj" />
diff --git a/src/PublishArtifacts.build.props b/src/PublishArtifacts.build.props
@@ -14,7 +14,6 @@
     <Prefer32Bit>false</Prefer32Bit>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>portable</DebugType>
-    <LangVersion>latest</LangVersion>
 
     <DoSourceLink></DoSourceLink>
     <SourceLink Condition="'$(DoSourceLink)'!=''">$(BaseIntermediateOutputPath)\sl-$(MsBuildProjectName)-$(TargetFramework).json</SourceLink>
diff --git a/src/Tests/Tests.Benchmarking/Tests.Benchmarking.csproj b/src/Tests/Tests.Benchmarking/Tests.Benchmarking.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;net472</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
-    <PackageReference Include="Elastic.BenchmarkDotNetExporter" Version="0.1.0-ci20190806T115008" />
+    <PackageReference Include="Elastic.BenchmarkDotNetExporter" Version="0.1.0-ci20190925T065816" />
     <PackageReference Include="LibGit2Sharp" Version="0.26.0-preview-0062" />
   </ItemGroup>
 </Project>
diff --git a/src/Tests/Tests.ClusterLauncher/Tests.ClusterLauncher.csproj b/src/Tests/Tests.ClusterLauncher/Tests.ClusterLauncher.csproj
@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Artifacts.build.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
diff --git a/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs b/src/Tests/Tests.Core/ManagedElasticsearch/Clusters/WritableCluster.cs
@@ -22,7 +22,7 @@ private static ClientTestClusterConfiguration CreateConfiguration()
 			var plugins = new List<ElasticsearchPlugin>
 			{
 				IngestGeoIp,
-				IngestAttachment,
+				//IngestAttachment, // latest ingest snapshot build has stderr out needs fixing in abstractions possibly
 				AnalysisKuromoji,
 				AnalysisIcu,
 				AnalysisPhonetic,
diff --git a/src/Tests/Tests.Core/Tests.Core.csproj b/src/Tests/Tests.Core/Tests.Core.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tests.Domain\Tests.Domain.csproj" />
-    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20190806T115008" />
+    <PackageReference Include="Elastic.Xunit" Version="0.1.0-ci20190925T065816" />
     <PackageReference Include="Proc" Version="0.6.1" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
diff --git a/src/Tests/Tests.Domain/Tests.Domain.csproj b/src/Tests/Tests.Domain/Tests.Domain.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Bogus" Version="22.1.2" />
-    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190806T115008" />
+    <PackageReference Include="Elastic.Managed" Version="0.1.0-ci20190925T065816" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <ProjectReference Include="..\Tests.Configuration\Tests.Configuration.csproj" />
   </ItemGroup>
diff --git a/src/Tests/Tests.Reproduce/Tests.Reproduce.csproj b/src/Tests/Tests.Reproduce/Tests.Reproduce.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.bat))\src\Library.build.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tests.Core\Tests.Core.csproj" />
diff --git a/src/Tests/Tests.ScratchPad/Tests.ScratchPad.csproj b/src/Tests/Tests.ScratchPad/Tests.ScratchPad.csproj
diff --git a/src/Tests/Tests/CodeStandards/NamingConventions.doc.cs b/src/Tests/Tests/CodeStandards/NamingConventions.doc.cs
diff --git a/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs b/src/Tests/Tests/Document/Single/Index/IndexIngestAttachmentApiTests.cs
diff --git a/src/Tests/Tests/Tests.csproj b/src/Tests/Tests/Tests.csproj
