Merge pull request #20 from nunit/release/3.7

Prepare for 3.7 release
nunit · Nov 18, 2017 · e11f6ee · e11f6ee
2 parents e36009b + 779d876
commit e11f6ee
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 36 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,11 +1,13 @@
-VS Project Loader Extension 3.7 - August 6, 2017
+VS Project Loader Extension 3.7 - November 18, 2017
 
- Added support for new file format for .NET Core csproj files. Added .editorconfig for
- consistency with main NUnit project.
+ Added support for new .csproj file format, and resolved issue with missing
+ optional project elements.
 
  Issues Resolved
 
  * 11 Invalid Project Format Exception if Project is new project file format
+ * 14 NullReferenceException when loading project file with missing AssemblyName/OutputType
+ * 16 vs-project-load does not find tests in csproj that use PackageReference instead of package.config
 
 VS Project Loader Extension 3.6 - August 1, 2017
 

diff --git a/NuGet.config b/NuGet.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <packageSources>
- <add key="NUNit MyGet Feed" value="https://www.myget.org/F/nunit/api/v2" />
+ <add key="NUnit MyGet Feed" value="https://www.myget.org/F/nunit/api/v2" />
  <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
  <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
  </packageSources>

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,3 @@
-version: 3.5.{build}
 image: Visual Studio 2015
 
 build_script:

diff --git a/build.cake b/build.cake
@@ -13,15 +13,15 @@ var GITHUB_SITE = "https://github.com/nunit/vs-project-loader";
 var WIKI_PAGE = "https://github.com/nunit/docs/wiki/Console-Command-Line";
 var NUGET_ID = "NUnit.Extension.VSProjectLoader";
 var CHOCO_ID = "nunit-extension-vs-project-loader";
-var VERSION = "3.6.0";
+var VERSION = "3.7.0";
 
 // Metadata used in the nuget and chocolatey packages
 var TITLE = "NUnit 3 - Visual Studio Project Loader Extension";
 var AUTHORS = new [] { "Charlie Poole" };
 var OWNERS = new [] { "Charlie Poole" };
 var DESCRIPTION = "This extension allows NUnit to recognize and load solutions and projects in Visual Studio format. It supports files of type .sln, .csproj, .vbproj, .vjsproj, .vcproj and .fsproj.";
 var SUMMARY = "NUnit Engine extension for loading Visual Studio formatted projects.";
-var COPYRIGHT = "Copyright (c) 2016 Charlie Poole";
+var COPYRIGHT = "Copyright (c) 2017 Charlie Poole";
 var RELEASE_NOTES = new [] { "See https://raw.githubusercontent.com/nunit/vs-project-loader/master/CHANGES.txt" };
 var TAGS = new [] { "nunit", "test", "testing", "tdd", "runner" };
 
@@ -58,31 +58,31 @@ if (BuildSystem.IsRunningOnAppVeyor)
  }
  else
  {
- var buildNumber = AppVeyor.Environment.Build.Number.ToString("00000");
- var branch = AppVeyor.Environment.Repository.Branch;
- var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
+ var buildNumber = AppVeyor.Environment.Build.Number.ToString("00000");
+ var branch = AppVeyor.Environment.Repository.Branch;
+ var isPullRequest = AppVeyor.Environment.PullRequest.IsPullRequest;
 
- if (branch == "master" && !isPullRequest)
- {
- packageVersion = VERSION + "-dev-" + buildNumber + dbgSuffix;
- }
- else
- {
- var suffix = "-ci-" + buildNumber + dbgSuffix;
-
- if (isPullRequest)
- suffix += "-pr-" + AppVeyor.Environment.PullRequest.Number;
- else
- suffix += "-" + branch;
+ if (branch == "master" && !isPullRequest)
+ {
+ packageVersion = VERSION + "-dev-" + buildNumber + dbgSuffix;
+ }
+ else
+ {
+ var suffix = "-ci-" + buildNumber + dbgSuffix;
 
- // Nuget limits "special version part" to 20 chars. Add one for the hyphen.
- if (suffix.Length > 21)
- suffix = suffix.Substring(0, 21);
+ if (isPullRequest)
+ suffix += "-pr-" + AppVeyor.Environment.PullRequest.Number;
+ else if (AppVeyor.Environment.Repository.Branch.StartsWith("release", StringComparison.OrdinalIgnoreCase))
+ suffix += "-pre-" + buildNumber;
+ else
+ suffix += "-" + System.Text.RegularExpressions.Regex.Replace(branch, "[^0-9A-Za-z-]+", "-");
 
- suffix = suffix.Replace(".", "");
+ // Nuget limits "special version part" to 20 chars. Add one for the hyphen.
+ if (suffix.Length > 21)
+ suffix = suffix.Substring(0, 21);
 
- packageVersion = VERSION + suffix;
- }
+ packageVersion = VERSION + suffix;
+ }
  }
 
  AppVeyor.UpdateBuildVersion(packageVersion);

diff --git a/src/extension/Properties/AssemblyInfo.cs b/src/extension/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("vs-project-loader")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyCopyright("Copyright © 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -23,5 +23,5 @@
 [assembly: Guid("202d01de-2164-40a2-8dda-693d6c9b8395")]
 
 // Set the version of the extension
-[assembly: AssemblyVersion("3.6.0.0")]
-[assembly: AssemblyFileVersion("3.6.0.0")]
+[assembly: AssemblyVersion("3.7.0.0")]
+[assembly: AssemblyFileVersion("3.7.0.0")]
diff --git a/src/tests/Properties/AssemblyInfo.cs b/src/tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("tests")]
-[assembly: AssemblyCopyright("Copyright © 2016")]
+[assembly: AssemblyCopyright("Copyright © 2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/src/tests/packages.config b/src/tests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
- <package id="NUnit" version="3.7.1" targetFramework="net20" />
+ <package id="NUnit" version="3.9.0" targetFramework="net20" />
  <package id="NUnit.Engine.Api" version="3.7.0" targetFramework="net20" />
 </packages>
diff --git a/src/tests/vs-project-loader.tests.csproj b/src/tests/vs-project-loader.tests.csproj
@@ -34,12 +34,12 @@
  <HintPath>..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll</HintPath>
  <Private>True</Private>
  </Reference>
- <Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.3.7.1\lib\net20\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=3.9.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+ <HintPath>..\..\packages\NUnit.3.9.0\lib\net20\nunit.framework.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="NUnit.System.Linq, Version=0.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
- <HintPath>..\..\packages\NUnit.3.7.1\lib\net20\NUnit.System.Linq.dll</HintPath>
+ <HintPath>..\..\packages\NUnit.3.9.0\lib\net20\NUnit.System.Linq.dll</HintPath>
  <Private>True</Private>
  </Reference>
  <Reference Include="System" />