diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 9c4b38bd47c1a..5ab8a5ff46793 100644
--- a/build/Targets/Imports.targets
+++ b/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>
diff --git a/build/Targets/Packages.props b/build/Targets/Packages.props
index 53cabf992a629..d840a3b6e5d83 100644
--- a/build/Targets/Packages.props
+++ b/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>
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index ab9881379ff1c..f3c44d9bf97c2 100644
--- a/build/Targets/Settings.props
+++ b/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>
diff --git a/build/Targets/Tools.props b/build/Targets/Tools.props
index 3060a30a11966..745e2b3b901e9 100644
--- a/build/Targets/Tools.props
+++ b/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
diff --git a/build/ToolsetPackages/RoslynToolset.csproj b/build/ToolsetPackages/RoslynToolset.csproj
index a5ee6d650c826..7cb4897297bd2 100644
--- a/build/ToolsetPackages/RoslynToolset.csproj
+++ b/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>
diff --git a/build/scripts/build.ps1 b/build/scripts/build.ps1
index f891b3975c37f..f917bf039df80 100644
--- a/build/scripts/build.ps1
+++ b/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"
diff --git a/build/scripts/tests.sh b/build/scripts/tests.sh
index 6f101c3f0208f..5988ef0dce9b0 100755
--- a/build/scripts/tests.sh
+++ b/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,8 +69,6 @@ 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' ]] 
@@ -77,6 +76,7 @@ do
             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
diff --git a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs b/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs
index e5cfae55aed38..4c96ca3278e3c 100644
--- a/src/Compilers/CSharp/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.cs
+++ b/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;
diff --git a/src/Compilers/CSharp/csc/csc.csproj b/src/Compilers/CSharp/csc/csc.csproj
index 1a6e8f209e451..81163b5895619 100644
--- a/src/Compilers/CSharp/csc/csc.csproj
+++ b/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>
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj b/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
index be5e8f83d6de2..87561dae688b0 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.Build.Tasks.CodeAnalysis.csproj
+++ b/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" />
diff --git a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj b/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
index 7bf11229fc40d..70a647b44b942 100644
--- a/src/Compilers/Server/VBCSCompiler/VBCSCompiler.csproj
+++ b/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>
diff --git a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs b/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
index c47beab41c62e..984d6fbc2c47c 100644
--- a/src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs
+++ b/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");
diff --git a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj b/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj
index 6c5905b0ecf26..e25cb2de66430 100644
--- a/src/Compilers/Server/VBCSCompilerTests/VBCSCompiler.UnitTests.csproj
+++ b/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>
diff --git a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs b/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
index 5c37cd8e26e5c..2ecb0a6922862 100644
--- a/src/Compilers/Shared/CoreClrAnalyzerAssemblyLoader.cs
+++ b/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;
diff --git a/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb b/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb
index 8b40932b0684d..b723a5431a5b7 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Attributes/InternalsVisibleToAndStrongNameTests.vb
+++ b/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
diff --git a/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb b/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb
index 073f1675b5e76..e0a7a37806c21 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Emit/FieldInitializerTests.vb
+++ b/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 =
diff --git a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj
index 34591319e8380..eea96a57658fb 100644
--- a/src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj
+++ b/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" />
diff --git a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj b/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj
index 009b788e8d201..1dd4cec6a4210 100644
--- a/src/Compilers/VisualBasic/Test/Semantic/Microsoft.CodeAnalysis.VisualBasic.Semantic.UnitTests.vbproj
+++ b/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\" />
diff --git a/src/Compilers/VisualBasic/vbc/vbc.csproj b/src/Compilers/VisualBasic/vbc/vbc.csproj
index 42d7dd4c426cb..765a2dc4bd84c 100644
--- a/src/Compilers/VisualBasic/vbc/vbc.csproj
+++ b/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>
diff --git a/src/Interactive/csi/csi.csproj b/src/Interactive/csi/csi.csproj
index c8c99dc6c7448..9e76c2ee297a0 100644
--- a/src/Interactive/csi/csi.csproj
+++ b/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>
diff --git a/src/Interactive/vbi/vbi.vbproj b/src/Interactive/vbi/vbi.vbproj
index 693973349cbc4..5b3fedd8dfe51 100644
--- a/src/Interactive/vbi/vbi.vbproj
+++ b/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>
diff --git a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj b/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
index a06781467ac39..d4a3f5b2b49eb 100644
--- a/src/NuGet/Microsoft.NETCore.Compilers/Microsoft.NETCore.Compilers.Package.csproj
+++ b/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)"/>
 
diff --git a/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs b/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs
index 7ee43bdde3179..e4a2177c5d8de 100644
--- a/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs
+++ b/src/Test/Utilities/Portable/Assert/UseCultureAttribute.cs
@@ -54,7 +54,7 @@ public UseCultureAttribute(string culture, string uiCulture)
 #if NET46
             _culture = new Lazy<CultureInfo>(() => new CultureInfo(culture, useUserOverride: false));
             _uiCulture = new Lazy<CultureInfo>(() => new CultureInfo(uiCulture, useUserOverride: false));
-#elif NETCOREAPP2_0
+#elif NETCOREAPP2_1
             _culture = new Lazy<CultureInfo>(() => new CultureInfo(culture));
             _uiCulture = new Lazy<CultureInfo>(() => new CultureInfo(uiCulture));
 #else
@@ -83,7 +83,7 @@ public override void Before(MethodInfo methodUnderTest)
             _originalCulture = CultureInfo.CurrentCulture;
             _originalUICulture = CultureInfo.CurrentUICulture;
 
-#if NET46 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_1
             CultureInfo.CurrentCulture = Culture;
             CultureInfo.CurrentUICulture = UICulture;
 
@@ -103,7 +103,7 @@ public override void Before(MethodInfo methodUnderTest)
         /// <param name="methodUnderTest">The method under test</param>
         public override void After(MethodInfo methodUnderTest)
         {
-#if NET46 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_1
             CultureInfo.CurrentCulture = _originalCulture;
             CultureInfo.CurrentUICulture = _originalUICulture;
 
diff --git a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
index 0f73a752dab17..b34ac0b2867b0 100644
--- a/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
+++ b/src/Test/Utilities/Portable/Compilation/RuntimeUtilities.cs
@@ -35,7 +35,7 @@ internal static IRuntimeEnvironmentFactory GetRuntimeEnvironmentFactory()
         {
 #if NET46
             return new Roslyn.Test.Utilities.Desktop.DesktopRuntimeEnvironmentFactory();
-#elif NETCOREAPP2_0
+#elif NETCOREAPP2_1
             return new Roslyn.Test.Utilities.CoreClr.CoreCLRRuntimeEnvironmentFactory();
 #elif NETSTANDARD1_3
             throw new PlatformNotSupportedException();
@@ -58,7 +58,7 @@ internal static AnalyzerAssemblyLoader CreateAnalyzerAssemblyLoader()
         /// </summary>
         internal static string GetAssemblyLocation(Type type)
         {
-#if NET46 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_1
             return type.GetTypeInfo().Assembly.Location;
 #elif NETSTANDARD1_3
             throw new PlatformNotSupportedException();
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs
index a5f2bda60554d..327ef6163ea64 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironment.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.Linq;
 using System.Collections.Generic;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs
index 8a196fc9d79bb..b5b28143a7da8 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/CoreCLRRuntimeEnvironmentFactory.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 NETCOREAPP2_0
+#if NETCOREAPP2_1
 
 using System;
 using System.Collections.Generic;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
index 4aa9048ad5583..055dc48bac5bb 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/SharedConsoleOutWriter.cs
@@ -1,4 +1,4 @@
-#if NETCOREAPP2_0
+#if NETCOREAPP2_1
 
 using System;
 using System.IO;
diff --git a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs
index 1d0504db78066..09f34764b3402 100644
--- a/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.cs
+++ b/src/Test/Utilities/Portable/Platform/CoreClr/TestExecutionLoadContext.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.Concurrent;
 using System.Collections.Generic;
diff --git a/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs b/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs
index 2b1c93a4653e9..a01c4d2b60956 100644
--- a/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs
+++ b/src/Test/Utilities/Portable/Platform/Custom/OSVersion.cs
@@ -12,7 +12,7 @@ public static class OSVersion
         /// True when the operating system is at least Windows version 8
         /// </summary>
         public static bool IsWin8 =>
-#if NET46 || NETCOREAPP2_0
+#if NET46 || NETCOREAPP2_1
             System.Environment.OSVersion.Version.Build >= 9200;
 #else
             throw new PlatformNotSupportedException();
diff --git a/src/Tools/BuildBoss/ProjectCheckerUtil.cs b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
index c4f070ae9c556..9ff59a4441133 100644
--- a/src/Tools/BuildBoss/ProjectCheckerUtil.cs
+++ b/src/Tools/BuildBoss/ProjectCheckerUtil.cs
@@ -444,7 +444,7 @@ private bool CheckTargetFrameworks(TextWriter textWriter, RoslynProjectData data
                     case "net46":
                     case "netstandard1.3":
                     case "netcoreapp1.1":
-                    case "netcoreapp2.0":
+                    case "netcoreapp2.1":
                     case "$(RoslynPortableTargetFrameworks)":
                         break;
                     default:
diff --git a/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj b/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj
index 60724f6e0282a..9533be52272d3 100644
--- a/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj
+++ b/src/Tools/CompilerBenchmarks/CompilerBenchmarks.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
 
diff --git a/src/Tools/ILAsm/IlAsmDeploy.csproj b/src/Tools/ILAsm/IlAsmDeploy.csproj
index a95683aac28fa..60ae51cbce0d8 100644
--- a/src/Tools/ILAsm/IlAsmDeploy.csproj
+++ b/src/Tools/ILAsm/IlAsmDeploy.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>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <OutputType>Exe</OutputType>
     <!-- 
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
index 10aea9c90aad1..fcd737d8db489 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/BoundTreeGenerator/CompilersBoundTreeGenerator.csproj
@@ -9,7 +9,7 @@
     <RootNamespace>Roslyn.Compilers.Internal.BoundTreeGenerator</RootNamespace>
     <AssemblyName>BoundTreeGenerator</AssemblyName>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
index e88d450c75f6f..6ad8f816d9b90 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpErrorFactsGenerator/CSharpErrorFactsGenerator.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpErrorFactsGenerator</RootNamespace>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
index 017b87987b457..7c2628f76bd99 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/CSharpSyntaxGenerator/CSharpSyntaxGenerator.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Roslyn.Compilers.CSharp.Internal.CSharpSyntaxGenerator</RootNamespace>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
index 94b26a2a00590..7ea3c6ae7270a 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicErrorFactsGenerator/VisualBasicErrorFactsGenerator.vbproj
@@ -10,7 +10,7 @@
     <RootNamespace>Microsoft.CodeAnalysis.VisualBasic.Internal.VBErrorFactsGenerator</RootNamespace>
     <AssemblyName>VBErrorFactsGenerator</AssemblyName>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/RedNodeWriter.vb b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/RedNodeWriter.vb
index 4349a9e814c46..a8efb4f396345 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/RedNodeWriter.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/RedNodes/RedNodeWriter.vb
@@ -118,10 +118,9 @@ Friend Class RedNodeWriter
         _writer.WriteLine()
     End Sub
 
-
     Private Sub GenerateEnumTypes()
-        For Each enumeration In _parseTree.Enumerations.Values
-            GenerateEnumerationType(enumeration)
+        For Each enumerationType In _parseTree.Enumerations.Values
+            GenerateEnumerationType(enumerationType)
         Next
     End Sub
 
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb
index e9ec3ec9c9799..7d4718479437a 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/Util/WriteCsvNames.vb
@@ -40,8 +40,8 @@ Friend Class WriteCsvNames
     End Sub
 
     Private Sub WriteEnums()
-        For Each enumeration In _parseTree.Enumerations.Values
-            WriteEnum(enumeration)
+        For Each enumerationType In _parseTree.Enumerations.Values
+            WriteEnum(enumerationType)
         Next
     End Sub
 
diff --git a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
index 4ab5dd71732f0..d5cde7642408e 100644
--- a/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
+++ b/src/Tools/Source/CompilerGeneratorTools/Source/VisualBasicSyntaxGenerator/VisualBasicSyntaxGenerator.vbproj
@@ -11,7 +11,7 @@
     <AssemblyName>VBSyntaxGenerator</AssemblyName>
     <OptionStrict>Off</OptionStrict>
     <AutoGenerateBindingRedirects>True</AutoGenerateBindingRedirects>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>$(RoslynPortableRuntimeIdentifiers)</RuntimeIdentifiers>
     <IsShipping>false</IsShipping>
   </PropertyGroup>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2/Project.csproj
index ce1697ae88377..23df6047ff5e4 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndLibrary/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndLibrary/Project.csproj
index c5bb251842bc1..5dd4a7fc91b8b 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndLibrary/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndLibrary/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndTwoLibraries/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndTwoLibraries/Project.csproj
index 82528a171eb8e..e1f3fe0e59932 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndTwoLibraries/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreApp2AndTwoLibraries/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM/Project.csproj
index f783698c3908f..bbbe19d8d393f 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netstandard2.0;net461</TargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReference/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReference/Project.csproj
index 040b679cf6979..f7fcf68e583b2 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReference/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReference/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
index 040b679cf6979..f7fcf68e583b2 100644
--- a/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
+++ b/src/Workspaces/CoreTestUtilities/Resources/NetCoreMultiTFM_ProjectReferenceWithReversedTFMs/Project.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>