Move to netcoreapp2.1

After working with the CoreClr team it turns out part of our CoreClr
flakiness on Linux is due to bugs fixed in netcoreapp2.1. Given that and
that our consumers are all on netcoreapp2.1 already I'm moving us to
2.1.

build/Targets/Imports.targets

@@ -15,7 +15,7 @@
 
     <!-- Only generate our runtimeconfig.json files for net core apps. It's unnecessary in desktop projects
          but gets included in lots of output items like VSIX. -->
-    <GenerateRuntimeConfigurationFiles Condition="'$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.0'">false</GenerateRuntimeConfigurationFiles>
+    <GenerateRuntimeConfigurationFiles Condition="'$(TargetFramework)' != 'netcoreapp1.1' AND '$(TargetFramework)' != 'netcoreapp2.1'">false</GenerateRuntimeConfigurationFiles>
 
     <!-- Place VS insertion (CoreXT) packages to a separate directory -->
     <PackageOutputPath Condition="'$(IsVisualStudioInsertionPackage)' == 'true'">$(ArtifactsConfigurationDir)DevDivPackages\Roslyn\</PackageOutputPath>

build/Targets/Packages.props

@@ -74,7 +74,7 @@
     <MicrosoftNETCoreCompilersVersion>2.9.0-beta7-63018-03</MicrosoftNETCoreCompilersVersion>
     <MicrosoftNETCoreVersion>5.0.0</MicrosoftNETCoreVersion>
     <MicrosoftNETCoreAppVersion>2.0.0</MicrosoftNETCoreAppVersion>
-    <MicrosoftNETCorePlatformsVersion>2.0.0</MicrosoftNETCorePlatformsVersion>
+    <MicrosoftNETCorePlatformsVersion>2.1.0</MicrosoftNETCorePlatformsVersion>
     <MicrosoftNETCorePortableCompatibilityVersion>1.0.1</MicrosoftNETCorePortableCompatibilityVersion>
     <MicrosoftNETCoreRuntimeCoreCLRVersion>2.0.0</MicrosoftNETCoreRuntimeCoreCLRVersion>
     <MicrosoftNETCoreTestHostVersion>1.1.0</MicrosoftNETCoreTestHostVersion>

build/Targets/Settings.props

@@ -27,7 +27,7 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir>
 
-    <RoslynPortableTargetFrameworks>net46;netcoreapp2.0</RoslynPortableTargetFrameworks>
+    <RoslynPortableTargetFrameworks>net46;netcoreapp2.1</RoslynPortableTargetFrameworks>
     <RoslynPortableRuntimeIdentifiers>win;win-x64;linux-x64;osx-x64</RoslynPortableRuntimeIdentifiers>
     <RoslynDesktopRuntimeIdentifier>win</RoslynDesktopRuntimeIdentifier>
     <RoslynDesktopRuntimeIdentifierX86>win-x86</RoslynDesktopRuntimeIdentifierX86>

build/Targets/Tools.props

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <dotnetRuntimeVersion>2.0.7</dotnetRuntimeVersion>
+    <dotnetRuntimeVersion>2.1.3</dotnetRuntimeVersion>
 
     <!--
         When changing this value ensure that you do not exceed the LKG used by source build. This is necessary

build/ToolsetPackages/RoslynToolset.csproj

@@ -2,7 +2,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Net.Sdk" Version="$(MicrosoftNetSdkVersion)" ExcludeAssets="all" />
@@ -36,7 +36,7 @@
     <PackageReference Include="xunit.runner.wpf" Version="$(xunitrunnerwpfVersion)" ExcludeAssets="all" />
     <PackageReference Include="vswhere" Version="$(vswhereVersion)" ExcludeAssets="all" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.NETCore.Compilers" Version="$(MicrosoftNETCoreCompilersVersion)" ExcludeAssets="all" />
   </ItemGroup>
 </Project>

build/scripts/build.ps1

@@ -344,10 +344,11 @@ function Test-XUnitCoreClr() {
     Exec-Console $dotnet "publish src\Tools\ILAsm --no-restore --runtime win-x64 --self-contained -o $ilasmDir"
 
     $unitDir = Join-Path $configDir "UnitTests"
-    $tf = "netcoreapp2.0"
+    $tf = "netcoreapp2.1"
     $xunitResultDir = Join-Path $unitDir "xUnitResults"
     Create-Directory $xunitResultDir
-    $xunitConsole = Join-Path (Get-PackageDir "xunit.runner.console") "tools\$tf\xunit.console.dll"
+    $xunitConsole = Join-Path (Get-PackageDir "xunit.runner.console") "tools\netcoreapp2.0\xunit.console.dll"
+    $runtimeVersion = Get-ToolVersion "dotnetRuntime"
 
     $dlls = @()
     $allGood = $true
@@ -358,6 +359,7 @@ function Test-XUnitCoreClr() {
             $dllPath = Join-Path $testDir $dllName
 
             $args = "exec"
+            $args += " --fx-version $runtimeVersion"
             $args += " --depsfile " + [IO.Path]::ChangeExtension($dllPath, ".deps.json")
             $args += " --runtimeconfig " + [IO.Path]::ChangeExtension($dllPath, ".runtimeconfig.json")
             $args += " $xunitConsole"

build/scripts/tests.sh

@@ -17,10 +17,11 @@ unittest_dir="${binaries_path}"/"${build_configuration}"/UnitTests
 log_dir="${binaries_path}"/"${build_configuration}"/xUnitResults
 nuget_dir="${HOME}"/.nuget/packages
 xunit_console_version="$(get_package_version xunitrunnerconsole)"
+dotnet_runtime_version="$(get_tool_version dotnetRuntime)"
 
 if [[ "${runtime}" == "dotnet" ]]; then
-    target_framework=netcoreapp2.0
-    file_list=( "${unittest_dir}"/*/netcoreapp2.0/*.UnitTests.dll )
+    target_framework=netcoreapp2.1
+    file_list=( "${unittest_dir}"/*/netcoreapp2.1/*.UnitTests.dll )
     xunit_console="${nuget_dir}"/xunit.runner.console/"${xunit_console_version}"/tools/${target_framework}/xunit.console.dll
 elif [[ "${runtime}" == "mono" ]]; then
     file_list=(
@@ -68,15 +69,14 @@ do
 
     echo Running "${runtime} ${file_name[@]}"
     if [[ "${runtime}" == "dotnet" ]]; then
-        runner="dotnet exec --depsfile ${deps_json} --runtimeconfig ${runtimeconfig_json}"
-
         # Disable the VB Semantic tests while we investigate the core dump issue
         # https://github.com/dotnet/roslyn/issues/29660
         if [[ "${file_name[@]}" == *'Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.dll' ]] 
         then
             echo "Skipping ${file_name[@]}"
             continue
         fi
+        runner="dotnet exec --fx-version ${dotnet_runtime_version} --depsfile ${deps_json} --runtimeconfig ${runtimeconfig_json}"
     elif [[ "${runtime}" == "mono" ]]; then
         runner=mono
     fi

src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#if !NETCOREAPP2_0
+#if !NETCOREAPP2_1
 using System;
 using System.Collections.Immutable;
 using System.IO;

src/Compilers/CSharp/csc/csc.csproj

@@ -23,7 +23,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
   <ItemGroup>
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
-    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
+    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)"/>
   </ItemGroup>
   <ItemGroup>

src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj

@@ -77,8 +77,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Build" Version="$(MicrosoftBuildFixedVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreFixedVersion)" />
-    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
-    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
+    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
+    <PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.Build.Tasks.CodeAnalysis.UnitTests" />

src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj

@@ -23,8 +23,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
   <ItemGroup>
-    <Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netcoreapp2.0'" />
-    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
+    <Reference Include="System.Configuration" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
+    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)"/>
   </ItemGroup>
   <ItemGroup>

src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs

@@ -101,7 +101,7 @@ private static void CheckForBadShared(List<string> arguments)
 
         private static void ReferenceNetstandardDllIfCoreClr(TempDirectory currentDirectory, List<string> arguments)
         {
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
             var filePath = Path.Combine(currentDirectory.Path, "netstandard.dll");
             File.WriteAllBytes(filePath, TestResources.NetFX.netstandard20.netstandard);
             arguments.Add("/nostdlib");

src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj

@@ -29,8 +29,8 @@
     <ProjectReference Include="..\..\CSharp\Portable\Microsoft.CodeAnalysis.CSharp.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System" Condition="'$(TargetFramework)' != 'netcoreapp2.0'" />
-    <Reference Include="System.Xml" Condition="'$(TargetFramework)' != 'netcoreapp2.0'" />
+    <Reference Include="System" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
+    <Reference Include="System.Xml" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
     <PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>

src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
-#if NETCOREAPP1_1 || NETCOREAPP2_0
+#if NETCOREAPP1_1 || NETCOREAPP2_1
 
 using System.Diagnostics;
 using System.Reflection;

src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb

@@ -1,5 +1,5 @@
 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
-#If NET46
+#If NOT NETCOREAPP2_1
 
 Imports System.Collections.Immutable
 Imports System.IO

src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb

@@ -583,7 +583,7 @@ BC30424: Constants must be of an intrinsic or enumerated type, not a class, stru
 </expected>)
         End Sub
 
-#If NET46 Then
+#If NOT NETCOREAPP2_1 Then
         <Fact>
         Public Sub ChrChrWAscAscWAreConst()
             Dim source =

src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj

@@ -13,7 +13,7 @@
 
          https://github.com/dotnet/sdk/pull/2117 -->
     <DefineConstants Condition="'$(TargetFramework)' == 'net46'">$(FinalDefineConstants),NET46=-1</DefineConstants>
-    <DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp2.0'">$(FinalDefineConstants),NETCOREAPP2_0=-1</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netcoreapp2.1'">$(FinalDefineConstants),NETCOREAPP2_1=-1</DefineConstants>
   </PropertyGroup>
   <ItemGroup Label="Project References">
     <ProjectReference Include="..\..\..\..\Test\PdbUtilities\Roslyn.Test.PdbUtilities.csproj" />

src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj

@@ -21,7 +21,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" Condition="$(TargetFramework) == 'netcoreapp2.0'" />
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" Condition="$(TargetFramework) == 'netcoreapp2.1'" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="My Project\" />

src/Compilers/VisualBasic/vbc/vbc.csproj

@@ -22,7 +22,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
   <ItemGroup>
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)" Condition="'$(DotNetBuildFromSource)' != 'true'" />
-    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
+    <PackageReference Include="System.IO.Pipes.AccessControl" Version="$(SystemIOPipesAccessControlVersion)" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <PackageReference Include="Microsoft.DiaSymReader.Native" Version="$(MicrosoftDiaSymReaderNativeVersion)"/>
   </ItemGroup>
   <ItemGroup>

src/Interactive/csi/csi.csproj

@@ -24,11 +24,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="csi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <None Include="csi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
       <Link>csi.rsp</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="csi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.0'">
+    <None Include="csi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
       <Link>csi.rsp</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/Interactive/vbi/vbi.vbproj

@@ -25,11 +25,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="vbi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <None Include="vbi.coreclr.rsp" Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
       <Link>vbi.rsp</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="vbi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.0'">
+    <None Include="vbi.desktop.rsp" Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
       <Link>vbi.rsp</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj

@@ -1,7 +1,7 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RoslynProjectType>Custom</RoslynProjectType>
 
     <IsPackable>true</IsPackable>
@@ -38,10 +38,10 @@
       <_File Include="$(MSBuildProjectDirectory)\build\**" TargetDir="build" />
       <_File Include="$(MSBuildProjectDirectory)\tools\bincore\*.cmd" TargetDir="tools\bincore" />
 
-      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\*.targets" TargetDir="tools" />
-      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" />
-      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" />
-      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.0\publish\runtimes\**\*.*" TargetDir="tools\runtimes" />
+      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\*.targets" TargetDir="tools" />
+      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\Microsoft.Build.Tasks.CodeAnalysis.dll" TargetDir="tools" />
+      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\**\Microsoft.Build.Tasks.CodeAnalysis.resources.dll" TargetDir="tools" />
+      <_File Include="$(_Dlls)Microsoft.Build.Tasks.CodeAnalysis\netcoreapp2.1\publish\runtimes\**\*.*" TargetDir="tools\runtimes" />
 
       <_File Include="$(_Dlls)Microsoft.CodeAnalysis\Microsoft.CodeAnalysis.dll" TargetDir="tools\bincore" />
       <_File Include="$(_Dlls)Microsoft.CodeAnalysis\**\Microsoft.CodeAnalysis.resources.dll" TargetDir="tools\bincore" />
@@ -52,23 +52,23 @@
       <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\Microsoft.CodeAnalysis.VisualBasic.dll" TargetDir="tools\bincore" />
       <_File Include="$(_Dlls)Microsoft.CodeAnalysis.VisualBasic\**\Microsoft.CodeAnalysis.VisualBasic.resources.dll" TargetDir="tools\bincore" />
 
-      <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.dll" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)csc\netcoreapp2.0\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.dll" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.deps.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)csc\netcoreapp2.1\publish\csc.runtimeconfig.json" TargetDir="tools\bincore" />
 
-      <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.dll" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)vbc\netcoreapp2.0\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.dll" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.deps.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)vbc\netcoreapp2.1\publish\vbc.runtimeconfig.json" TargetDir="tools\bincore" />
 
-      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.dll" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.0\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.dll" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.deps.json" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)VBCSCompiler\netcoreapp2.1\publish\VBCSCompiler.runtimeconfig.json" TargetDir="tools\bincore" />
 
       <!-- References that are either not in the target framework or are a higher version -->
       <!-- N.B.: The backslashes below cannot be replaced with forward slashes.
          https://github.com/NuGet/Home/issues/3584 -->
-      <_File Include="$(_Exes)csc\netcoreapp2.0\publish\System.*.dll" TargetDir="tools\bincore" />
-      <_File Include="$(_Exes)csc\netcoreapp2.0\publish\runtimes\**" TargetDir="tools\bincore\runtimes" />
+      <_File Include="$(_Exes)csc\netcoreapp2.1\publish\System.*.dll" TargetDir="tools\bincore" />
+      <_File Include="$(_Exes)csc\netcoreapp2.1\publish\runtimes\**" TargetDir="tools\bincore\runtimes" />
 
       <TfmSpecificPackageFile Include="@(_File)" PackagePath="%(_File.TargetDir)\%(_File.RecursiveDir)%(_File.FileName)%(_File.Extension)"/>