Move Insertion dir to be a publish phase

The Insertion directory is no longer created during our normal build.
Rather it's created as a separate, publishing step that occurs after
build.

build/config/SignToolData.json

@@ -103,7 +103,8 @@
         "Vsix\\VisualStudioSetup.Next\\Roslyn.VisualStudio.Setup.Next.vsix",
         "Vsix\\VisualStudioSetup\\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\\Roslyn\\RoslynDeployment.vsix",
-        "Vsix\\Templates\\Roslyn SDK.vsix"
+        "Vsix\\Templates\\Roslyn SDK.vsix",
+        "Vsix\\CodeAnalysisCompilers\\Microsoft.CodeAnalysis.Compilers.vsix"
       ]
     },
     {
@@ -112,9 +113,7 @@
       "values": [
         "Nuget\\PerBuildPreRelease\\*.nupkg",
         "Nuget\\PreRelease\\*.nupkg",
-        "Nuget\\Release\\*.nupkg",
-        "DevDivPackages\\Roslyn\\VS.ExternalAPIs.Roslyn.2.6.0-dev-56735-00.nupkg",
-        "DevDivPackages\\Roslyn\\VS.Tools.Roslyn.2.6.0-dev-56735-00.nupkg"
+        "Nuget\\Release\\*.nupkg"
       ]
     }
   ],

build/scripts/build.ps1

@@ -28,7 +28,7 @@ param (
     [switch]$pack = $false,
     [string]$msbuildDir = "",
 
-    # DELEET THIS
+    # JTODO DELETE THIS
     [string]$assemblyVersion = "42.42.42.4242",
 
     # Test options 
@@ -507,13 +507,16 @@ function Deploy-VsixViaTool() {
 function Run-SignTool() { 
     Push-Location $repoDir
     try {
+
         $signTool = Join-Path (Get-PackageDir "RoslynTools.Microsoft.SignTool") "tools\SignTool.exe"
+        # JTODO DELETE THIS
+        $signTool = "E:\code\roslyn-tools\artifacts\Debug\bin\SignTool\net461\SignTool.exe";
         $signToolArgs = "-msbuildPath `"$msbuild`""
         if (-not $official) {
             $signToolArgs += " -test"
         }
         $signToolArgs += " `"$configDir`""
-        Exec-Command $signTool $signToolArgs
+        Exec-Console $signTool $signToolArgs
     }
     finally { 
         Pop-Location

build/scripts/check-toolset-insertion.ps1

@@ -87,7 +87,7 @@ try
     }
 
     write-host "Verifying contents of Microsoft.CodeAnalysis.Compilers.vsix"
-    $vsixpath = join-path $binariesPath "Insertion\Microsoft.CodeAnalysis.Compilers.vsix"
+    $vsixpath = join-path $binariesPath "Vsix\CodeAnalysisCompilers\Microsoft.CodeAnalysis.Compilers.vsix"
     $msbuildroslynfiles =  [IO.Compression.ZipFile]::OpenRead($vsixpath).Entries |
         ?{ $_.FullName.StartsWith("Contents/MSBuild/15.0/Bin/Roslyn") } |
         %{ $_.Name } |

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <OutputPath>$(OutputPath)\Insertion</OutputPath>
+    <OutputPath>$(OutputPath)\Vsix\CodeAnalysisLanguageServices</OutputPath>
     <IsPackage>true</IsPackage>
     <FinalizeValidate>false</FinalizeValidate>
     <ValidateManifest>false</ValidateManifest>
@@ -16,10 +16,10 @@
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildCoreVersion)\build\MicroBuild.Core.targets" />
 
   <ItemGroup>
-    <MergeManifest Include="$(OutputPath)\..\Vsix\ExpressionEvaluatorPackage\Microsoft.CodeAnalysis.ExpressionEvaluator.json" />
-    <MergeManifest Include="$(OutputPath)\..\Vsix\VisualStudioInteractiveComponents\Microsoft.CodeAnalysis.VisualStudio.InteractiveComponents.json" />
-    <MergeManifest Include="$(OutputPath)\..\Vsix\VisualStudioSetup\Microsoft.CodeAnalysis.VisualStudio.Setup.json" />
-    <MergeManifest Include="$(OutputPath)\..\Vsix\VisualStudioSetup.Next\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
+    <MergeManifest Include="$(OutputPath)\..\ExpressionEvaluatorPackage\Microsoft.CodeAnalysis.ExpressionEvaluator.json" />
+    <MergeManifest Include="$(OutputPath)\..\VisualStudioInteractiveComponents\Microsoft.CodeAnalysis.VisualStudio.InteractiveComponents.json" />
+    <MergeManifest Include="$(OutputPath)\..\VisualStudioSetup\Microsoft.CodeAnalysis.VisualStudio.Setup.json" />
+    <MergeManifest Include="$(OutputPath)\..\VisualStudioSetup.Next\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
   </ItemGroup>
 
   <Target Name="ValidateManifest" />

src/Setup/DevDivVsix/PortableFacades/PortableFacades.swixproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <OutputArchitecture>neutral</OutputArchitecture>
     <OutputLocalized>false</OutputLocalized>
-    <OutputPath>$(OutputPath)\Insertion</OutputPath>
+    <OutputPath>$(OutputPath)\Vsix\PortableFacades</OutputPath>
     <IsPackage>true</IsPackage>
     <OutputType>vsix</OutputType>
   </PropertyGroup>

src/Setup/DevDivVsix/PortableFacades/PortableFacades.vsmanproj

@@ -6,7 +6,7 @@
   <PropertyGroup>
     <FinalizeManifest>true</FinalizeManifest>
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
-    <OutputPath>$(OutputPath)\Insertion\</OutputPath>
+    <OutputPath>$(OutputPath)\Vsix\PortableFacades</OutputPath>
     <IsPackage>true</IsPackage>
     <FinalizeValidate>false</FinalizeValidate>
     <ValidateManifest>false</ValidateManifest>

src/Tools/MicroBuild/microbuild.ps1

@@ -63,7 +63,7 @@ function Run-MSBuild([string]$buildArgs = "", [string]$logFile = "", [switch]$pa
 # Create the Insertion folder. This is where the insertion tool pulls all of its 
 # binaries from. 
 function Copy-InsertionItems() {
-    $insertionDir = Join-Path $binariesdir 
+    $insertionDir = Join-Path $binariesdir "Insertion"
     Create-Directory $insertionDir
 
     $items = @(
@@ -75,6 +75,11 @@ function Copy-InsertionItems() {
         "Vsix\VisualStudioSetup\Roslyn.VisualStudio.Setup.vsix",
         "Vsix\VisualStudioSetup.Next\Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json",
         "Vsix\VisualStudioSetup.Next\Roslyn.VisualStudio.Setup.Next.vsix",
+        "Vsix\CodeAnalysisLanguageServices\Microsoft.CodeAnalysis.LanguageServices.vsman",
+        "Vsix\PortableFacades\PortableFacades.vsix",
+        "Vsix\PortableFacades\PortableFacades.vsman",
+        "Vsix\PortableFacades\PortableFacades.vsmand",
+        "Vsix\PortableFacades\PortableFacades.json",
         "Vsix\CodeAnalysisCompilers\Microsoft.CodeAnalysis.Compilers.vsix",
         "Vsix\CodeAnalysisCompilers\Microsoft.CodeAnalysis.Compilers.vsman",
         "Vsix\CodeAnalysisCompilers\Microsoft.CodeAnalysis.Compilers.vsmand",