From 3c2f64963b77f6a1780925411ba0b1eb844c6a92 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 8 Oct 2016 07:07:27 -0700 Subject: [PATCH 1/2] Fix test runs that are launched from Test Explorer in debug mode The current directory is different in this case, so we take care when assembling file paths. --- src/GitLink.Tests/ProjectHelperFacts.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/GitLink.Tests/ProjectHelperFacts.cs b/src/GitLink.Tests/ProjectHelperFacts.cs index 76538a2..80dd7bb 100644 --- a/src/GitLink.Tests/ProjectHelperFacts.cs +++ b/src/GitLink.Tests/ProjectHelperFacts.cs @@ -5,13 +5,17 @@ // -------------------------------------------------------------------------------------------------------------------- namespace GitLink.Tests { + using System.IO; using System.Linq; + using System.Reflection; using NUnit.Framework; [TestFixture] public class ProjectHelperFacts { - 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() From 0824b080b63b7937ae1e4d7a1f40a3e081284c65 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Sat, 8 Oct 2016 07:08:10 -0700 Subject: [PATCH 2/2] Fix NullReferenceException in 4 tests This shows up when Microsoft.Build doesn't happen to be loaded (by other tests?) by the time these four tests have run. --- src/GitLink/Helpers/ProjectHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GitLink/Helpers/ProjectHelper.cs b/src/GitLink/Helpers/ProjectHelper.cs index 0faad30..2afd991 100644 --- 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"); + SolutionParserType = TypeCache.GetType("Microsoft.Build.Construction.SolutionParser, Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"); var solutionProjectTypeType = TypeCache.GetType("Microsoft.Build.Construction.SolutionProjectType"); if (solutionProjectTypeType != null)