Add build.cake script

appveyor.yml

@@ -1,11 +1,8 @@
 version: 3.5.{build}
 image: Visual Studio 2015
-configuration: Release
-before_build:
-- cmd: nuget restore
-build:
-  project: NUnit3TestAdapter.sln
-  publish_nuget: true
-  verbosity: minimal
-test:
-  assemblies: NUnit.VisualStudio.TestAdapter.Tests.dll
+
+build_script:
+  - ps: .\build.ps1 -Target "Appveyor"
+
+# disable built-in tests.
+test: off

build.cake

@@ -0,0 +1,189 @@
+#tool nuget:?package=NUnit.ConsoleRunner&version=3.4.1
+
+//////////////////////////////////////////////////////////////////////
+// ARGUMENTS
+//////////////////////////////////////////////////////////////////////
+
+var target = Argument("target", "Default");
+var configuration = Argument("configuration", "Debug");
+
+//////////////////////////////////////////////////////////////////////
+// SET PACKAGE VERSION
+//////////////////////////////////////////////////////////////////////
+
+var version = "3.5";
+var modifier = "";
+
+var isAppveyor = BuildSystem.IsRunningOnAppVeyor;
+var dbgSuffix = configuration == "Debug" ? "-dbg" : "";
+var packageVersion = version + modifier + dbgSuffix;
+
+//////////////////////////////////////////////////////////////////////
+// DEFINE RUN CONSTANTS
+//////////////////////////////////////////////////////////////////////
+
+// Directories
+var PROJECT_DIR = Context.Environment.WorkingDirectory.FullPath + "/";
+var PACKAGE_DIR = PROJECT_DIR + "package/";
+var NUNIT3_CONSOLE = PROJECT_DIR + "tools/NUnit.ConsoleRunner/tools/nunit3-console.exe";
+
+// TODO: Consolidate in one directory
+var ADAPTER_DIR = PROJECT_DIR + "src/NUnitTestAdapter/bin/" + configuration + "/";
+var TEST_DIR = PROJECT_DIR + "src/NUnitTestAdapterTests/bin/" + configuration + "/";
+var INSTALL_DIR = PROJECT_DIR + "src/NUnitTestAdapterInstall/bin/" + configuration + "/";
+
+// Solution
+var ADAPTER_SOLUTION = PROJECT_DIR + "NUnit3TestAdapter.sln";
+
+// Test Assembly
+var ADAPTER_TESTS = TEST_DIR + "NUnit.VisualStudio.TestAdapter.Tests.dll";
+
+// Packages
+var SRC_PACKAGE = PACKAGE_DIR + "NUnit3TestAdapter-" + version + modifier + "-src.zip";
+var ZIP_PACKAGE = PACKAGE_DIR + "NUnit3TestAdapter-" + packageVersion + ".zip";
+
+//////////////////////////////////////////////////////////////////////
+// CLEAN
+//////////////////////////////////////////////////////////////////////
+
+Task("Clean")
+    .Does(() =>
+{
+    CleanDirectory(ADAPTER_DIR);
+    CleanDirectory(TEST_DIR);
+    CleanDirectory(INSTALL_DIR);
+});
+
+
+//////////////////////////////////////////////////////////////////////
+// INITIALIZE FOR BUILD
+//////////////////////////////////////////////////////////////////////
+
+Task("InitializeBuild")
+    .Does(() =>
+{
+    NuGetRestore(ADAPTER_SOLUTION);
+
+	if (BuildSystem.IsRunningOnAppVeyor)
+	{
+		var tag = AppVeyor.Environment.Repository.Tag;
+
+		if (tag.IsTag)
+		{
+			packageVersion = tag.Name;
+		}
+		else
+		{
+			var buildNumber = AppVeyor.Environment.Build.Number;
+			packageVersion = version + "-CI-" + buildNumber + dbgSuffix;
+			if (AppVeyor.Environment.PullRequest.IsPullRequest)
+				packageVersion += "-PR-" + AppVeyor.Environment.PullRequest.Number;
+			else
+				packageVersion += "-" + AppVeyor.Environment.Repository.Branch;
+		}
+
+		AppVeyor.UpdateBuildVersion(packageVersion);
+	}
+});
+
+//////////////////////////////////////////////////////////////////////
+// BUILD
+//////////////////////////////////////////////////////////////////////
+
+Task("Build")
+    .IsDependentOn("InitializeBuild")
+    .Does(() =>
+    {
+		MSBuild(ADAPTER_SOLUTION, new MSBuildSettings()
+			.SetConfiguration(configuration)
+            .SetMSBuildPlatform(MSBuildPlatform.x86)
+			.SetVerbosity(Verbosity.Minimal)
+			.SetNodeReuse(false)
+		);
+    });
+
+//////////////////////////////////////////////////////////////////////
+// TEST
+//////////////////////////////////////////////////////////////////////
+
+Task("Test")
+	.IsDependentOn("Build")
+	.Does(() =>
+	{
+        StartProcess(
+			NUNIT3_CONSOLE,
+			new ProcessSettings()
+			{
+				Arguments = ADAPTER_TESTS
+			});
+	});
+
+//////////////////////////////////////////////////////////////////////
+// PACKAGE
+//////////////////////////////////////////////////////////////////////
+
+Task("PackageSource")
+  .Does(() =>
+	{
+		CreateDirectory(PACKAGE_DIR);
+		RunGitCommand(string.Format("archive -o {0} HEAD", SRC_PACKAGE));
+	});
+
+Task("PackageZip")
+	.IsDependentOn("Build")
+	.Does(() =>
+	{
+		CreateDirectory(PACKAGE_DIR);
+
+		var zipFiles = new FilePath[]
+		{
+			PROJECT_DIR + "README.md",
+			ADAPTER_DIR + "NUnit3.TestAdapter.dll",
+            ADAPTER_DIR + "nunit.engine.dll",
+			ADAPTER_DIR + "nunit.engine.api.dll",
+			ADAPTER_DIR + "Mono.Cecil.dll",
+			ADAPTER_DIR + "Mono.Cecil.Pdb.dll",
+			ADAPTER_DIR + "Mono.Cecil.Mdb.dll",
+			ADAPTER_DIR + "Mono.Cecil.Rocks.dll"
+		};
+
+		Zip(ADAPTER_DIR, File(ZIP_PACKAGE), zipFiles);
+	});
+
+//////////////////////////////////////////////////////////////////////
+// HELPER METHODS
+//////////////////////////////////////////////////////////////////////
+
+void RunGitCommand(string arguments)
+{
+	StartProcess("git", new ProcessSettings()
+	{
+		Arguments = arguments
+	});
+}
+
+//////////////////////////////////////////////////////////////////////
+// TASK TARGETS
+//////////////////////////////////////////////////////////////////////
+
+Task("Rebuild")
+    .IsDependentOn("Clean")
+	.IsDependentOn("Build");
+
+Task("Package")
+	.IsDependentOn("PackageSource")
+	.IsDependentOn("PackageZip");
+
+Task("Appveyor")
+	.IsDependentOn("Build")
+	.IsDependentOn("Test");
+	//.IsDependentOn("Package");
+
+Task("Default")
+    .IsDependentOn("Build");
+
+//////////////////////////////////////////////////////////////////////
+// EXECUTION
+//////////////////////////////////////////////////////////////////////
+
+RunTarget(target);

build.cmd

@@ -0,0 +1,2 @@
+@echo off
+powershell ./build.ps1 %CAKE_ARGS% %*

build.ps1

@@ -0,0 +1,145 @@
+##########################################################################
+# This is the Cake bootstrapper script for PowerShell.
+# This file was downloaded from https://github.com/cake-build/resources
+# Feel free to change this file to fit your needs.
+##########################################################################
+
+<#
+
+.SYNOPSIS
+This is a Powershell script to bootstrap a Cake build.
+
+.DESCRIPTION
+This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
+and execute your Cake build script with the parameters you provide.
+
+.PARAMETER Script
+The build script to execute.
+.PARAMETER Target
+The build script target to run.
+.PARAMETER Configuration
+The build configuration to use.
+.PARAMETER Verbosity
+Specifies the amount of information to be displayed.
+.PARAMETER Experimental
+Tells Cake to use the latest Roslyn release.
+.PARAMETER WhatIf
+Performs a dry run of the build script.
+No tasks will be executed.
+.PARAMETER Mono
+Tells Cake to use the Mono scripting engine.
+.PARAMETER SkipToolPackageRestore
+Skips restoring of packages.
+.PARAMETER ScriptArgs
+Remaining arguments are added here.
+
+.LINK
+http://cakebuild.net
+
+#>
+
+[CmdletBinding()]
+Param(
+    [string]$Script = "build.cake",
+    [string]$Target = "Default",
+    [string]$Configuration = "Release",
+    [ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
+    [string]$Verbosity = "Verbose",
+    [switch]$Experimental,
+    [Alias("DryRun","Noop")]
+    [switch]$WhatIf,
+    [switch]$Mono,
+    [switch]$SkipToolPackageRestore,
+    [Parameter(Position=0,Mandatory=$false,ValueFromRemainingArguments=$true)]
+    [string[]]$ScriptArgs
+)
+
+Write-Host "Preparing to run build script..."
+
+$PSScriptRoot = split-path -parent $MyInvocation.MyCommand.Definition;
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$NUGET_URL = "http://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
+$CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
+$PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
+
+# Should we use mono?
+$UseMono = "";
+if($Mono.IsPresent) {
+    Write-Verbose -Message "Using the Mono based scripting engine."
+    $UseMono = "-mono"
+}
+
+# Should we use the new Roslyn?
+$UseExperimental = "";
+if($Experimental.IsPresent -and !($Mono.IsPresent)) {
+    Write-Verbose -Message "Using experimental version of Roslyn."
+    $UseExperimental = "-experimental"
+}
+
+# Is this a dry run?
+$UseDryRun = "";
+if($WhatIf.IsPresent) {
+    $UseDryRun = "-dryrun"
+}
+
+# Make sure tools folder exists
+if ((Test-Path $PSScriptRoot) -and !(Test-Path $TOOLS_DIR)) {
+    Write-Verbose -Message "Creating tools directory..."
+    New-Item -Path $TOOLS_DIR -Type directory | out-null
+}
+
+# Make sure that packages.config exist.
+if (!(Test-Path $PACKAGES_CONFIG)) {
+    Write-Verbose -Message "Downloading packages.config..."
+    try { Invoke-WebRequest -Uri http://cakebuild.net/download/bootstrapper/packages -OutFile $PACKAGES_CONFIG } catch {
+        Throw "Could not download packages.config."
+    }
+}
+
+# Try find NuGet.exe in path if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Trying to find nuget.exe in PATH..."
+    $existingPaths = $Env:Path -Split ';' | Where-Object { (![string]::IsNullOrEmpty($_)) -and (Test-Path $_) }
+    $NUGET_EXE_IN_PATH = Get-ChildItem -Path $existingPaths -Filter "nuget.exe" | Select -First 1
+    if ($NUGET_EXE_IN_PATH -ne $null -and (Test-Path $NUGET_EXE_IN_PATH.FullName)) {
+        Write-Verbose -Message "Found in PATH at $($NUGET_EXE_IN_PATH.FullName)."
+        $NUGET_EXE = $NUGET_EXE_IN_PATH.FullName
+    }
+}
+
+# Try download NuGet.exe if not exists
+if (!(Test-Path $NUGET_EXE)) {
+    Write-Verbose -Message "Downloading NuGet.exe..."
+    try {
+        (New-Object System.Net.WebClient).DownloadFile($NUGET_URL, $NUGET_EXE)
+    } catch {
+        Throw "Could not download NuGet.exe."
+    }
+}
+
+# Save nuget.exe path to environment to be available to child processed
+$ENV:NUGET_EXE = $NUGET_EXE
+
+# Restore tools from NuGet?
+if(-Not $SkipToolPackageRestore.IsPresent) {
+    Push-Location
+    Set-Location $TOOLS_DIR
+    Write-Verbose -Message "Restoring tools from NuGet..."
+    $NuGetOutput = Invoke-Expression "&`"$NUGET_EXE`" install -ExcludeVersion -OutputDirectory `"$TOOLS_DIR`""
+    if ($LASTEXITCODE -ne 0) {
+        Throw "An error occured while restoring NuGet tools."
+    }
+    Write-Verbose -Message ($NuGetOutput | out-string)
+    Pop-Location
+}
+
+# Make sure that Cake has been installed.
+if (!(Test-Path $CAKE_EXE)) {
+    Throw "Could not find Cake.exe at $CAKE_EXE"
+}
+
+# Start Cake
+Write-Host "Running build script..."
+Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
+exit $LASTEXITCODE

nuget/NUnit3TestAdapter.nuspec

@@ -25,11 +25,10 @@ The package works with Visual Studio 2012, 2013 and 2015.</description>
         <file src="${package.working.dir}\NUnit3.TestAdapter.dll" target="lib\NUnit3.TestAdapter.dll" />
         <file src="${package.working.dir}\nunit.engine.dll" target="lib\nunit.engine.dll" />
         <file src="${package.working.dir}\nunit.engine.api.dll" target="lib\nunit.engine.api.dll" />
-      <file src="${package.working.dir}\Mono.Cecil.dll" target="lib\Mono.Cecil.dll" />
-      <file src="${package.working.dir}\Mono.Cecil.Pdb.dll" target="lib\Mono.Cecil.Pdb.dll" />
-      <file src="${package.working.dir}\Mono.Cecil.Mdb.dll" target="lib\Mono.Cecil.Mdb.dll" />
-      <file src="${package.working.dir}\Mono.Cecil.Rocks.dll" target="lib\Mono.Cecil.Rocks.dll" />
-      <file src="${package.working.dir}\ignore.addins" target="lib\ignore.addins" />
+        <file src="${package.working.dir}\Mono.Cecil.dll" target="lib\Mono.Cecil.dll" />
+        <file src="${package.working.dir}\Mono.Cecil.Pdb.dll" target="lib\Mono.Cecil.Pdb.dll" />
+        <file src="${package.working.dir}\Mono.Cecil.Mdb.dll" target="lib\Mono.Cecil.Mdb.dll" />
+        <file src="${package.working.dir}\Mono.Cecil.Rocks.dll" target="lib\Mono.Cecil.Rocks.dll" />
         <file src="${project.nuget.dir}\install.ps1" target="tools\install.ps1" />
     </files>
 </package>

nunit3-vs-adapter.build

@@ -62,7 +62,6 @@
         <include name="Mono.Cecil.Pdb.dll"/>
         <include name="Mono.Cecil.Mdb.dll"/>
         <include name="Mono.Cecil.Rocks.dll"/>
-        <include name="ignore.addins"/>
       </fileset>
 		</copy>
 

src/NUnitTestAdapterInstall/NUnit3TestAdapterInstall.csproj

@@ -101,10 +101,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="ignore.addins">
-      <IncludeInVSIX>true</IncludeInVSIX>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">