Merge remote-tracking branch 'upstream/master' into featureOptions

bcassell · Dec 17, 2016 · 358f89b · 358f89b
2 parents 25ba09f + 60562c5
commit 358f89b
Show file tree

Hide file tree

Showing 279 changed files with 4,530 additions and 3,420 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -1,23 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
-
 <configuration>
   <packageRestore>
     <!-- Currently, the repository's version of NuGet.exe and Visual Studio's version
          fight over the format of project.lock.json because the one in the respository
          is newer. To prevent that, turn off package restore. -->
-
     <add key="automatic" value="false" />
   </packageRestore>
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
-  <config>
-    <add key="repositoryPath" value="../packages" />
-  </config>
   <packageSources>
     <clear />
-
     <add key="dotnet.myget.org dotnet-coreclr" value="https://dotnet.myget.org/F/dotnet-coreclr/api/v3/index.json" />
     <add key="dotnet.myget.org dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="dotnet.myget.org dotnet-corefxtestdata" value="https://dotnet.myget.org/F/dotnet-corefxtestdata/api/v3/index.json" />

diff --git a/Restore.cmd b/Restore.cmd
@@ -41,9 +41,6 @@ call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev14.project.json"
 echo Restoring packages: Toolsets (Dev15 VS SDK RC build tools)
 call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\dev15rc.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
 
-echo Restoring packages: Roslyn SDK
-call "%NugetExe%" restore "%RoslynRoot%build\ToolsetPackages\roslynsdk.project.json" %NuGetAdditionalCommandLineArgs% || goto :RestoreFailed
-
 echo Locating MSBuild for Solution restore
 call "%RoslynRoot%SetDevCommandPrompt.cmd" || goto :RestoreFailed
 

diff --git a/Roslyn.sln b/Roslyn.sln
@@ -360,6 +360,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunctionResolver", "src\Exp
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FunctionResolverTest", "src\ExpressionEvaluator\Core\Test\FunctionResolver\FunctionResolverTest.csproj", "{DD317BE1-42A1-4795-B1D4-F370C40D649A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorVisualStudio", "src\VisualStudio\Razor\RazorVisualStudio.csproj", "{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorServiceHub", "src\Workspaces\Remote\Razor\RazorServiceHub.csproj", "{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Compilers\Core\CommandLine\CommandLine.projitems*{06b26dcb-7a12-48ef-ae50-708593abd05f}*SharedItemsImports = 4
@@ -3187,6 +3191,46 @@ Global
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|x64.Build.0 = Release|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|x86.ActiveCfg = Release|Any CPU
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A}.Release|x86.Build.0 = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|ARM.Build.0 = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|ARM.ActiveCfg = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|ARM.Build.0 = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|x64.Build.0 = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980}.Release|x86.Build.0 = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|ARM.Build.0 = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x64.Build.0 = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Debug|x86.Build.0 = Debug|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|ARM.ActiveCfg = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|ARM.Build.0 = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x64.Build.0 = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.ActiveCfg = Release|Any CPU
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -3357,5 +3401,7 @@ Global
 		{69F853E5-BD04-4842-984F-FC68CC51F402} = {8DBA5174-B0AA-4561-82B1-A46607697753}
 		{6FC8E6F5-659C-424D-AEB5-331B95883E29} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
 		{DD317BE1-42A1-4795-B1D4-F370C40D649A} = {998CAFE8-06E4-4683-A151-0F6AA4BFF6C6}
+		{0C0EEB55-4B6D-4F2B-B0BB-B9EB2BA9E980} = {8DBA5174-B0AA-4561-82B1-A46607697753}
+		{B6FC05F2-0E49-4BE2-8030-ACBB82B7F431} = {55A62CFA-1155-46F1-ADF3-BEEE51B58AB5}
 	EndGlobalSection
 EndGlobal
diff --git a/build/Defaults/Desktop/app.config b/build/Defaults/Desktop/app.config
@@ -5,6 +5,7 @@
   <appSettings>
     <add key="xunit.diagnosticMessages" value="false"/>
     <add key="xunit.parallelizeTestCollections" value="false"/>
+    <add key="xunit.shadowCopy" value="false"/> <!-- Set shadow copy to false so that the VS Test Explorer can properly load our public signed binaries -->
   </appSettings>
   <system.diagnostics>
     <trace>

diff --git a/build/Defaults/Portable/app.config b/build/Defaults/Portable/app.config
@@ -5,6 +5,7 @@
   <appSettings>
     <add key="xunit.diagnosticMessages" value="false"/>
     <add key="xunit.parallelizeTestCollections" value="false"/>
+    <add key="xunit.shadowCopy" value="false"/> <!-- Set shadow copy to false so that the VS Test Explorer can properly load our public signed binaries -->
   </appSettings>
   <system.diagnostics>
     <trace>

diff --git a/build/Targets/Dependencies.props b/build/Targets/Dependencies.props
@@ -16,6 +16,7 @@
     <MicrosoftCodeAnalysisAnalyzersVersion>1.1.0</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisElfieVersion>0.10.6-rc2</MicrosoftCodeAnalysisElfieVersion>
     <MicrosoftCompositionVersion>1.0.27</MicrosoftCompositionVersion>
+    <MicrosoftCSharpVersion>4.3.0</MicrosoftCSharpVersion>
     <MicrosoftDiagnosticsRuntimeVersion>0.8.31-beta</MicrosoftDiagnosticsRuntimeVersion>
     <MicrosoftDiagnosticsTracingTraceEventVersion>1.0.35</MicrosoftDiagnosticsTracingTraceEventVersion>
     <MicrosoftDiaSymReaderVersion>1.1.0-beta1-60818-02</MicrosoftDiaSymReaderVersion>
@@ -88,9 +89,9 @@
     <SystemXmlXmlDocumentVersion>4.3.0</SystemXmlXmlDocumentVersion>
     <SystemXmlXmlSerializerVersion>4.3.0</SystemXmlXmlSerializerVersion>
     <SystemXmlXPathXDocumentVersion>4.3.0</SystemXmlXPathXDocumentVersion>
-    <xunitVersion>2.1.0</xunitVersion>
-    <xunitassertVersion>2.1.0</xunitassertVersion>
+    <xunitVersion>2.2.0-beta4-build3444</xunitVersion>
     <xunitconsolenetcoreVersion>1.0.2-prerelease-00104</xunitconsolenetcoreVersion>
-    <xunitrunnerconsoleVersion>2.2.0-beta1-build3239</xunitrunnerconsoleVersion>
+    <xunitrunnerconsoleVersion>2.2.0-beta4-build3444</xunitrunnerconsoleVersion>
+    <xunitrunnervisualstudioVersion>2.2.0-beta4-build1194</xunitrunnervisualstudioVersion>
   </PropertyGroup>
 </Project>
diff --git a/build/Targets/GenerateInternalsVisibleTo.targets b/build/Targets/GenerateInternalsVisibleTo.targets
@@ -29,6 +29,9 @@
     <InternalsVisibleToMonodevelop>
       <Visible>false</Visible>
     </InternalsVisibleToMonodevelop>
+    <InternalsVisibleToRazor>
+      <Visible>false</Visible>
+    </InternalsVisibleToRazor>
   </ItemDefinitionGroup>
 
   <PropertyGroup Condition="'$(PublicKey)' != '' and '$(SignAssembly)' == 'True'">
@@ -44,7 +47,7 @@
           Inputs="$(MSBuildThisFileFullPath);$(MSBuildProjectFile)"
           Outputs="$(GeneratedInternalsVisibleToFile)"
           DependsOnTargets="PrepareForBuild"
-          Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != ''">
+          Condition="'@(InternalsVisibleTo)' != '' OR '@(InternalsVisibleToTest)' != '' OR '@(InternalsVisibleToTypeScript)' != '' OR '@(InternalsVisibleToVisualStudio)' != '' OR '@(InternalsVisibleToFSharp)' != '' OR '@(InternalsVisibleToMoq)' != '' OR '@(InternalsVisibleToRazor)' != ''">
 
     <!--
          This is a slightly evil trick. What we have is a group of InternalsVisibleTo items which
@@ -97,7 +100,11 @@
                 Condition="'@(InternalsVisibleToMonodevelop)' != ''">
       <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
     </CreateItem>
-
+    <CreateItem Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute"
+                AdditionalMetadata="_Parameter1=%(InternalsVisibleToRazor.Identity), PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb" 
+                Condition="'@(InternalsVisibleToRazor)' != ''">
+      <Output TaskParameter="Include" ItemName="InternalsVisibleToAttribute" />
+    </CreateItem>
     <!-- The necessity of this Task is tracked by https://github.com/dotnet/roslyn/issues/8421 -->
     <WriteCodeFragmentEx 
         AssemblyAttributes="@(InternalsVisibleToAttribute)"

diff --git a/build/Targets/Versions.props b/build/Targets/Versions.props
@@ -8,13 +8,13 @@
 
   <PropertyGroup>
     <!-- This is the assembly version of Roslyn from the .NET assembly perspective. It should only be revved during significant point releases. -->
-    <RoslynAssemblyVersionBase Condition="'$(RoslynAssemblyVersion)' == ''">2.0.0</RoslynAssemblyVersionBase>
+    <RoslynAssemblyVersionBase Condition="'$(RoslynAssemblyVersion)' == ''">2.1.0</RoslynAssemblyVersionBase>
     <!-- This is the file version of Roslyn, as placed in the PE header. It should be revved during point releases, and is also what provides the basis for our NuGet package versioning. -->
-    <RoslynFileVersionBase Condition="'$(RoslynFileVersionBase)' == ''">2.0.0</RoslynFileVersionBase>
+    <RoslynFileVersionBase Condition="'$(RoslynFileVersionBase)' == ''">2.1.0</RoslynFileVersionBase>
     <!-- The release moniker for our packages.  Developers should use "dev" and official builds pick the branch
          moniker listed below -->
     <RoslynNuGetMoniker Condition="'$(RoslynNuGetMoniker)' == ''">dev</RoslynNuGetMoniker>
-    <RoslynNuGetMoniker Condition="'$(OfficialBuild)' == 'true'">rc3</RoslynNuGetMoniker>
+    <RoslynNuGetMoniker Condition="'$(OfficialBuild)' == 'true'">beta1</RoslynNuGetMoniker>
     <!-- This is the base of the NuGet versioning for prerelease packages -->
     <NuGetPreReleaseVersion>$(RoslynFileVersionBase)-$(RoslynNuGetMoniker)</NuGetPreReleaseVersion>
     <!-- Currently we version IW the same as Roslyn. -->

diff --git a/build/Toolset/project.json b/build/Toolset/project.json
@@ -1,6 +1,5 @@
 {
-  "dependencies": {
-  },
+  "dependencies": { },
   "frameworks": {
     "net46": { }
   },

diff --git a/build/ToolsetPackages/README.md b/build/ToolsetPackages/README.md
@@ -8,6 +8,5 @@ For such toolset packages we use the project.json files in this directory to res
 - dev14.project.json: The Dev14 SDK and toolsets
 - dev15rc.project.json: The Dev15 RC SDK and toolsets.  
 - closed.project.json: Contains all of the NuGet packages contained in our closed repo that aren't in Open.  This is done only to give visibility to these packages in our build verification tools. 
-- roslynsdk.project.json: Download the V1 Roslyn SDK.  This is used as assets in our SDK VSIX projects.
 
 In general we try and keep the number of files here low.  New ones are added only when the contents can potentially conflict with packages listed in the existing files.
diff --git a/build/ToolsetPackages/closed.project.json b/build/ToolsetPackages/closed.project.json
@@ -1,11 +1,11 @@
 {
-    "dependencies": {
-        "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.35",
-        "Newtonsoft.Json": "9.0.1",
-        "System.IdentityModel.Tokens.Jwt": "5.0.0",
-        "System.IO.Compression.ZipFile": "4.0.1"
-    },
-    "frameworks": {
-        "net46": {}
-    }
+  "dependencies": {
+    "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.35",
+    "Newtonsoft.Json": "9.0.1",
+    "System.IdentityModel.Tokens.Jwt": "5.0.0",
+    "System.IO.Compression.ZipFile": "4.0.1"
+  },
+  "frameworks": {
+    "net46": {}
+  }
 }
diff --git a/build/ToolsetPackages/dev14.project.json b/build/ToolsetPackages/dev14.project.json
@@ -1,9 +1,9 @@
 {
-    "dependencies": {
-        "Microsoft.VSSDK.BuildTools": "14.3.25420"
-    },
-    "frameworks": {
-        "net46": {}
-    }
+  "dependencies": {
+    "Microsoft.VSSDK.BuildTools": "14.3.25420"
+  },
+  "frameworks": {
+    "net46": {}
+  }
 }
 
diff --git a/build/ToolsetPackages/dev15rc.project.json b/build/ToolsetPackages/dev15rc.project.json
@@ -1,9 +1,9 @@
 {
-    "dependencies": {
-        "Microsoft.VSSDK.BuildTools": "15.0.25929-RC2"
-    },
-    "frameworks": {
-        "net46": {}
-    }
+  "dependencies": {
+    "Microsoft.VSSDK.BuildTools": "15.0.25929-RC2"
+  },
+  "frameworks": {
+    "net46": {}
+  }
 }
 
diff --git a/build/ToolsetPackages/project.json b/build/ToolsetPackages/project.json
@@ -9,15 +9,15 @@
     "Microsoft.Net.Compilers": "2.0.0-rc2-61102-09",
     "Microsoft.Net.RoslynDiagnostics": "1.2.0-beta2",
     "FakeSign": "0.9.2",
-    "xunit.assert": "2.1.0",
-    "xunit.runner.console": "2.2.0-beta1-build3239",
+    "xunit": "2.2.0-beta4-build3444",
+    "xunit.runner.console": "2.2.0-beta4-build3444",
+    "xunit.runner.visualstudio": "2.2.0-beta4-build1194",
     "Roslyn.Build.Util": "0.9.4-portable",
     "RoslynDependencies.OptimizationData": "2.0.0-rc-61101-16",
     "RoslynTools.Microsoft.LocateVS": "0.2.2-beta",
     "RoslynTools.Microsoft.SignTool": "0.2.2-beta",
     "RoslynTools.Microsoft.VSIXExpInstaller": "0.2.2-beta",
     "GitLink": "2.3.0"
-
   },
   "frameworks": {
     "net461": {}

diff --git a/build/bootstrap/VBCSCompiler.exe.config b/build/bootstrap/VBCSCompiler.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/build/bootstrap/csc.exe.config b/build/bootstrap/csc.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>

diff --git a/build/bootstrap/vbc.exe.config b/build/bootstrap/vbc.exe.config
@@ -6,15 +6,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>