Merge pull request #1447 from Microsoft/changesRequiredForVS2017RC3

Simplify VS2017 build and signing

Author: paulvanbrenk

Build/Common.Build.VSSDK.targets

@@ -170,7 +170,6 @@
     </ItemGroup>
   </Target>
 
-
   <!--
   Zip folders containing VSIX files. These folders must have been created
   by previously having built the project.
@@ -186,6 +185,12 @@
         <SourcePath>$(SignedBinariesPath)\%(VSIXBinaries.Filename)%(VSIXBinaries.Extension)</SourcePath>
       </VSIXBinaries>
       <VSIXSignedBinaries Include="@(VSIXBinaries)" Condition="Exists(%(VSIXBinaries.SourcePath))" />
+      
+      <VSIXBinariesLoc Include="$(CopyVsixExtensionRoot)**\*.resources.dll" />
+      <VSIXBinariesLoc>
+        <SourcePath>$(SignedBinariesPath)\$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName(%(VSIXBinariesLoc.FullPath)))))\%(VSIXBinariesLoc.Filename)%(VSIXBinariesLoc.Extension)</SourcePath>
+      </VSIXBinariesLoc>
+      <VSIXSignedBinaries Include="@(VSIXBinariesLoc)" Condition="Exists(%(VSIXBinariesLoc.SourcePath))" />
     </ItemGroup>
 
     <Copy SourceFiles="@(VSIXSignedBinaries->'%(SourcePath)')"

Build/Common.Build.targets

@@ -146,10 +146,10 @@
           DestinationFolder="$(CopyOutputsToPath)Symbols" />
 
     <Copy SourceFiles="@(SatelliteDllsProjectOutputGroupOutput)"
-          DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries\%(SatelliteDllsProjectOutputGroupOutput.TargetDir)" 
+          DestinationFiles="@(SatelliteDllsProjectOutputGroupOutput->'$(CopyOutputsToPath)UnsignedBinaries\%(TargetPath)')"
           SkipUnchangedFiles="true" />
 
-    <Copy SourceFiles="@(OutputBinariesToSign -> '$(OutputPath)%(filename)%(extension)')"
+    <Copy SourceFiles="@(OutputBinariesToSign->'$(OutputPath)%(filename)%(extension)')"
           DestinationFolder="$(CopyOutputsToPath)UnsignedBinaries"
           Condition="'@(OutputBinariesToSign)' != ''"/>
   </Target>

Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj

@@ -297,6 +297,9 @@
   <PropertyGroup>
     <CreateVsixContainer>True</CreateVsixContainer>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
+    <IsProductComponent>true</IsProductComponent>
+    <ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
+    <ExtensionInstallationFolder>Microsoft\NodeJsTools\Repl</ExtensionInstallationFolder>
   </PropertyGroup>
   <Import Project="$(BuildRoot)\Common\Product\ReplWindow\ReplWindow.proj" />
   <Import Project="..\ProjectAfter.settings" />

Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest

@@ -7,6 +7,7 @@
     <GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
     <Icon>NodeJS.ico</Icon>
     <PreviewImage>NodeJS_200x.png</PreviewImage>
+    <PackageId>Microsoft.VisualStudio.NodejsTools.InteractiveWindow</PackageId>
   </Metadata>
   <!-- Version="11.0" specifies the minimum (not the maximum) version, and the
        Id specifications are minimums; any SKU equal or 'higher' will accept

Nodejs/Product/Nodejs/Guids.cs

@@ -74,7 +74,7 @@ static class Guids {
 
         public const string OfficeToolsBootstrapperCmdSetString = "{D26C976C-8EE8-4EC4-8746-F5F7702A17C5}";
         public static readonly Guid OfficeToolsBootstrapperCmdSet = new Guid(OfficeToolsBootstrapperCmdSetString);
-		
+
         // UWP project flavor guid
         public const string NodejsUwpProjectFlavor = "00251F00-BA30-4CE4-96A2-B8A1085F37AA";
     };

Nodejs/Product/Nodejs/Nodejs.csproj

@@ -1507,6 +1507,9 @@
     <RegisterWithCodebase>true</RegisterWithCodebase>
   </PropertyGroup>
   <PropertyGroup>
+    <IsProductComponent>true</IsProductComponent>
+    <ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
+    <ExtensionInstallationFolder>Microsoft\NodeJsTools\NodeJsTools</ExtensionInstallationFolder>
     <CreateVsixContainer>True</CreateVsixContainer>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
   </PropertyGroup>

Nodejs/Product/Nodejs/source.extension.vsixmanifest

@@ -7,6 +7,7 @@
     <GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
     <Icon>NodeJS.ico</Icon>
     <PreviewImage>NodeJS_200x.png</PreviewImage>
+    <PackageId>Microsoft.VisualStudio.NodejsTools.NodejsTools</PackageId>
   </Metadata>
   <Installation>
     <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />

Nodejs/Product/Profiling/Profiling.csproj

@@ -225,6 +225,9 @@
     <RegisterWithCodebase>true</RegisterWithCodebase>
   </PropertyGroup>
   <PropertyGroup>
+    <IsProductComponent>true</IsProductComponent>
+    <ExtensionInstallationRoot>Extensions</ExtensionInstallationRoot>
+    <ExtensionInstallationFolder>Microsoft\NodeJsTools\Profiling</ExtensionInstallationFolder>
     <CreateVsixContainer>True</CreateVsixContainer>
     <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
   </PropertyGroup>

Nodejs/Product/Profiling/source.extension.vsixmanifest

@@ -7,6 +7,7 @@
     <GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
     <Icon>NodeJS.ico</Icon>
     <PreviewImage>NodeJS_200x.png</PreviewImage>
+    <PackageId>Microsoft.VisualStudio.NodejsTools.Profiling</PackageId>
   </Metadata>
   <!-- Version="11.0" specifies the minimum (not the maximum) version, and the
        Id specifications are minimums; any SKU equal or 'higher' will accept

Nodejs/Setup/BuildRelease.ps1

@@ -166,7 +166,7 @@ $symbol_contacts = "$env:username;dinov;smortaz;gilbertw;jinglou"
 $vcs_contact = "ntvscore"
 
 # These options are passed to all MSBuild processes
-$global_msbuild_options = @("/v:m", "/m", "/nologo")
+$global_msbuild_options = @("/v:m", "/m", "/nologo", "/flp:verbosity=detailed")
 
 if ($skiptests) {
     $global_msbuild_options += "/p:IncludeTests=false"
@@ -234,11 +234,9 @@ function after-build($buildroot, $target) {
     Copy-Item -Force "$buildroot\Nodejs\Prerequisites\*.reg" $($target.destdir)
 
     $setup15 = mkdir "$($target.destdir)\Setup15" -Force 
-    Copy-Item -Recurse -Force "$buildroot\BuildOutput\$($target.config)$($target.VSTarget)\Setup\*.json" $setup15 
+    Copy-Item -Recurse -Force "$buildroot\BuildOutput\$($target.config)$($target.VSTarget)\Binaries\**\*.json" $setup15 
     Copy-Item -Recurse -Force "$buildroot\BuildOutput\$($target.config)$($target.VSTarget)\Setup\*.vsman" $setup15 
 
-
-
     if ($copytests) {
         Copy-Item -Recurse -Force "$buildroot\BuildOutput\$($target.config)$($target.VSTarget)\Tests" "$($target.destdir)\Tests"
         Copy-Item -Recurse -Force "$buildroot\Nodejs\Tests\TestData" "$($target.destdir)\Tests\TestData"