Merge pull request #53 from nunit/update

Update NUnit to 3.12 and Adapter to 3.17
nunit · Jul 13, 2020 · f66374f · f66374f
2 parents f8c0a93 + 00185ce
commit f66374f
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 37 deletions.
diff --git a/nunit.templates/nunit.templates.csproj b/nunit.templates/nunit.templates.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.12.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.12.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>
@@ -41,7 +41,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>nunit.templates</RootNamespace>
     <AssemblyName>nunit.templates</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -98,7 +98,7 @@
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
-     <Content Include="Packages\pclstorage.1.0.2.nupkg">
+    <Content Include="Packages\pclstorage.1.0.2.nupkg">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
@@ -114,6 +114,14 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
+    <Content Include="Packages\NUnit.3.12.0.nupkg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
+    <Content Include="Packages\NUnit3TestAdapter.3.17.0.nupkg">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="Properties\template-builder.props">
       <SubType>Designer</SubType>
     </None>
@@ -168,8 +176,8 @@
     <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 Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="TemplateBuilder, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -220,8 +228,8 @@
     </PropertyGroup>
     <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'))" />
+    <Error Condition="!Exists('..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.12.0\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.17.0\build\net35\NUnit3TestAdapter.props'))" />
   </Target>
   <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. 

diff --git a/nunit.templates/packages.config b/nunit.templates/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <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="NUnit" version="3.12.0" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.17.0" targetFramework="net45" />
   <package id="TemplateBuilder" version="1.1.6.1" targetFramework="net45" />
 </packages>
diff --git 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.5.0" Language="en-US" Publisher="Rob Prouse" />
+        <Identity Id="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef" Version="1.6.0" 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,8 +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.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="nunit.3.12.0.nupkg" d:Source="File" Path="Packages\NUnit.3.12.0.nupkg" d:VsixSubPath="Packages" />
+        <Asset Type="nunit3testadapter.3.17.0.nupkg" d:Source="File" Path="Packages\nunit3testadapter.3.17.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" />

diff --git a/nunit.tests.core.csharp/TestClass.cs b/nunit.tests.core.csharp/TestClass.cs
@@ -1,7 +1,5 @@
 // NUnit 3 tests
 // See documentation : https://github.com/nunit/docs/wiki/NUnit-Documentation
-using System.Collections;
-using System.Collections.Generic;
 using NUnit.Framework;
 
 namespace $safeprojectname$

diff --git a/nunit.tests.core.csharp/_Definitions/_project.vstemplate.xml b/nunit.tests.core.csharp/_Definitions/_project.vstemplate.xml
@@ -32,10 +32,5 @@
         <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
     </WizardExtension>
     <WizardData>
-        <!-- <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.11.0" />
-            <package id="NUnit3TestAdapter" version="3.13.0" />
-            <package id="Microsoft.NET.Test.Sdk" version="15.9.0" />
-        </packages> -->
     </WizardData>
 </VSTemplate>
diff --git a/nunit.tests.core.csharp/nunit.tests.core.csharp.csproj b/nunit.tests.core.csharp/nunit.tests.core.csharp.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="nunit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="nunit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup> 
 
 </Project>
diff --git a/nunit.tests.csharp/_Definitions/_project.vstemplate.xml b/nunit.tests.csharp/_Definitions/_project.vstemplate.xml
@@ -28,8 +28,8 @@
     </WizardExtension>
     <WizardData>
         <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.11.0" />
-            <package id="NUnit3TestAdapter" version="3.13.0" />
+            <package id="NUnit" version="3.12.0" />
+            <package id="NUnit3TestAdapter" version="3.17.0" />
         </packages>
     </WizardData>
 </VSTemplate>
diff --git a/nunit.tests.sdkstyle.csharp/_Definitions/_project.vstemplate.xml b/nunit.tests.sdkstyle.csharp/_Definitions/_project.vstemplate.xml
@@ -31,10 +31,5 @@
         <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
     </WizardExtension>
     <WizardData>
-        <!-- <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.11.0" />
-            <package id="NUnit3TestAdapter" version="3.13.0" />
-            <package id="Microsoft.NET.Test.Sdk" version="15.9.0" />
-        </packages> -->
     </WizardData>
 </VSTemplate>
diff --git a/nunit.tests.sdkstyle.csharp/nunit.tests.sdkstyle.csharp.csproj b/nunit.tests.sdkstyle.csharp/nunit.tests.sdkstyle.csharp.csproj
@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <IsPackable>false</IsPackable>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="NUnit" Version="3.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
   </ItemGroup> 
 
 

diff --git a/nunit.tests.vb/_Definitions/_project.vstemplate.xml b/nunit.tests.vb/_Definitions/_project.vstemplate.xml
@@ -27,8 +27,8 @@
     </WizardExtension>
     <WizardData>
         <packages repository="extension" repositoryId="nunit.templates.b29e95b8-bf26-4f03-983d-f1d0f21ad6ef">
-            <package id="NUnit" version="3.11.0" />
-            <package id="NUnit3TestAdapter" version="3.13.0" />
+            <package id="NUnit" version="3.12.0" />
+            <package id="NUnit3TestAdapter" version="3.17.0" />
         </packages>
     </WizardData>
 </VSTemplate>