Merge pull request #1564 from Microsoft/master

sync master to v1.3

Author: paulvanbrenk

Nodejs/Product/Nodejs/ProjectTemplates/CloudService/CloudService.vstemplate

@@ -1,30 +1,30 @@
-<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
-  <TemplateData>
-    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3065"/>
-    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
-    <ProjectType>JavaScript</ProjectType>
-    <TemplateGroupID>CloudServiceProject</TemplateGroupID>
-    <TemplateID>Microsoft.CloudServiceProject.CloudService_js</TemplateID>
-    <RequiredFrameworkVersion>3.5</RequiredFrameworkVersion>
-    <SortOrder>30</SortOrder>
-    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
-    <CreateNewFolder>true</CreateNewFolder>
-    <DefaultName>AzureCloudService</DefaultName>
-    <ProvideDefaultName>true</ProvideDefaultName>
-    <Icon>cloudservice.ico</Icon>
-    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
-    <LocationField>Enabled</LocationField>
-    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
-  </TemplateData>
-  <TemplateContent>
-    <Project File="CloudService.ccproj" ReplaceParameters="true">
-      <ProjectItem ReplaceParameters="true">ServiceDefinition.csdef</ProjectItem>
-      <ProjectItem ReplaceParameters="true">ServiceConfiguration.Local.cscfg</ProjectItem>
-      <ProjectItem ReplaceParameters="true">ServiceConfiguration.Cloud.cscfg</ProjectItem>
-    </Project>
-  </TemplateContent>
-  <WizardExtension>
-    <Assembly>Microsoft.NodejsTools.ProjectWizard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
-    <FullClassName>Microsoft.NodejsTools.ProjectWizard.CloudServiceWizard</FullClassName>
-  </WizardExtension>
+<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3065"/>
+    <Description Package="{FE8A8C3D-328A-476D-99F9-2A24B75F8C7F}" ID="3067"/>
+    <ProjectType>JavaScript</ProjectType>
+    <TemplateGroupID>CloudServiceProject</TemplateGroupID>
+    <TemplateID>Microsoft.CloudServiceProject.CloudService_js</TemplateID>
+    <RequiredFrameworkVersion>3.5</RequiredFrameworkVersion>
+    <SortOrder>30</SortOrder>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>AzureCloudService</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+    <Icon>cloudservice.ico</Icon>
+    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
+    <LocationField>Enabled</LocationField>
+    <EnableLocationBrowseButton>true</EnableLocationBrowseButton>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="CloudService.ccproj" ReplaceParameters="true">
+      <ProjectItem ReplaceParameters="true">ServiceDefinition.csdef</ProjectItem>
+      <ProjectItem ReplaceParameters="true">ServiceConfiguration.Local.cscfg</ProjectItem>
+      <ProjectItem ReplaceParameters="true">ServiceConfiguration.Cloud.cscfg</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>Microsoft.NodejsTools.ProjectWizard, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.NodejsTools.ProjectWizard.CloudServiceWizard</FullClassName>
+  </WizardExtension>
 </VSTemplate>

appveyor.yml

@@ -4,14 +4,15 @@
     except:
     - v1.1.x
     - v1.2.x
+    - v1.3.x
   skip_tags: true
   image: Visual Studio 2015
   environment:
     matrix:
-    - nodejs_version: 4
+    - nodejs_version: Stable
       vs_version: 14.0
       architecture: x64
-    - nodejs_version: 5
+    - nodejs_version: LTS
       vs_version: 14.0
       architecture: x86
   install: &default_install_script
@@ -45,6 +46,25 @@
     - path: NTVS_Out
       name: NtvsOut
       type: zip
+-
+  version: 1.0.{build}
+  branches:
+    only:
+    - v1.3.x
+  skip_tags: true
+  image: Visual Studio 2015
+  environment:
+    matrix:
+    - nodejs_version: 6
+      vs_version: 14.0
+      architecture: x64
+    - nodejs_version: 7
+      vs_version: 14.0
+      architecture: x86
+  install: *default_install_script
+  build_script: *default_build_script
+  test_script: *default_test_script
+  artifacts: *default_artifacts
 -
   version: 1.0.{build}
   branches: