From 5d62a2fd2d148d671ff3f90645998298f341bcf4 Mon Sep 17 00:00:00 2001 From: Chris Maddock Date: Thu, 16 Nov 2017 22:21:47 +0000 Subject: [PATCH 1/2] Prepare for 3.7 release --- CHANGES.txt | 8 +++++--- appveyor.yml | 1 - build.cake | 4 ++-- src/extension/Properties/AssemblyInfo.cs | 6 +++--- src/tests/Properties/AssemblyInfo.cs | 2 +- src/tests/packages.config | 2 +- src/tests/vs-project-loader.tests.csproj | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 88edec6..31751d5 100644 --- 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/appveyor.yml b/appveyor.yml index c97e32e..9afd745 100644 --- 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 index 748fb60..f307efe 100644 --- a/build.cake +++ b/build.cake @@ -13,7 +13,7 @@ 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"; @@ -21,7 +21,7 @@ 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" }; diff --git a/src/extension/Properties/AssemblyInfo.cs b/src/extension/Properties/AssemblyInfo.cs index 63c76d5..69db474 100644 --- 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 index 30440d7..a325e9e 100644 --- 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 index 4affdef..f164192 100644 --- a/src/tests/packages.config +++ b/src/tests/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/tests/vs-project-loader.tests.csproj b/src/tests/vs-project-loader.tests.csproj index c39fa59..a0d0266 100644 --- a/src/tests/vs-project-loader.tests.csproj +++ b/src/tests/vs-project-loader.tests.csproj @@ -34,12 +34,12 @@ ..\..\packages\NUnit.Engine.Api.3.7.0\lib\nunit.engine.api.dll True - - ..\..\packages\NUnit.3.7.1\lib\net20\nunit.framework.dll + + ..\..\packages\NUnit.3.9.0\lib\net20\nunit.framework.dll True - ..\..\packages\NUnit.3.7.1\lib\net20\NUnit.System.Linq.dll + ..\..\packages\NUnit.3.9.0\lib\net20\NUnit.System.Linq.dll True From 779d876edc4ef4d706ac4595359daf2a928dfa57 Mon Sep 17 00:00:00 2001 From: Chris Maddock Date: Thu, 16 Nov 2017 22:27:41 +0000 Subject: [PATCH 2/2] Add Appveyor branch name fix --- NuGet.config | 2 +- build.cake | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0eba61a..d68f0ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,7 +1,7 @@  - + diff --git a/build.cake b/build.cake index f307efe..3f0eb75 100644 --- a/build.cake +++ b/build.cake @@ -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);