Sets up nunit via nuget and adds commandline testing with test.bat

activescott · Mar 2, 2014 · c916005 · c916005
1 parent c9abd4c
commit c916005
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 10,917 deletions.
diff --git a/src/.build/lessmsi.msbuild b/src/.build/lessmsi.msbuild
@@ -21,6 +21,7 @@
 		<TheProjects Include="$(RootDir)\LessMsi.Cli\LessMsi.Cli.csproj"></TheProjects>
 		<TheProjects Include="$(RootDir)\ExplorerShortcutHelper\ExplorerShortcutHelper.csproj"></TheProjects>
 		<TheProjects Include="$(RootDir)\LessMsi.Gui\LessMsi.Gui.csproj"></TheProjects>
+		<TheProjects Include="$(RootDir)\LessMsi.Tests\LessMsi.Tests.csproj"></TheProjects>
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/LessMsi.Gui/LessMsi.Gui.csproj b/src/LessMsi.Gui/LessMsi.Gui.csproj
@@ -89,6 +89,7 @@
       <DependentUpon>PreferencesForm.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="AboutBox.resx">

diff --git a/src/LessMsi.Gui/packages.config b/src/LessMsi.Gui/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.3" targetFramework="net35-Client" />
+</packages>
diff --git a/src/LessMsi.sln b/src/LessMsi.sln
@@ -30,6 +30,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LessMsi.Gui", "LessMsi.Gui\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LessMsi.Cli", "LessMsi.Cli\LessMsi.Cli.csproj", "{7ED32F80-2B7B-4F90-ADE9-22B8F3935C63}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3398DA89-7F43-4564-B2ED-FE35E1555D9C}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Lessmsi.Tests/CommandLineExtractTests.cs b/src/Lessmsi.Tests/CommandLineExtractTests.cs
@@ -155,7 +155,7 @@ private void TestExtraction(string commandLineArguments, string testName, string
 			var actualEntries = FileEntryGraph.GetActualEntries(actualOutDir.FullName, "Actual Entries");
 	        var actualEntriesFile = GetActualOutputFile(testName);
 	        actualEntries.Save(actualEntriesFile);
-			Console.WriteLine("Actual entries saved to " + actualEntriesFile.FullName);
+			//Console.WriteLine("Actual entries saved to " + actualEntriesFile.FullName);
 			var expectedEntries = GetExpectedEntriesForMsi(testName);
             AssertAreEqual(expectedEntries, actualEntries);
         }

diff --git a/src/Lessmsi.Tests/LessMsi.Tests.csproj b/src/Lessmsi.Tests/LessMsi.Tests.csproj
@@ -34,9 +34,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=2.5.2.9222, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Runtime.Serialization" />
@@ -71,6 +71,9 @@
       <Name>LessMsi.Gui</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy /Y "$(SolutionDir)..\bin\$(ConfigurationName)\*.exe" "$(TargetDir)"

diff --git a/src/Lessmsi.Tests/packages.config b/src/Lessmsi.Tests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.3" targetFramework="net40" />
+</packages>
diff --git a/src/NUnit.2.6.2/NUnit.2.6.2.nupkg b/src/NUnit.2.6.2/NUnit.2.6.2.nupkg
diff --git a/src/NUnit.2.6.2/lib/nunit.framework.dll b/src/NUnit.2.6.2/lib/nunit.framework.dll