Updating Templates and Wizards for 1.1.18 release (#191)

Templates/CSharp/Desktop/MSTestDesktopCSharp.csproj

@@ -57,10 +57,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestAdapter.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestAdapter.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestFramework.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestFramework.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">

Templates/CSharp/Desktop/ProjectTemplates/CSharp/Test/MSTestV2Desktop.vstemplate

@@ -25,8 +25,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="mstestProjectTemplate" isPreunzipped="false" >
-      <package id="MSTest.TestAdapter" version="1.1.17" skipAssemblyReferences="false"  />
-      <package id="MSTest.TestFramework" version="1.1.17" skipAssemblyReferences="false" />
+      <package id="MSTest.TestAdapter" version="1.1.18" skipAssemblyReferences="false"  />
+      <package id="MSTest.TestFramework" version="1.1.18" skipAssemblyReferences="false" />
     </packages>
   </WizardData>
 </VSTemplate>

Templates/CSharp/Desktop/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="mstestProjectTemplate" Version="15.0.26127.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="mstestProjectTemplate" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 Templates</DisplayName>
     <Description xml:space="preserve">Provides Visual Studio project template for MSTest V2.</Description>
     <License>DesktopTemplateLicense.rtf</License>

Templates/CSharp/UWP/MSTestUWPCSharp.csproj

@@ -61,10 +61,10 @@
     </Content>
     <Content Include="UWP.xml" />
     <None Include="packages.config" />
-    <Content Include="packages\MSTest.TestFramework.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestFramework.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestAdapter.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestAdapter.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">

Templates/CSharp/UWP/ProjectTemplates/CSharp/Windows UAP/MSTestV2UWP.vstemplate

@@ -54,8 +54,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="mstestUniversalProjectTemplate" isPreunzipped="false" >
-        <package id="MSTest.TestAdapter" version="1.1.17" skipAssemblyReferences="false"  />
-        <package id="MSTest.TestFramework" version="1.1.17" skipAssemblyReferences="false" />
+        <package id="MSTest.TestAdapter" version="1.1.18" skipAssemblyReferences="false"  />
+        <package id="MSTest.TestFramework" version="1.1.18" skipAssemblyReferences="false" />
     </packages>
   </WizardData>
 </VSTemplate>

Templates/CSharp/UWP/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="mstestUniversalProjectTemplate" Version="15.0.26127.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="mstestUniversalProjectTemplate" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 Templates (Universal Windows)</DisplayName>
     <Description xml:space="preserve">Provides Visual Studio project template for MSTest V2 (For UWP applications).</Description>
     <License>UniversalTemplateLicense.rtf</License>

Templates/VisualBasic/Desktop/MSTestDesktopVB.csproj

@@ -57,10 +57,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestAdapter.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestAdapter.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestFramework.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestFramework.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">
@@ -81,4 +81,4 @@
   <PropertyGroup>
     <RunCodeAnalysisOnThisProject>false</RunCodeAnalysisOnThisProject>
   </PropertyGroup>
-</Project>
+</Project>

Templates/VisualBasic/Desktop/ProjectTemplates/VisualBasic/Test/MSTestV2DesktopVB.vstemplate

@@ -31,8 +31,8 @@
   </WizardExtension>
   <WizardData>
     <packages repository="extension" repositoryId="MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9" isPreunzipped="false" >
-      <package id="MSTest.TestAdapter" version="1.1.17" skipAssemblyReferences="false"  />
-      <package id="MSTest.TestFramework" version="1.1.17" skipAssemblyReferences="false" />
+      <package id="MSTest.TestAdapter" version="1.1.18" skipAssemblyReferences="false"  />
+      <package id="MSTest.TestFramework" version="1.1.18" skipAssemblyReferences="false" />
     </packages>
   </WizardData>
 </VSTemplate>

Templates/VisualBasic/Desktop/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9" Version="15.0.26127.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 Templates for Visual Basic</DisplayName>
     <Description xml:space="preserve">Provides Visual Studio project template for MSTest V2(Visual Basic).</Description>
     <License>DesktopTemplateLicense.rtf</License>

Templates/VisualBasic/UWP/MSTestUWPVB.csproj

@@ -61,10 +61,10 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="packages.config" />
-    <Content Include="packages\MSTest.TestAdapter.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestAdapter.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="packages\MSTest.TestFramework.1.1.17.nupkg">
+    <Content Include="packages\MSTest.TestFramework.1.1.18.nupkg">
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="source.extension.vsixmanifest">
@@ -78,4 +78,4 @@
       "$(ProjectDir)$(TestFxRoot)tools\ZipItems\ZipItems.exe" "$(ProjectDir)UWP_VB.xml" "$(ProjectDir)\" "$(ProjectDir)ProjectTemplates\VisualBasic\Windows UAP\UWP_VB.zip"
     </PreBuildEvent>
   </PropertyGroup>
-</Project>
+</Project>

Templates/VisualBasic/UWP/ProjectTemplates/VisualBasic/Windows UAP/MSTestV2UWP_VB.vstemplate

@@ -54,8 +54,8 @@
   </WizardExtension> 
   <WizardData>
 	<packages repository="extension" repositoryId="MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1" isPreunzipped="false" >
-        <package id="MSTest.TestAdapter" version="1.1.17" skipAssemblyReferences="false"  />
-        <package id="MSTest.TestFramework" version="1.1.17" skipAssemblyReferences="false" />
+        <package id="MSTest.TestAdapter" version="1.1.18" skipAssemblyReferences="false"  />
+        <package id="MSTest.TestFramework" version="1.1.18" skipAssemblyReferences="false" />
     </packages>
   </WizardData>
 </VSTemplate>

Templates/VisualBasic/UWP/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1" Version="15.0.26128.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 Templates for VB (Universal Windows)</DisplayName>
     <Description xml:space="preserve">Provides Visual Studio project template for MSTest V2 Visual Basic(For UWP applications).</Description>
     <License>UniversalTemplateLicense.rtf</License>

WizardExtensions/MSTestv2IntelliTestExtension/MSTestv2TestFramework.cs

@@ -103,8 +103,8 @@ public override ICountable<ShortReferenceAssemblyName> References
             get
             {
                 return Indexable.Two(
-                    new ShortReferenceAssemblyName(ShortAssemblyName.FromName("MSTest.TestAdapter"), "1.1.17", AssemblyReferenceType.NugetReference),
-                    new ShortReferenceAssemblyName(ShortAssemblyName.FromName("MSTest.TestFramework"), "1.1.17", AssemblyReferenceType.NugetReference));
+                    new ShortReferenceAssemblyName(ShortAssemblyName.FromName("MSTest.TestAdapter"), "1.1.18", AssemblyReferenceType.NugetReference),
+                    new ShortReferenceAssemblyName(ShortAssemblyName.FromName("MSTest.TestFramework"), "1.1.18", AssemblyReferenceType.NugetReference));
             }
         }
 

WizardExtensions/MSTestv2IntelliTestExtensionPackage/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="MSTestV2IntelliTestExtensionPackage.Microsoft.935a8bb8-364d-46ce-a02f-fbb74f2d9188" Version="15.0.26125.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="MSTestV2IntelliTestExtensionPackage.Microsoft.935a8bb8-364d-46ce-a02f-fbb74f2d9188" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 IntelliTest Extension</DisplayName>
     <Description xml:space="preserve">Allows developers to generate IntelliTest using MSTest V2.</Description>
     <License>IntelliTestExtensionLicense.rtf</License>

WizardExtensions/MSTestv2UnitTestExtension/MSTestv2SolutionManager.cs

@@ -51,8 +51,8 @@ protected override void OnUnitTestProjectCreated(Project unitTestProject, CodeFu
 
             base.OnUnitTestProjectCreated(unitTestProject, sourceMethod);
 
-            this.EnsureNuGetReference(unitTestProject, "MSTest.TestAdapter", "1.1.17");
-            this.EnsureNuGetReference(unitTestProject, "MSTest.TestFramework", "1.1.17");
+            this.EnsureNuGetReference(unitTestProject, "MSTest.TestAdapter", "1.1.18");
+            this.EnsureNuGetReference(unitTestProject, "MSTest.TestFramework", "1.1.18");
 
             VSProject2 vsp = unitTestProject.Object as VSProject2;
             if (vsp != null)

WizardExtensions/MSTestv2UnitTestExtensionPackage/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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="MSTestV2UnitTestExtensionPackage.Microsoft.632139eb-968c-47ce-8667-f0898f00833f" Version="15.0.26125.00" Language="en-US" Publisher="Microsoft" />
+    <Identity Id="MSTestV2UnitTestExtensionPackage.Microsoft.632139eb-968c-47ce-8667-f0898f00833f" Version="15.0.26130.00" Language="en-US" Publisher="Microsoft" />
     <DisplayName>MSTest V2 Create Unit Test Extension</DisplayName>
     <Description xml:space="preserve">Allows developers to create unit test using MSTest V2.</Description>
     <License>CreateUnitTestExtensionLicense.rtf</License>

scripts/UpdateTemplates.ps1

@@ -85,10 +85,12 @@ function Replace-Nugets
 {
     Write-Log "Replacing the nuget packages in the templates"
 
-    $DesktopPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "Desktop\Packages"
-    $UWPPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "UWP\Packages"
+    $CSDesktopPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\Desktop\Packages"
+    $CSUWPPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\UWP\Packages"
+	$VBDesktopPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\Desktop\Packages"
+    $VBUWPPackagesDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\UWP\Packages"
 
-    $packagesDir = ($DesktopPackagesDir, $UWPPackagesDir)
+    $packagesDir = ($CSDesktopPackagesDir, $CSUWPPackagesDir, $VBDesktopPackagesDir, $VBUWPPackagesDir)
     foreach($dir in $packagesDir)
     {
         # Delete the old nuget packages.
@@ -115,16 +117,18 @@ function Edit-Templates
     # 3. The vsixmanifest file version bump.
 
     Write-Log "   Editing vstemplate artifacts..."
-    $DesktopProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "Desktop\ProjectTemplates\CSharp\Test"
-    $UWPProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "UWP\ProjectTemplates\CSharp\Windows UAP"
+    $CSDesktopProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\Desktop\ProjectTemplates\CSharp\Test"
+    $CSUWPProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\UWP\ProjectTemplates\CSharp\Windows UAP"
+	$VBDesktopProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\Desktop\ProjectTemplates\VisualBasic\Test"
+    $VBUWPProjectTemplateDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\UWP\ProjectTemplates\VisualBasic\Windows UAP"
 
     $TestFrameworkvstemplateRegex = [regex]"package id=""MSTest.TestFramework"" version=(.+) skipAssemblyReferences=""false"""
     $TestAdaptervstemplateRegex = [regex]"package id=""MSTest.TestAdapter"" version=(.+) skipAssemblyReferences=""false"""
 
     $TestFrameworkvstemplateReplacement = "package id=""MSTest.TestFramework"" version=""$global:TestFrameworkVersion"" skipAssemblyReferences=""false"""
     $TestAdaptervstemplateReplacement = "package id=""MSTest.TestAdapter"" version=""$global:TestAdapterVersion"" skipAssemblyReferences=""false"""
 
-    $projecttemplatesDirs = @($DesktopProjectTemplateDir, $UWPProjectTemplateDir)
+    $projecttemplatesDirs = @($CSDesktopProjectTemplateDir, $CSUWPProjectTemplateDir, $VBDesktopProjectTemplateDir, $VBUWPProjectTemplateDir)
     foreach($templateDir in $projecttemplatesDirs)
     {
         $files = (Get-ChildItem -File $templateDir -Filter *.vstemplate).FullName
@@ -139,16 +143,18 @@ function Edit-Templates
     }
 
     Write-Log "   Editing csproj artifacts..."
-    $DesktopTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "Desktop"
-    $UWPTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "UWP"
+    $CSDesktopTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\Desktop"
+    $CSUWPTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "CSharp\UWP"
+    $VBDesktopTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\Desktop"
+    $VBUWPTemplateVSIXDir = Join-Path $env:MSTEST_TEMPLATES_DIR "VisualBasic\UWP"
 
     $TestFrameworkcsprojRegex = [regex]"Content Include=""packages\\MSTest.TestFramework.(.+).nupkg"""
     $TestAdaptercsprojRegex = [regex]"Content Include=""packages\\MSTest.TestAdapter.(.+).nupkg"""
 
     $TestFrameworkcsprojReplacement = "Content Include=""packages\MSTest.TestFramework.$global:TestFrameworkVersion.nupkg"""
     $TestAdaptercsprojReplacement = "Content Include=""packages\MSTest.TestAdapter.$global:TestAdapterVersion.nupkg"""
 
-    $templatesVSIXDirs = @($DesktopTemplateVSIXDir, $UWPTemplateVSIXDir)
+    $templatesVSIXDirs = @($CSDesktopTemplateVSIXDir, $CSUWPTemplateVSIXDir, $VBDesktopTemplateVSIXDir, $VBUWPTemplateVSIXDir)
     foreach($templateDir in $templatesVSIXDirs)
     {
         $files = (Get-ChildItem -File $templateDir -Filter *.csproj).FullName
@@ -164,11 +170,15 @@ function Edit-Templates
 
     Write-Log "   Editing the template version in the vsixmanifest with $TemplateVersion..."
 
-    $DesktopManifestRegex = [regex]"Identity Id=""mstestProjectTemplate"" Version=(.+) Language"
-    $UWPManifestRegex = [regex]"Identity Id=""mstestUniversalProjectTemplate"" Version=(.+) Language"
+    $CSDesktopManifestRegex = [regex]"Identity Id=""mstestProjectTemplate"" Version=(.+) Language"
+    $CSUWPManifestRegex = [regex]"Identity Id=""mstestUniversalProjectTemplate"" Version=(.+) Language"
+	$VBDesktopManifestRegex = [regex]"Identity Id=""MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9"" Version=(.+) Language"
+    $VBUWPManifestRegex = [regex]"Identity Id=""MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1"" Version=(.+) Language"
 
-    $DesktopManifestReplacement = "Identity Id=""mstestProjectTemplate"" Version=""$TemplateVersion"" Language"
-    $UWPManifestReplacement = "Identity Id=""mstestUniversalProjectTemplate"" Version=""$TemplateVersion"" Language"
+    $CSDesktopManifestReplacement = "Identity Id=""mstestProjectTemplate"" Version=""$TemplateVersion"" Language"
+    $CSUWPManifestReplacement = "Identity Id=""mstestUniversalProjectTemplate"" Version=""$TemplateVersion"" Language"
+    $VBDesktopManifestReplacement = "Identity Id=""MSTestDesktopVB.Microsoft.c6c7fff6-20cb-405d-9ad4-a60a6d0c55d9"" Version=""$TemplateVersion"" Language"
+    $VBUWPManifestReplacement = "Identity Id=""MSTestUWPVB.Microsoft.3dc1d5cd-bbfb-456f-965e-5b962ad063d1"" Version=""$TemplateVersion"" Language"
 
     foreach($templateDir in $templatesVSIXDirs)
     {
@@ -177,8 +187,10 @@ function Edit-Templates
         foreach($file in $files){
             Write-Verbose "Editing $file"
             $fileContent = Get-Content $file
-            $fileContent = $fileContent -replace $DesktopManifestRegex,$DesktopManifestReplacement
-            $fileContent = $fileContent -replace $UWPManifestRegex,$UWPManifestReplacement
+            $fileContent = $fileContent -replace $CSDesktopManifestRegex,$CSDesktopManifestReplacement
+            $fileContent = $fileContent -replace $CSUWPManifestRegex,$CSUWPManifestReplacement
+			$fileContent = $fileContent -replace $VBDesktopManifestRegex,$VBDesktopManifestReplacement
+            $fileContent = $fileContent -replace $VBUWPManifestRegex,$VBUWPManifestReplacement
             Out-File $file -InputObject $fileContent -Encoding default
         }
     }