Updated to work with VS2017 and VS2019.

Added setup snippet. Changed code to use the fluent notation, to drive users in that direction Added the test adapter, as that is now needed for all test projects Updated to use latest 3.11 of NUnit.
2019-03-03 20:15:46 +01:00 · 2019-03-03 20:15:46 +01:00 · f277d7a453
--- a/nunit.templates.sln
+++ b/nunit.templates.sln
@ -15,10 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Rebracer.xml = Rebracer.xml
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.csharp", "nunit.tests.csharp\nunit.tests.csharp.csproj", "{8EDF4429-251A-416D-BB68-93F227191BCF}"
-EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "nunit.tests.vb", "nunit.tests.vb\nunit.tests.vb.vbproj", "{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "xamarin", "xamarin", "{B5138D8C-725E-425D-ADCF-C298F6B88F95}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.Droid", "xamarin\nunit.tests.Droid\nunit.tests.Droid.csproj", "{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}"
@ -27,24 +23,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.iOS", "xamarin\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nunit.tests.uwp", "xamarin\nunit.tests.uwp\nunit.tests.uwp.csproj", "{159A55AF-9531-4107-8444-CA9C96107EF5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit.tests.csharp", "nunit.tests.csharp", "{2A0B82E3-6197-4605-8561-6AC3A32C5579}"
-	ProjectSection(SolutionItems) = preProject
-		nunit.tests.csharp\_preprocess.xml = nunit.tests.csharp\_preprocess.xml
-		nunit.tests.csharp\nunit.png = nunit.tests.csharp\nunit.png
-		nunit.tests.csharp\nunit.tests.csharp.csproj = nunit.tests.csharp\nunit.tests.csharp.csproj
-		nunit.tests.csharp\TestClass.cs = nunit.tests.csharp\TestClass.cs
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Definitions", "_Definitions", "{7B9C40FE-8A89-4A3A-9C77-B7C13A781676}"
-	ProjectSection(SolutionItems) = preProject
-		nunit.tests.csharp\_Definitions\_project.vstemplate.xml = nunit.tests.csharp\_Definitions\_project.vstemplate.xml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{E367F764-ECE8-4480-A42E-DF00D5E2C5CC}"
-	ProjectSection(SolutionItems) = preProject
-		nunit.tests.csharp\Properties\AssemblyInfo.cs = nunit.tests.csharp\Properties\AssemblyInfo.cs
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@ -121,54 +99,6 @@ Global
 		{0660DC45-821A-4763-9818-4D6798A3A253}.Release|x64.Build.0 = Release|Any CPU
 		{0660DC45-821A-4763-9818-4D6798A3A253}.Release|x86.ActiveCfg = Release|Any CPU
 		{0660DC45-821A-4763-9818-4D6798A3A253}.Release|x86.Build.0 = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|ARM.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x64.ActiveCfg = Release|Any CPU
-		{8EDF4429-251A-416D-BB68-93F227191BCF}.Release|x86.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|x64.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Ad-Hoc|x86.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|ARM.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|iPhone.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|x64.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.AppStore|x86.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|iPhone.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|iPhone.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{6B1D4E4F-82C6-4A3F-95C6-EA1EE2C0C3CB}.Release|x86.ActiveCfg = Release|Any CPU
 		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
 		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|ARM.ActiveCfg = Release|Any CPU
 		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
@ -249,8 +179,6 @@ Global
 		{AD7B78B0-AE51-4FB7-9B11-4E22A2B538CA} = {B5138D8C-725E-425D-ADCF-C298F6B88F95}
 		{D2CED8F0-7A76-454D-B5F7-9E8B9FE6A58E} = {B5138D8C-725E-425D-ADCF-C298F6B88F95}
 		{159A55AF-9531-4107-8444-CA9C96107EF5} = {B5138D8C-725E-425D-ADCF-C298F6B88F95}
-		{7B9C40FE-8A89-4A3A-9C77-B7C13A781676} = {2A0B82E3-6197-4605-8561-6AC3A32C5579}
-		{E367F764-ECE8-4480-A42E-DF00D5E2C5CC} = {2A0B82E3-6197-4605-8561-6AC3A32C5579}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {722CB21C-51BA-49C2-B37C-7A6E5785EA40}
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -4,7 +4,7 @@
    
    <DefaultName>SetupFixture.cs</DefaultName>
    <Name>NUnit Setup Fixture</Name>
-    <Description>A class that contains code that is run before and after all the tests in the assembly</Description>
+    <Description>A class that contains code that is run before and after all the tests in the assembly (C#)</Description>
    <Icon>icon.png</Icon>
    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
    <TemplateID>4dfb61f8-ba75-4bf1-9c96-e8dc06021b4c</TemplateID>
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -4,7 +4,7 @@

    <DefaultName>SetupFixture.vb</DefaultName>
    <Name>NUnit Setup Fixture</Name>
-    <Description>A class that contains code that is run before and after all the tests in the assembly</Description>
+    <Description>A class that contains code that is run before and after all the tests in the assembly (VB)</Description>
    <Icon>icon.png</Icon>
    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
    <TemplateID>05535130-0825-46af-a629-6598251c35cc</TemplateID>
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -4,7 +4,7 @@

    <DefaultName>TestClass.cs</DefaultName>
    <Name>NUnit Test Fixture</Name>
-    <Description>A class that contains NUnit unit tests</Description>
+    <Description>A class that contains NUnit unit tests (C#) </Description>
    <Icon>icon.png</Icon>
    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
    <TemplateID>9936e07b-28c2-44ad-99da-d00b06c4e168</TemplateID>
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -4,7 +4,7 @@

    <DefaultName>TestClass.vb</DefaultName>
    <Name>NUnit Test Fixture</Name>
-    <Description>A class that contains NUnit unit tests</Description>
+    <Description>A class that contains NUnit unit tests (VB)</Description>
    <Icon>icon.png</Icon>
    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
    <TemplateID>cb5f52ba-bd65-42e6-bbbf-f58c96cfd3c0</TemplateID>
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -1,9 +1,5 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// NUnit3 Tests,  see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation 
+using NUnit.Framework;

 namespace $rootnamespace$
 {
@ -14,7 +10,8 @@ namespace $rootnamespace$
        public void TestMethod()
        {
            // TODO: Add your test code here
-            Assert.Pass("Your first passing test");
+            var answer = 42;
+            Assert.That(answer,Is.EqualTo(42),"Some useful error message");
        }
    }
 }
--- a/nunit.templates/ItemTemplates/Test/NUnit
+++ b/nunit.templates/ItemTemplates/Test/NUnit
@ -1,5 +1,5 @@
 Option Explicit On
-
+' NUnit3 Tests,  see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation 
 Imports System
 Imports NUnit.Framework

--- a/nunit.templates/Packages/NUnit.3.6.1.nupkg
+++ b/nunit.templates/Packages/NUnit.3.6.1.nupkg
--- a/nunit.templates/Snippets/CSharp/NUnit/nsetup.snippet
+++ b/nunit.templates/Snippets/CSharp/NUnit/nsetup.snippet
@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CodeSnippets xmlns="http://schemas.microsoft.com/VisualStudio/2005/CodeSnippet">
+  <CodeSnippet Format="1.0.0">
+    <Header>
+      <SnippetTypes>
+        <SnippetType>Expansion</SnippetType>
+      </SnippetTypes>
+      <Title>NUnit SetUp Method</Title>
+      <Author>Terje Sandstrom</Author>
+      <Description>Code snippet for a setup method</Description>
+      <HelpUrl>
+      </HelpUrl>
+      <Shortcut>nsetup</Shortcut>
+    </Header>
+    <Snippet>
+      <Imports>
+        <Import>
+          <Namespace>NUnit.Framework</Namespace>
+        </Import>
+      </Imports>
+      <References>
+        <Reference>
+          <Assembly>nunit.framework.dll</Assembly>
+        </Reference>
+      </References>
+      <Declarations>
+        <Literal Editable="true">
+          <ID>name</ID>
+          <ToolTip>Replace with the name of the setup method</ToolTip>
+          <Default>TestSetUp</Default>
+          <Function>
+          </Function>
+        </Literal>
+        <Literal Editable="false">
+          <ID>SetUp</ID>
+          <ToolTip>
+          </ToolTip>
+          <Default>
+          </Default>
+          <Function>SimpleTypeName(global::NUnit.Framework.Test)</Function>
+        </Literal>
+      </Declarations>
+      <Code Language="csharp" Delimiter="$">
+        <![CDATA[      [$SetUp$]
+      public void $name$()
+      {
+          // Add code that runs before each test method
+          $end$
+      }]]></Code>
+    </Snippet>
+  </CodeSnippet>
+</CodeSnippets>
--- a/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet
+++ b/nunit.templates/Snippets/CSharp/NUnit/ntest.snippet
@ -40,9 +40,12 @@
          <Function>SimpleTypeName(global::NUnit.Framework.Test)</Function>
        </Literal>
      </Declarations>
-      <Code Language="csharp" Delimiter="$"><![CDATA[      [$Test$]
+      <Code Language="csharp" Delimiter="$">
+        <![CDATA[      [$Test$]
      public void $name$()
      {
+          var answer = 42;
+          Assert.That(answer,Is.EqualTo(42),"Some useful error message");
          $end$
      }]]></Code>
    </Snippet>
--- a/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet
+++ b/nunit.templates/Snippets/CSharp/NUnit/ntestcase.snippet
@ -61,9 +61,12 @@
          <Function>SimpleTypeName(global::NUnit.Framework.TestCase)</Function>
        </Literal>
      </Declarations>
-      <Code Language="csharp" Delimiter="$"><![CDATA[      [$TestCase$($params$)]
+      <Code Language="csharp" Delimiter="$">
+        <![CDATA[      [$TestCase$($params$)]
      public void $name$($type$ $param$$end$)
      {
+          var answer = 42;
+          Assert.That(answer,Is.EqualTo(42),"Some useful error message");
      }]]></Code>
    </Snippet>
  </CodeSnippet>
--- a/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet
+++ b/nunit.templates/Snippets/CSharp/NUnit/ntestfixture.snippet
@ -41,12 +41,15 @@
          <Function>SimpleTypeName(global::NUnit.Framework.Test)</Function>
        </Literal>
      </Declarations>
-      <Code Language="csharp"><![CDATA[[$TestFixture$]
+      <Code Language="csharp">
+            <![CDATA[[$TestFixture$]
      public class $cname$Test
      {
          [$Test$]
          public void $tname$()
          {
+               var answer = 42;
+               Assert.That(answer,Is.EqualTo(42),"Some useful error message");
              $end$
          }
      }]]></Code>
--- a/nunit.templates/nunit.templates.csproj
+++ b/nunit.templates/nunit.templates.csproj
@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" />
+  <Import Project="..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.props')" />
  <PropertyGroup>
    <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@ -66,9 +68,10 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <DeployExtension>False</DeployExtension>
  </PropertyGroup>
  <PropertyGroup Label="TemplateBuilder">
-    <TemplateBuilderTargets Condition=" '$(TemplateBuilderTargets)'=='' ">$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\TemplateBuilder.1.1.3\tools\ligershark.templates.targets ))</TemplateBuilderTargets>
+    <TemplateBuilderTargets Condition=" '$(TemplateBuilderTargets)'=='' ">$([System.IO.Path]::GetFullPath( $(MSBuildProjectDirectory)\..\packages\TemplateBuilder.1.1.6.1\tools\ligershark.templates.targets ))</TemplateBuilderTargets>
  </PropertyGroup>
  <ItemGroup>
    <Content Include="ItemTemplates\Test\NUnit Setup Fixture\icon.png" />
@ -96,11 +99,9 @@
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
-    <None Include="packages.config" />
-    <Content Include="Packages\NUnit.3.6.1.nupkg">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
    <Content Include="Packages\pclstorage.1.0.2.nupkg">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
@ -143,6 +144,9 @@
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
      <IncludeInVSIX>true</IncludeInVSIX>
    </Content>
+    <None Include="Snippets\CSharp\NUnit\nsetup.snippet">
+      <SubType>Designer</SubType>
+    </None>
    <None Include="source.extension.vsixmanifest">
      <SubType>Designer</SubType>
    </None>
@ -152,9 +156,12 @@
    <Content Include="stylesheet.css" />
  </ItemGroup>
  <ItemGroup>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
-    <Reference Include="TemplateBuilder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TemplateBuilder.1.1.3\lib\TemplateBuilder.dll</HintPath>
+    <Reference Include="TemplateBuilder, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\TemplateBuilder.1.1.6.1\lib\TemplateBuilder.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
@ -193,10 +200,12 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
  </Target>
-  <Import Project="..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.14.0.23-pre\build\Microsoft.VisualStudio.Sdk.BuildTasks.14.0.targets')" />
+  <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.9.3039\build\Microsoft.VSSDK.BuildTools.targets')" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
  <Target Name="BeforeBuild">
--- a/nunit.templates/packages.config
+++ b/nunit.templates/packages.config
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualStudio.Sdk.BuildTasks.14.0" version="14.0.23-pre" targetFramework="net45" developmentDependency="true" />
-  <package id="TemplateBuilder" version="1.1.3" targetFramework="net45" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.9.3039" targetFramework="net45" developmentDependency="true" />
+  <package id="NUnit" version="3.11.0" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.13.0" targetFramework="net45" />
+  <package id="TemplateBuilder" version="1.1.6.1" targetFramework="net45" />
 </packages>
--- a/nunit.templates/source.extension.vsixmanifest
+++ b/nunit.templates/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="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef" Version="1.4" Language="en-US" Publisher="Rob Prouse" />
+        <Identity Id="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef" Version="1.5" Language="en-US" Publisher="Rob Prouse" />
        <DisplayName>NUnit VS Templates</DisplayName>
        <Description xml:space="preserve">Provides Visual Studio project and item templates for NUnit 3 along with code snippets.</Description>
        <MoreInfo>https://github.com/nunit/nunit-vs-templates</MoreInfo>
@ -22,7 +22,8 @@
        <Asset Type="Microsoft.VisualStudio.ItemTemplate" Path="Output\ItemTemplates" />
        <Asset Type="Microsoft.VisualStudio.ProjectTemplate" Path="Output\ProjectTemplates" />
        <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="File" Path="snippets.pkgdef" />
-        <Asset Type="nunit.3.6.1.nupkg" d:Source="File" Path="Packages\NUnit.3.6.1.nupkg" d:VsixSubPath="Packages" />
+        <Asset Type="nunit.3.11.0.nupkg" d:Source="File" Path="Packages\NUnit.3.11.0\NUnit.3.11.0.nupkg" d:VsixSubPath="Packages" />
+        <Asset Type="nunit3testadapter.3.13.0.nupkg" d:Source="File" Path="Packages\nunit3testadapter.3.13.0\NUnit.3.13.0.nupkg" d:VsixSubPath="Packages" />
        <Asset Type="pclstorage.1.0.2.nupkg" d:Source="File" Path="Packages\pclstorage.1.0.2.nupkg" d:VsixSubPath="Packages" />
        <Asset Type="xamarin.forms.1.5.0.6447.nupkg" d:Source="File" Path="Packages\xamarin.forms.1.5.0.6447.nupkg" d:VsixSubPath="Packages" />
        <Asset Type="xamarin.android.support.v4.22.2.1.nupkg" d:Source="File" Path="Packages\xamarin.android.support.v4.22.2.1.nupkg" d:VsixSubPath="Packages" />
--- a/nunit.tests.csharp/Properties/AssemblyInfo.cs
+++ b/nunit.tests.csharp/Properties/AssemblyInfo.cs
@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("nunit.tests")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

--- a/nunit.tests.csharp/TestClass.cs
+++ b/nunit.tests.csharp/TestClass.cs
@ -1,20 +1,17 @@
-using NUnit.Framework;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// NUnit3 Tests,  see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation 
+using NUnit.Framework;

-namespace NUnit.Tests
+namespace $safeprojectname$
 {
    [TestFixture]
-    public class TestClass
+    public class $safeitemname$
    {
        [Test]
        public void TestMethod()
        {
            // TODO: Add your test code here
-            Assert.Pass("Your first passing test");
+            var answer = 42;
+            Assert.That(answer,Is.EqualTo(42),"Some useful error message");
        }
    }
 }
--- a/nunit.tests.csharp/_Definitions/_project.vstemplate.xml
+++ b/nunit.tests.csharp/_Definitions/_project.vstemplate.xml
@ -1,7 +1,7 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
    <TemplateData>
        <Name>NUnit 3 Unit Test Project</Name>
-        <Description>A project that contains NUnit 3 unit tests</Description>
+        <Description>A project that contains NUnit 3 unit tests (C#)</Description>
        <DefaultName>NUnit.Tests</DefaultName>
        <ProjectType>CSharp</ProjectType>
        <ProjectSubType></ProjectSubType>
@ -26,7 +26,8 @@
    </WizardExtension>
    <WizardData>
        <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.6.1" />
+            <package id="NUnit" version="3.11.0" />
+            <package id="NUnit3TestAdapter" version="3.13.0" />
        </packages>
    </WizardData>
 </VSTemplate>
--- a/nunit.tests.csharp/nunit.tests.csharp.csproj.x
+++ b/nunit.tests.csharp/nunit.tests.csharp.csproj.x
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("")> 
 <Assembly: AssemblyProduct("nunit.tests.vb")> 
-<Assembly: AssemblyCopyright("Copyright © 2017")> 
+<Assembly: AssemblyCopyright("Copyright © 2019")> 
 <Assembly: AssemblyTrademark("")> 

 <Assembly: ComVisible(False)>
--- a/nunit.tests.vb/TestClass.vb
+++ b/nunit.tests.vb/TestClass.vb
@ -1,12 +1,12 @@
 Option Explicit On
-
+' NUnit3 Tests,  see documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation 
 Imports System
 Imports NUnit.Framework

-Namespace NUnit.Tests
+Namespace $safeprojectname$

    <TestFixture>
-    Public Class TestClass
+    Public Class $safeitemname$

        <Test>
        Public Sub TestMethod()
--- a/nunit.tests.vb/_Definitions/_project.vstemplate.xml
+++ b/nunit.tests.vb/_Definitions/_project.vstemplate.xml
@ -1,7 +1,7 @@
 <VSTemplate Version="3.0.0" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" Type="Project">
    <TemplateData>
        <Name>NUnit 3 Unit Test Project</Name>
-        <Description>A project that contains NUnit 3 unit tests</Description>
+        <Description>A project that contains NUnit 3 unit tests (VB)</Description>
        <DefaultName>NUnit.Tests</DefaultName>
        <ProjectType>VisualBasic</ProjectType>
        <ProjectSubType></ProjectSubType>
@ -26,7 +26,8 @@
    </WizardExtension>
    <WizardData>
        <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.6.1" />
+            <package id="NUnit" version="3.11.0" />
+            <package id="NUnit3TestAdapter" version="3.13.0" />
        </packages>
    </WizardData>
 </VSTemplate>
--- a/nunit.tests.vb/nunit.tests.vb.vbproj.template
+++ b/nunit.tests.vb/nunit.tests.vb.vbproj.template