diff --git a/main/OpenCover.NugetPackage/OpenCover.nuspec b/main/OpenCover.NugetPackage/OpenCover.nuspec
index f0c9aa395..0cd4571a6 100644
--- a/main/OpenCover.NugetPackage/OpenCover.nuspec
+++ b/main/OpenCover.NugetPackage/OpenCover.nuspec
@@ -16,26 +16,26 @@
Code-Coverage Reporting Testing TDD Utility
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -61,4 +61,4 @@
-
\ No newline at end of file
+
diff --git a/main/OpenCover.Specs/Packaging.feature b/main/OpenCover.Specs/Packaging.feature
index d57a675f9..a53122dda 100644
--- a/main/OpenCover.Specs/Packaging.feature
+++ b/main/OpenCover.Specs/Packaging.feature
@@ -1,4 +1,4 @@
-Feature: Packaging
+Feature: Packaging
In order to avoid deployment issues
As a software packager
I want to be sure that opencover runs after installation
@@ -15,8 +15,8 @@ Scenario: Run OpenCover after installing from zip file
Scenario: Run OpenCover after installing from a nuget package
Given I have a valid nugetpackage in the output folder
And I unpack that package into a deployment folder
- When I execute the deployed OpenCover against the x86 target application
- And I execute the deployed OpenCover against the x64 target application
+ When I execute the deployed OpenCover against the x86 target application in subfolder tools
+ And I execute the deployed OpenCover against the x64 target application in subfolder tools
Then the coverage results should be the same
@msitag
diff --git a/main/OpenCover.Specs/Packaging.feature.cs b/main/OpenCover.Specs/Packaging.feature.cs
index 95a9a553c..9e7f704aa 100644
--- a/main/OpenCover.Specs/Packaging.feature.cs
+++ b/main/OpenCover.Specs/Packaging.feature.cs
@@ -1,9 +1,9 @@
-// ------------------------------------------------------------------------------
+// ------------------------------------------------------------------------------
//
// This code was generated by SpecFlow (http://www.specflow.org/).
// SpecFlow Version:1.9.0.77
// SpecFlow Generator Version:1.9.0.0
-// Runtime Version:4.0.30319.18033
+// Runtime Version:4.0.30319.34014
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -32,8 +32,8 @@ public partial class PackagingFeature
public virtual void FeatureSetup()
{
testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner();
- TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Packaging", "In order to avoid deployment issues\r\nAs a software packager\r\nI want to be sure th" +
- "at opencover runs after installation", ProgrammingLanguage.CSharp, ((string[])(null)));
+ TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Packaging", "In order to avoid deployment issues\nAs a software packager\nI want to be sure that" +
+ " opencover runs after installation", ProgrammingLanguage.CSharp, ((string[])(null)));
testRunner.OnFeatureStart(featureInfo);
}
@@ -102,9 +102,11 @@ public virtual void RunOpenCoverAfterInstallingFromANugetPackage()
#line 17
testRunner.And("I unpack that package into a deployment folder", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 18
- testRunner.When("I execute the deployed OpenCover against the x86 target application", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
+ testRunner.When("I execute the deployed OpenCover against the x86 target application in subfolder " +
+ "tools", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "When ");
#line 19
- testRunner.And("I execute the deployed OpenCover against the x64 target application", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
+ testRunner.And("I execute the deployed OpenCover against the x64 target application in subfolder " +
+ "tools", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "And ");
#line 20
testRunner.Then("the coverage results should be the same", ((string)(null)), ((TechTalk.SpecFlow.Table)(null)), "Then ");
#line hidden
diff --git a/main/OpenCover.Specs/Steps/PackagingSteps.cs b/main/OpenCover.Specs/Steps/PackagingSteps.cs
index 927cd0f1d..e4358ef93 100644
--- a/main/OpenCover.Specs/Steps/PackagingSteps.cs
+++ b/main/OpenCover.Specs/Steps/PackagingSteps.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -57,7 +57,7 @@ public void GivenIHaveAValidZipPackageInTheOutputFolder()
ScenarioContext.Current["targetFolder"] = targetFolder;
ScenarioContext.Current["targetOutput"] = targetOutput;
}
-
+
[Given(@"I (?:unzip|unpack) that package into a deployment folder")]
public void GivenIUnzipThatPackageIntoADeploymentFolder()
{
@@ -66,7 +66,7 @@ public void GivenIUnzipThatPackageIntoADeploymentFolder()
var zip = new ZipFile((string)ScenarioContext.Current["targetZip"]);
zip.ExtractAll(folder);
}
-
+
[Given(@"I have a valid nugetpackage in the output folder")]
public void GivenIHaveAValidNugetpackageInTheOutputFolder()
{
@@ -84,7 +84,7 @@ public void GivenIHaveAValidNugetpackageInTheOutputFolder()
ScenarioContext.Current["targetFolder"] = targetFolder;
ScenarioContext.Current["targetOutput"] = targetOutput;
}
-
+
[Given(@"I have a valid installer in the output folder")]
public void GivenIHaveAValidInstallerInTheOutputFolder()
{
@@ -102,7 +102,7 @@ public void GivenIHaveAValidInstallerInTheOutputFolder()
ScenarioContext.Current["targetFolder"] = targetFolder;
ScenarioContext.Current["targetOutput"] = targetOutput;
}
-
+
[Given(@"I install that package into a deployment folder")]
public void GivenIInstallThatPackageIntoADeploymentFolder()
{
@@ -119,9 +119,15 @@ public void GivenIInstallThatPackageIntoADeploymentFolder()
ScenarioContext.Current["targetFolder"] = Path.Combine(folder, "[ApplicationFolderName]");
}
-
+
[When(@"I execute the deployed OpenCover against the (x\d\d) target application")]
public void WhenIExecuteTheDeployedOpenCoverAgainstTheXTargetApplication(string binFolder)
+ {
+ this.WhenIExecuteTheDeployedOpenCoverAgainstTheXTargetApplicationInSubfolder(binFolder, string.Empty);
+ }
+
+ [When(@"I execute the deployed OpenCover against the (x\d\d) target application in subfolder (.*)")]
+ public void WhenIExecuteTheDeployedOpenCoverAgainstTheXTargetApplicationInSubfolder(string binFolder, string subfolder)
{
var folder = (string)ScenarioContext.Current["targetFolder"];
var output = (string)ScenarioContext.Current["targetOutput"];
@@ -131,7 +137,7 @@ public void WhenIExecuteTheDeployedOpenCoverAgainstTheXTargetApplication(string
if (File.Exists(outputXml)) File.Delete(outputXml);
- var openCover = Path.Combine(folder, "OpenCover.Console.exe");
+ var openCover = Path.Combine(folder, subfolder, "OpenCover.Console.exe");
var target = Path.Combine(folder, string.Format(@"Samples\{0}\OpenCover.Simple.Target.exe", binFolder));
var startInfo = new ProcessStartInfo(openCover);
startInfo.Arguments = string.Format(@"-register:user ""-target:{0}"" ""-output:{1}""", target, outputXml);
@@ -140,7 +146,6 @@ public void WhenIExecuteTheDeployedOpenCoverAgainstTheXTargetApplication(string
process.WaitForExit();
}
-
[Then(@"the coverage results should be the same")]
public void ThenTheCoverageResultsShouldBeTheSame()
{
@@ -153,7 +158,7 @@ public void ThenTheCoverageResultsShouldBeTheSame()
var outputXml86 = string.Format(@"{0}\{1}_{2}.{3}",
Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output), "x86", Path.GetExtension(output));
-
+
var outputXml64 = string.Format(@"{0}\{1}_{2}.{3}",
Path.GetDirectoryName(output), Path.GetFileNameWithoutExtension(output), "x86", Path.GetExtension(output));