Fix unit tests when working with NUnit 2.*

GitTools · Oct 10, 2016 · 0eaab44 · 0eaab44
1 parent 74b0377
commit 0eaab44
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/GitLink.Tests/ProjectHelperFacts.cs b/src/GitLink.Tests/ProjectHelperFacts.cs
@@ -13,9 +13,12 @@ namespace GitLink.Tests
     [TestFixture]
     public class ProjectHelperFacts
     {
-        private static readonly string SolutionFile = Path.Combine(
-            Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
-            @"TestSolution\TestSolution.sln");
+        // Full path with executing assembly required for NUnit 3+		
+        private const string SolutionFile = @"TestSolution\TestSolution.sln";
+        // private static readonly string SolutionFile = Path.Combine(
+            // Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location),
+            // @"TestSolution\TestSolution.sln");
+
 
         [Test]
         public void GettingProjectsFromSolution()

diff --git a/src/GitLink/Helpers/ProjectHelper.cs b/src/GitLink/Helpers/ProjectHelper.cs
@@ -29,7 +29,7 @@ public static class ProjectHelper
 
         static ProjectHelper()
         {
-            SolutionParserType = TypeCache.GetType("Microsoft.Build.Construction.SolutionParser, Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a");
+            SolutionParserType = TypeCache.GetType("Microsoft.Build.Construction.SolutionParser, Microsoft.Build");
 
             var solutionProjectTypeType = TypeCache.GetType("Microsoft.Build.Construction.SolutionProjectType");
             if (solutionProjectTypeType != null)