Lightweight installer work

Build/BuildReleaseHelpers.psm1

@@ -78,7 +78,7 @@ function begin_sign_files {
                 $job.SelectCertificate("67")     # StrongName key
             }
             if ($certificates -match "vsix") {
-                $job.SelectCertificate("10040160")     # Microsoft OPC Publisher (VSIX)
+                $job.SelectCertificate("160")     # Microsoft OPC Publisher (VSIX)
             }
 
             foreach ($approver in $approvers) {

Build/BuildReleaseMockHelpers.psm1

@@ -92,8 +92,8 @@ job.SelectCertificate(67)"
     }
     if ($certificates -match "vsix") {
         $msg = "$msg
-job.SelectCertificate(100040160)"
-        $job.SelectCertificate("100040160")   # Microsoft OPC Publisher (VSIX)
+job.SelectCertificate(160)"
+        $job.SelectCertificate("160")   # Microsoft OPC Publisher (VSIX)
     }
 
     foreach ($approver in $approvers) {

Build/Common.Build.VSSDK.targets

@@ -200,7 +200,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="_RezipSingleVSIX_Dev12" DependsOnTargets="_GetRezipVSIXFiles" BeforeTargets="Build" Inputs="@(VSIX)" Outputs="%(VSIX.Container)" Condition="'$(VSTarget)' == '12.0'">
+  <Target Name="_RezipSingleVSIX_Dev15" DependsOnTargets="_GetRezipVSIXFiles" BeforeTargets="Build" Inputs="@(VSIX)" Outputs="%(VSIX.Container)" Condition="'$(VSTarget)' == '15.0'">
     <Message Text="Rezipping %(VSIX.SourceDir)" Importance="high" />
 
     <ItemGroup>
@@ -234,39 +234,6 @@
           Condition="'$(CopyOutputsToPath)' != ''" />
   </Target>
 
-  <Target Name="_RezipSingleVSIX_Dev10_11" DependsOnTargets="_GetRezipVSIXFiles" BeforeTargets="Build" Inputs="@(VSIX)" Outputs="%(VSIX.Container)" Condition="'$(VSTarget)' == '10.0' or '$(VSTarget)' == '11.0'">
-    <Message Text="Rezipping %(VSIX.SourceDir)" Importance="high" />
-
-    <ItemGroup>
-      <_VSIXSourceItems Include="%(VSIX.SourceDir)**\*" />
-      <_VSIXSourceItems>
-        <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-      </_VSIXSourceItems>
-    </ItemGroup>
-
-    <PropertyGroup>
-      <_Container>%(VSIX.Container)</_Container>
-    </PropertyGroup>
-
-    <CreateZipPackage Files="@(_VSIXSourceItems)"
-                      ZipPackage="$(_Container)">
-      <Output TaskParameter="ZipPackage" ItemName="FileWrites" />
-    </CreateZipPackage>
-
-    <!-- Copy rezipped VSIX to output if necessary -->
-    <PropertyGroup Condition="'$(CopyOutputsToPath)' != ''">
-      <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>
-      <_PathSuffix Condition="'$(SignedBinariesPath)' == ''">UnsignedMsi\</_PathSuffix>
-    </PropertyGroup>
-
-    <MakeDir Directories="$(CopyOutputsToPath)$(_PathSuffix)"
-             Condition="'$(CopyOutputsToPath)' != ''" />
-    <Copy SourceFiles="$(_Container)"
-          DestinationFolder="$(CopyOutputsToPath)$(_PathSuffix)"
-          Condition="'$(CopyOutputsToPath)' != ''" />
-  </Target>
-
   <!--
   Transforms TransformedZipProject items into ZipProject items with textual
   replacement of the VS target version.

Build/Common.Build.Wix.targets

@@ -30,7 +30,7 @@
 
   <Target Name="_CopyWixOutputsToPath"
           AfterTargets="AfterBuild"
-          Condition="'$(CopyOutputsToPath)' != '' and $(OutputType) == 'Package'">
+          Condition="'$(CopyOutputsToPath)' != '' and ($(OutputType) == 'Package' or $(OutputType) == 'Vsix')">
     <PropertyGroup>
       <CopyOutputsToPath Condition="!HasTrailingSlash($(CopyOutputsToPath))">$(CopyOutputsToPath)\</CopyOutputsToPath>
       <_PathSuffix Condition="'$(SignedBinariesPath)' != ''">SignedBinariesUnsignedMsi\</_PathSuffix>

Build/Common.Build.settings

@@ -40,6 +40,10 @@
     <BuildRoot Condition="'$(BuildRoot)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))</BuildRoot>
     <BuildRoot Condition="!HasTrailingSlash($(BuildRoot))">$(BuildRoot)\</BuildRoot>
     <TargetsPath>$(BuildRoot)Build</TargetsPath>
+
+    <PackagesPath Condition="'$(PackagesPath)' == ''">$(BUILD_BINARIESDIRECTORY)</PackagesPath>
+    <PackagesPath Condition="'$(PackagesPath)' == ''">$(BuildRoot)\packages\</PackagesPath>
+    <PackagesPath Condition="!HasTrailingSlash($(PackagesPath))">$(PackagesPath)\</PackagesPath>
 
     <!-- BuildOutputRoot contains all build files.
 

EnvironmentSetup.ps1

@@ -21,23 +21,36 @@
 
 [CmdletBinding()]
 param(
-    [string[]] $vstarget
+    [string[]] $vstarget,
+    [switch] $microbuild,
+    [switch] $skipTestHost
 )
 
-If (-not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole(`
-    [Security.Principal.WindowsBuiltInRole] "Administrator")) {
+If ((-not ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole(`
+    [Security.Principal.WindowsBuiltInRole] "Administrator")) -and (-not $microbuild)) {
     Throw "You do not have Administrator rights to run this script. Please re-run as an Administrator."
 }
 
 $rootDir = $PSScriptRoot
 Write-Output "Repository root: $($rootDir)"
 Write-Output ""
 
+
 Import-Module -Force $rootDir\Build\VisualStudioHelpers.psm1
 $target_versions = get_target_vs_versions $vstarget
 
 Write-Output "Setting up NTVS development environment for $([String]::Join(", ", ($target_versions | % { $_.name })))"
 Write-Output "============================================================"
+$packagedir = if ($env:BUILD_BINARIESDIRECTORY) { "$env:BUILD_BINARIESDIRECTORY" } else { "$rootdir\packages" }
+
+# Install microbuild packages
+if ($microbuild) {
+    Write-Output ""
+    Write-Output "Installing Nuget MicroBuild packages"
+
+    & "$rootdir\Nodejs\.nuget\nuget.exe" restore "$rootdir\Nodejs\Setup\swix\packages.config" -PackagesDirectory "$packagedir"
+    exit
+}
 
 # Disable strong name verification for the Node.js Tools binaries
 $skipVerificationKey = If ( $ENV:PROCESSOR_ARCHITECTURE -eq "AMD64") {"EnableSkipVerification.reg" } Else {"EnableSkipVerification86.reg" }
@@ -59,22 +72,24 @@ foreach ($version in $target_versions) {
 }
 
 # Install VSTestHost
-Write-Output ""
-Write-Output "Installing VSTestHost automation"
-$vsTestHostLocation = "$rootDir\Common\Tests\Prerequisites\VSTestHost.msi"
-Write-Output "    $($vsTestHostLocation)"
-
-# Check installed VSTestHost versions
 $shouldInstallVSTestHost = $false
-$gacDir = "${env:windir}\Microsoft.NET\assembly\GAC_MSIL"
-foreach ($version in $target_versions) {
-    $currentVSTestHost = ls $gacDir -Recurse | ?{$_.Name -eq "Microsoft.VisualStudioTools.VSTestHost.$($version.number).dll"}
-
-    $targetVSTestHostVersion = "$($version.number).1.0"
-    if ((-not $currentVSTestHost) -or ($currentVSTestHost.VersionInfo.FileVersion -ne $targetVSTestHostVersion)) {
-        Write-Warning "VSTestHost already installed. Overriding VSTestHost version $($currentVSTestHost.VersionInfo.FileVersion) with target VSTestHostVersion $targetVSTestHostVersion"
-        $shouldInstallVSTestHost = $true
-        break
+if (-not $skipTestHost) {
+    Write-Output ""
+    Write-Output "Installing VSTestHost automation"
+    $vsTestHostLocation = "$rootDir\Common\Tests\Prerequisites\VSTestHost.msi"
+    Write-Output "    $($vsTestHostLocation)"
+
+    # Check installed VSTestHost versions
+    $gacDir = "${env:windir}\Microsoft.NET\assembly\GAC_MSIL"
+    foreach ($version in $target_versions) {
+        $currentVSTestHost = ls $gacDir -Recurse | ?{$_.Name -eq "Microsoft.VisualStudioTools.VSTestHost.$($version.number).dll"}
+
+        $targetVSTestHostVersion = "$($version.number).1.0"
+        if ((-not $currentVSTestHost) -or ($currentVSTestHost.VersionInfo.FileVersion -ne $targetVSTestHostVersion)) {
+            Write-Warning "VSTestHost already installed. Overriding VSTestHost version $($currentVSTestHost.VersionInfo.FileVersion) with target VSTestHostVersion $targetVSTestHostVersion"
+            $shouldInstallVSTestHost = $true
+            break
+        }
     }
 }
 

Nodejs/.nuget/NuGet.Config

@@ -3,4 +3,13 @@
   <solution>
     <add key="disableSourceControlIntegration" value="true" />
   </solution>
+
+  <activePackageSource>
+    <add key="All" value="(Aggregate source)" />
+  </activePackageSource>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="microbuild" value="https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json"/>
+  </packageSources>
+  <disabledPackageSources />
 </configuration>

Nodejs/Product/AssemblyVersion.cs

@@ -15,8 +15,6 @@
 //*********************************************************//
 
 using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
 // If you get compiler errors CS0579, "Duplicate '<attributename>' attribute", check your
 // Properties\AssemblyInfo.cs file and remove any lines duplicating the ones below.
@@ -42,13 +40,7 @@ class AssemblyVersionInfo {
     // This version should never change from "4100.00"; BuildRelease.ps1
     // will replace it with a generated value.
     public const string BuildNumber = "4100.00";
-#if DEV11
-    public const string VSMajorVersion = "11";
-    const string VSVersionSuffix = "2012";
-#elif DEV12
-    public const string VSMajorVersion = "12";
-    const string VSVersionSuffix = "2013";
-#elif DEV14
+#if DEV14
     public const string VSMajorVersion = "14";
     const string VSVersionSuffix = "2015";
 #elif DEV15
@@ -61,7 +53,7 @@ class AssemblyVersionInfo {
     public const string VSVersion = VSMajorVersion + ".0";
 
     // Defaults to "1.0.0.(2012|2013|2015)"
-    public const string StableVersion = ReleaseVersion + "." + VSVersionSuffix;
+    public const string StableVersion = ReleaseVersion + ".0." + VSVersionSuffix;
 
     // Defaults to "1.2.4100.00"
     public const string Version = FileVersion + "." + BuildNumber;

Nodejs/Product/InteractiveWindow/InteractiveWindow.csproj

@@ -180,6 +180,10 @@
   <PropertyGroup>
     <DelaySign>true</DelaySign>
   </PropertyGroup>
+  <PropertyGroup>
+    <CreateVsixContainer>True</CreateVsixContainer>
+    <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
+  </PropertyGroup>
   <Import Project="$(BuildRoot)\Common\Product\ReplWindow\ReplWindow.proj" />
   <Import Project="..\ProjectAfter.settings" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

Nodejs/Product/InteractiveWindow/Properties/AssemblyInfo.cs

@@ -16,12 +16,14 @@
 
 using System.Reflection;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
+using Microsoft.VisualStudio.Shell;
 
 [assembly: AssemblyTitle("Node.js Tools for Visual Studio - Interactive Window")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 
+[assembly: ProvideCodeBase(AssemblyName = "Microsoft.NodejsTools.InteractiveWindow", CodeBase = "Microsoft.NodejsTools.InteractiveWindow.dll", Version = AssemblyVersionInfo.StableVersion)]
+
 [assembly: InternalsVisibleTo("TestUtilities.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("ReplWindowUITests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Nodejs.Tests.UI, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]

Nodejs/Product/InteractiveWindow/source.extension.vsixmanifest

@@ -1,34 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Vsix xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" Version="1.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010">
-  <Identifier Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8">
-    <Name>Node.js Tools - Interactive Window</Name>
-    <Author>Microsoft</Author>
-    <Version>1.2</Version>
-    <Description xml:space="preserve">Node.js Tools - Interactive Window</Description>
-    <MoreInfoUrl>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfoUrl>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="29102E6C-34F2-4FF1-BA2F-C02ADE3846E8" Version="1.2" Language="en-US" Publisher="Microsoft" />
+    <DisplayName>Node.js Tools - Interactive Window</DisplayName>
+    <Description xml:space="preserve">Node.js Tools - Interactive Window.</Description>
+    <MoreInfo>http://go.microsoft.com/fwlink/?LinkId=785971</MoreInfo>
     <GettingStartedGuide>http://go.microsoft.com/fwlink/?LinkId=785972</GettingStartedGuide>
-    <Locale>1033</Locale>
-    <InstalledByMsi>true</InstalledByMsi>
     <Icon>NodeJS.ico</Icon>
     <PreviewImage>NodeJS_200x.png</PreviewImage>
-    <SystemComponent>false</SystemComponent>
-    <SupportedProducts>
-      <VisualStudio Version="11.0">
-        <Edition>Pro</Edition>
-        <Edition>VWDExpress</Edition>
-      </VisualStudio>
-    </SupportedProducts>
-    <SupportedFrameworkRuntimeEdition MinVersion="4.0" />
-  </Identifier>
-  <References>
-    <Reference Id="Microsoft.VisualStudio.MPF" MinVersion="10.0">
-      <Name>Visual Studio MPF</Name>
-    </Reference>
-  </References>
-  <Content>
-    <VsPackage>|%CurrentProject%;PkgdefProjectOutputGroup|</VsPackage>
-    <MefComponent>|%CurrentProject%|</MefComponent>
-    <Assembly AssemblyName="|%CurrentProject%;_GetAssemblyName|">|%CurrentProject%|</Assembly>
-  </Content>
-
-</Vsix>
+  </Metadata>
+  <!-- Version="11.0" specifies the minimum (not the maximum) version, and the
+       Id specifications are minimums; any SKU equal or 'higher' will accept
+       them. -->
+  <Installation>
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Community" />
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinExpress" />
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VWDExpress" />
+    <InstallationTarget Version="[14.0.0,16.0)" Id="Microsoft.VisualStudio.VSWinDesktopExpress" />
+  </Installation>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.Package" Path="|%CurrentProject%|" d:Source="Project" d:ProjectName="%CurrentProject%" />
+    <Asset Type="Microsoft.VisualStudio.Assembly" Path="|%CurrentProject%|" />
+    <Asset Type="Microsoft.VisualStudio.MefComponent" Path="|%CurrentProject%|" />
+  </Assets>
+</PackageManifest>

Nodejs/Product/Nodejs/Microsoft.NodejsTools.targets

@@ -57,7 +57,7 @@
   <Target Name="CopyFilesToOutputDirectory"/>
 
   <Target Name="CoreCompile">
-    <Error Condition="!Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets') And '$(EnableTypeScript)' == 'true'" Text="TypeScript is not installed but TypeScript support is enabled in this project.  Please download and install TypeScript http://go.microsoft.com/fwlink/?LinkID=393159&amp;clcid=0x409."></Error>
+    <Error Condition="!Exists('$(VSToolsPath)\TypeScript\Microsoft.TypeScript.targets') And '$(EnableTypeScript)' == 'true' And '$(VisualStudioVersion)' != '15.0'" Text="TypeScript is not installed but TypeScript support is enabled in this project.  Please download and install TypeScript http://go.microsoft.com/fwlink/?LinkID=393159&amp;clcid=0x409."></Error>
     <PropertyGroup>
       <_NodeModulesContentProperty>@(NodeModulesContent)</_NodeModulesContentProperty>
     </PropertyGroup>