Update Runner Utility

danielmarbach · danielmarbach · commit 5be640f44772 · 2014-05-17T16:49:04.000+02:00
diff --git a/Example.Failing/Example.Failing.csproj b/Example.Failing/Example.Failing.csproj
@@ -54,9 +54,8 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Example.Failing/packages.config b/Example.Failing/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Example.Issue157-Fail/Example.Issue157-Fail.csproj b/Example.Issue157-Fail/Example.Issue157-Fail.csproj
@@ -31,9 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Example.Issue157-Fail/packages.config b/Example.Issue157-Fail/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Example.Issue157-Success/Example.Issue157-Success.csproj b/Example.Issue157-Success/Example.Issue157-Success.csproj
@@ -31,9 +31,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Example.Issue157-Success/packages.config b/Example.Issue157-Success/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Example.UsingExternalFile/Example.UsingExternalFile.csproj b/Example.UsingExternalFile/Example.UsingExternalFile.csproj
@@ -38,9 +38,8 @@
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.2.0.0\lib\net35\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
diff --git a/Example.UsingExternalFile/packages.config b/Example.UsingExternalFile/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" />
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Example/Example.csproj b/Example/Example.csproj
@@ -59,9 +59,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\FluentAssertions.2.2.0.0\lib\net35\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Example/packages.config b/Example/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" />
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Machine.Specifications.ConsoleRunner.Specs/Machine.Specifications.ConsoleRunner.Specs.csproj b/Machine.Specifications.ConsoleRunner.Specs/Machine.Specifications.ConsoleRunner.Specs.csproj
@@ -59,9 +59,8 @@
     <Reference Include="FluentAssertions">
       <HintPath>..\packages\FluentAssertions.2.2.0.0\lib\net35\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0043\lib\net20\Machine.Specifications.dll</HintPath>
+    <Reference Include="Machine.Specifications">
+      <HintPath>..\packages\Machine.Specifications.0.9.0-Unstable0046\lib\net20\Machine.Specifications.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
diff --git a/Machine.Specifications.ConsoleRunner.Specs/packages.config b/Machine.Specifications.ConsoleRunner.Specs/packages.config
@@ -2,6 +2,6 @@
 <packages>
   <package id="FluentAssertions" version="2.2.0.0" targetFramework="net35" />
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications" version="0.9.0-Unstable0043" targetFramework="net35" />
+  <package id="Machine.Specifications" version="0.9.0-Unstable0046" targetFramework="net35" />
   <package id="Machine.Specifications-Signed" version="0.9.0-Unstable0027" targetFramework="net35" />
 </packages>
diff --git a/Machine.Specifications.ConsoleRunner/Machine.Specifications.ConsoleRunner.csproj b/Machine.Specifications.ConsoleRunner/Machine.Specifications.ConsoleRunner.csproj
@@ -59,17 +59,17 @@
     <Reference Include="CommandLine">
       <HintPath>..\packages\CommandLineParser.1.9.71\lib\net35\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Machine.Specifications.Reporting, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.Reporting.0.9.0-Unstable0013\lib\net20\Machine.Specifications.Reporting.dll</HintPath>
+    <Reference Include="Machine.Specifications.Reporting">
+      <HintPath>..\packages\Machine.Specifications.Reporting.0.9.0-Unstable0014\lib\net20\Machine.Specifications.Reporting.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Machine.Specifications.Reporting.Templates, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.Reporting.0.9.0-Unstable0013\lib\net20\Machine.Specifications.Reporting.Templates.dll</HintPath>
+    <Reference Include="Machine.Specifications.Reporting.Templates">
+      <HintPath>..\packages\Machine.Specifications.Reporting.0.9.0-Unstable0014\lib\net20\Machine.Specifications.Reporting.Templates.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Machine.Specifications.Runner.Utility, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Machine.Specifications.Runner.Utility.0.9.0-Unstable0013\lib\net20\Machine.Specifications.Runner.Utility.dll</HintPath>
+      <HintPath>..\packages\Machine.Specifications.Runner.Utility.0.9.0-Unstable0020\lib\net20\Machine.Specifications.Runner.Utility.dll</HintPath>
     </Reference>
     <Reference Include="Spark">
       <HintPath>..\packages\Spark.1.7.5.3\lib\NET35\Spark.dll</HintPath>
diff --git a/Machine.Specifications.ConsoleRunner/Program.cs b/Machine.Specifications.ConsoleRunner/Program.cs
@@ -104,7 +104,7 @@ public ExitCode Run(string[] arguments)
 
                 var listener = new AggregateRunListener(listeners);
 
-                ISpecificationRunner specificationRunner = new SpecificationRunner();
+                ISpecificationRunner appDomainRunner = new AppDomainRunner(listener, options.GetRunOptions());
                 var assemblies = new List<AssemblyPath>();
                 foreach (string assemblyName in options.AssemblyFiles)
                 {
@@ -133,7 +133,7 @@ public ExitCode Run(string[] arguments)
                     }
                 }
 
-                specificationRunner.RunAssemblies(assemblies, listener, options.GetRunOptions());
+                appDomainRunner.RunAssemblies(assemblies);
             }
             catch (Exception ex)
             {
diff --git a/Machine.Specifications.ConsoleRunner/RunListener.cs b/Machine.Specifications.ConsoleRunner/RunListener.cs
@@ -5,7 +5,7 @@
 
 namespace Machine.Specifications.ConsoleRunner
 {
-    public class RunListener : SpecificationRunListenerBase, ISpecificationResultProvider
+    public class RunListener : ISpecificationRunListener, ISpecificationResultProvider
     {
         readonly IConsole _console;
         readonly TimingRunListener _timer;
@@ -33,17 +33,17 @@ public bool FailureOccurred
             get { return _failureOccurred || _failedSpecificationCount > 0; }
         }
 
-        public override void OnAssemblyStart(AssemblyInfo assembly)
+        public void OnAssemblyStart(AssemblyInfo assembly)
         {
             _output.AssemblyStart(assembly);
         }
 
-        public override void OnAssemblyEnd(AssemblyInfo assembly)
+        public void OnAssemblyEnd(AssemblyInfo assembly)
         {
             _output.AssemblyEnd(assembly);
         }
 
-        public override void OnRunStart()
+        public void OnRunStart()
         {
             _output.RunStart();
 
@@ -55,7 +55,7 @@ public override void OnRunStart()
             _passedSpecificationCount = 0;
         }
 
-        public override void OnRunEnd()
+        public void OnRunEnd()
         {
             _output.RunEnd();
 
@@ -83,24 +83,24 @@ public override void OnRunEnd()
             _console.WriteLine(line);
         }
 
-        public override void OnContextStart(ContextInfo context)
+        public void OnContextStart(ContextInfo context)
         {
             _currentContext = context;
             _output.ContextStart(context);
         }
 
-        public override void OnContextEnd(ContextInfo context)
+        public void OnContextEnd(ContextInfo context)
         {
             _output.ContextEnd(context);
             _contextCount += 1;
         }
 
-        public override void OnSpecificationStart(SpecificationInfo specification)
+        public void OnSpecificationStart(SpecificationInfo specification)
         {
             _output.SpecificationStart(specification);
         }
 
-        public override void OnSpecificationEnd(SpecificationInfo specification, Result result)
+        public void OnSpecificationEnd(SpecificationInfo specification, Result result)
         {
             _specificationCount += 1;
             switch (result.Status)
@@ -125,7 +125,7 @@ public override void OnSpecificationEnd(SpecificationInfo specification, Result
             }
         }
 
-        public override void OnFatalError(ExceptionResult exception)
+        public void OnFatalError(ExceptionResult exception)
         {
             _failureOccurred = true;
             _console.WriteLine("");
diff --git a/Machine.Specifications.ConsoleRunner/packages.config b/Machine.Specifications.ConsoleRunner/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="CommandLineParser" version="1.9.71" targetFramework="net35" />
   <package id="GitFlowVersionTask" version="0.14.0" targetFramework="net35" />
-  <package id="Machine.Specifications.Reporting" version="0.9.0-Unstable0013" targetFramework="net35" />
-  <package id="Machine.Specifications.Runner.Utility" version="0.9.0-Unstable0013" targetFramework="net35" />
+  <package id="Machine.Specifications.Reporting" version="0.9.0-Unstable0014" targetFramework="net35" />
+  <package id="Machine.Specifications.Runner.Utility" version="0.9.0-Unstable0020" targetFramework="net35" />
   <package id="Spark" version="1.7.5.3" targetFramework="net35" />
 </packages>
diff --git a/Machine.Specifications.Runner.Console.sln b/Machine.Specifications.Runner.Console.sln
@@ -6,6 +6,12 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Machine.Specifications.ConsoleRunner", "Machine.Specifications.ConsoleRunner\Machine.Specifications.ConsoleRunner.csproj", "{CFF4B323-24C1-4B19-98CA-7DF92755458E}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Machine.Specifications.ConsoleRunner.Specs", "Machine.Specifications.ConsoleRunner.Specs\Machine.Specifications.ConsoleRunner.Specs.csproj", "{F25C7917-4ED6-4261-B262-43C56D0CD37F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{79F44A49-3516-40F3-AC67-91EFA57B8119} = {79F44A49-3516-40F3-AC67-91EFA57B8119}
+		{38AA3D5D-3708-4F7F-8738-5F2090B86FC0} = {38AA3D5D-3708-4F7F-8738-5F2090B86FC0}
+		{2C33D385-9024-4346-8839-93CFF1AF227C} = {2C33D385-9024-4346-8839-93CFF1AF227C}
+		{A6B234F5-5D96-4809-BD25-86F6544BF838} = {A6B234F5-5D96-4809-BD25-86F6544BF838}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example", "Example\Example.csproj", "{2C28C643-31A2-44CA-B762-953A963F6F61}"
 EndProject
