Add missing facades to devdiv toolset (#17594)

* Add missing facades to devdiv toolset

Fixes http://ddweb/buildstatus/issues/issues.aspx?iid=819217

src/Compilers/Extension/CompilerExtension.csproj

@@ -44,6 +44,13 @@
   <ItemGroup>
     <NuGetPackageToIncludeInVsix Include="Microsoft.DiaSymReader.Native" />
     <NuGetPackageToIncludeInVsix Include="Microsoft.Win32.Primitives" />
+    <!--
+      N.B. This list of facades must be kept in-sync with the
+      other facades used by the compiler. Facades are listed in
+      the src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb file, the
+      src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr file,
+      and src/NuGet/Microsoft.Net.Compilers.nuspec file.
+    -->
     <NuGetPackageToIncludeInVsix Include="System.AppContext" />
     <NuGetPackageToIncludeInVsix Include="System.Collections" />
     <NuGetPackageToIncludeInVsix Include="System.Collections.Concurrent" />

src/NuGet/Microsoft.Net.Compilers.nuspec

@@ -46,8 +46,14 @@ Supported Platforms:
     <file src="Dlls\MSbuildTask\Microsoft.CSharp.Core.targets" target="tools" />
     <file src="Dlls\MSbuildTask\Microsoft.VisualBasic.Core.targets" target="tools" />
 
-    <!-- The assemblies are not signed by us and any deployed copy can be used.  The Exes\Toolset
-         directory specifically has all of the assemblies we need -->
+    <!-- The assemblies are not signed by us and any deployed copy can be used.
+         The Exes\Toolset directory specifically has all of the assemblies we need.
+
+         N.B. This list of facades must be kept in-sync with the
+         other facades used by the compiler. Facades are listed in
+         the src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb file, the
+         src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr file,
+         and src/Compilers/Extension/CompilerExtension.csproj file. -->
     <file src="Exes\Toolset\Microsoft.Win32.Primitives.dll" target="tools" />
     <file src="Exes\Toolset\System.AppContext.dll" target="tools" />
     <file src="Exes\Toolset\System.Console.dll" target="tools" />

src/Setup/DevDivInsertionFiles/BuildDevDivInsertionFiles.vb

@@ -95,6 +95,11 @@ Public Class BuildDevDivInsertionFiles
         "VisualBasicInteractivePackageRegistration.pkgdef"
     }
 
+    ' N.B. This list of facades must be kept in-sync with the &
+    ' other facades used by the compiler. Facades are listed in
+    ' the src/NuGet/Microsoft.Net.Compilers.nuspec file, the
+    ' src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr file,
+    ' and src/Compilers/Extension/CompilerExtension.csproj file.
     Private ReadOnly CompilerFiles As String() = {
         "Microsoft.CodeAnalysis.dll",
         "Microsoft.CodeAnalysis.CSharp.dll",
@@ -103,7 +108,10 @@ Public Class BuildDevDivInsertionFiles
         "Microsoft.CodeAnalysis.VisualBasic.dll",
         "Microsoft.DiaSymReader.Native.amd64.dll",
         "Microsoft.DiaSymReader.Native.x86.dll",
+        "System.AppContext.dll",
+        "System.Console.dll",
         "System.Diagnostics.FileVersionInfo.dll",
+        "System.Diagnostics.Process.dll",
         "System.Diagnostics.StackTrace.dll",
         "System.IO.Compression.dll",
         "System.IO.FileSystem.dll",
@@ -858,29 +866,32 @@ Public Class BuildDevDivInsertionFiles
         add("Dlls\Concord\Microsoft.VisualStudio.Debugger.Engine.dll")
         add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.Diagnostics.Runtime.dll")
         add("Vsix\VisualStudioIntegrationTestSetup\Microsoft.VisualStudio.IntegrationTest.Setup.vsix")
-        add("Vsix\CompilerExtension\System.Collections.Immutable.dll")
-        add("Vsix\CompilerExtension\System.Reflection.Metadata.dll")
-        add("Vsix\CompilerExtension\System.Diagnostics.FileVersionInfo.dll")
-        add("Vsix\CompilerExtension\System.IO.Compression.dll")
-        add("Vsix\CompilerExtension\System.IO.FileSystem.dll")
-        add("Vsix\CompilerExtension\System.IO.FileSystem.DriveInfo.dll")
-        add("Vsix\CompilerExtension\System.IO.FileSystem.Primitives.dll")
-        add("Vsix\CompilerExtension\System.IO.Pipes.dll")
-        add("Vsix\CompilerExtension\System.Security.AccessControl.dll")
-        add("Vsix\CompilerExtension\System.Security.Claims.dll")
-        add("Vsix\CompilerExtension\System.Security.Cryptography.Algorithms.dll")
-        add("Vsix\CompilerExtension\System.Security.Cryptography.Encoding.dll")
-        add("Vsix\CompilerExtension\System.Security.Cryptography.Primitives.dll")
-        add("Vsix\CompilerExtension\System.Security.Cryptography.X509Certificates.dll")
-        add("Vsix\CompilerExtension\System.Security.Principal.Windows.dll")
-        add("Vsix\CompilerExtension\System.Text.Encoding.CodePages.dll")
-        add("Vsix\CompilerExtension\System.Threading.Thread.dll")
-        add("Vsix\CompilerExtension\System.Xml.ReaderWriter.dll")
-        add("Vsix\CompilerExtension\System.Xml.XmlDocument.dll")
-        add("Vsix\CompilerExtension\System.Xml.XPath.dll")
-        add("Vsix\CompilerExtension\System.Xml.XPath.XDocument.dll")
-        add("Exes\csi\System.Diagnostics.StackTrace.dll")
-        add("Exes\csi\System.ValueTuple.dll")
+        add("Exes\Toolset\System.AppContext.dll")
+        add("Exes\Toolset\System.Console.dll")
+        add("Exes\Toolset\System.Collections.Immutable.dll")
+        add("Exes\Toolset\System.Diagnostics.FileVersionInfo.dll")
+        add("Exes\Toolset\System.Diagnostics.Process.dll")
+        add("Exes\Toolset\System.Diagnostics.StackTrace.dll")
+        add("Exes\Toolset\System.IO.Compression.dll")
+        add("Exes\Toolset\System.IO.FileSystem.dll")
+        add("Exes\Toolset\System.IO.FileSystem.DriveInfo.dll")
+        add("Exes\Toolset\System.IO.FileSystem.Primitives.dll")
+        add("Exes\Toolset\System.IO.Pipes.dll")
+        add("Exes\Toolset\System.Reflection.Metadata.dll")
+        add("Exes\Toolset\System.Security.AccessControl.dll")
+        add("Exes\Toolset\System.Security.Claims.dll")
+        add("Exes\Toolset\System.Security.Cryptography.Algorithms.dll")
+        add("Exes\Toolset\System.Security.Cryptography.Encoding.dll")
+        add("Exes\Toolset\System.Security.Cryptography.Primitives.dll")
+        add("Exes\Toolset\System.Security.Cryptography.X509Certificates.dll")
+        add("Exes\Toolset\System.Security.Principal.Windows.dll")
+        add("Exes\Toolset\System.Text.Encoding.CodePages.dll")
+        add("Exes\Toolset\System.Threading.Thread.dll")
+        add("Exes\Toolset\System.ValueTuple.dll")
+        add("Exes\Toolset\System.Xml.ReaderWriter.dll")
+        add("Exes\Toolset\System.Xml.XmlDocument.dll")
+        add("Exes\Toolset\System.Xml.XPath.dll")
+        add("Exes\Toolset\System.Xml.XPath.XDocument.dll")
         Return map
     End Function
 

src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.swr

@@ -39,9 +39,9 @@ folder InstallDir:\MSBuild\15.0\Bin\Roslyn
 
     file source=$(OutputPath)\Vsix\CompilerExtension\System.AppContext.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.Console.dll vs.file.ngenArchitecture=all
+    file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.FileVersionInfo.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.Process.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.StackTrace.dll vs.file.ngenArchitecture=all
-    file source=$(OutputPath)\Vsix\CompilerExtension\System.Diagnostics.FileVersionInfo.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.Compression.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.FileSystem.dll vs.file.ngenArchitecture=all
     file source=$(OutputPath)\Vsix\CompilerExtension\System.IO.FileSystem.DriveInfo.dll vs.file.ngenArchitecture=all