Merge pull request #334 from qmfrederik/fixes/rationalize-msbuild

Exclude runtime assets for MSBuild

Author: AArnott

src/NerdBank.GitVersioning.Tests/AssemblyInfoTest.cs

@@ -10,6 +10,11 @@ namespace NerdBank.GitVersioning.Tests
 {
     public class AssemblyInfoTest
     {
+        public AssemblyInfoTest()
+        {
+            MSBuildExtensions.LoadMSBuild();
+        }
+
         [Fact]
         public void FSharpGenerator()
         {

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -49,6 +49,8 @@ public class BuildIntegrationTests : RepoTestBase
     public BuildIntegrationTests(ITestOutputHelper logger)
         : base(logger)
     {
+        MSBuildExtensions.LoadMSBuild();
+
         int seed = (int)DateTime.Now.Ticks;
         this.random = new Random(seed);
         this.Logger.WriteLine("Random seed: {0}", seed);

src/NerdBank.GitVersioning.Tests/MSBuildExtensions.cs

@@ -7,12 +7,28 @@
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
+using Microsoft.Build.Locator;
 using Microsoft.Build.Logging;
 using Validation;
 using Xunit.Abstractions;
 
 internal static class MSBuildExtensions
 {
+    private static readonly object loadLock = new object();
+    private static bool loaded;
+
+    internal static void LoadMSBuild()
+    {
+        lock (loadLock)
+        {
+            if (!loaded)
+            {
+                MSBuildLocator.RegisterDefaults();
+                loaded = true;
+            }
+        }
+    }
+
     internal static async Task<BuildResult> BuildAsync(this BuildManager buildManager, ITestOutputHelper logger, ProjectCollection projectCollection, ProjectRootElement project, string target, IDictionary<string, string> globalProperties = null, LoggerVerbosity logVerbosity = LoggerVerbosity.Detailed, ILogger[] additionalLoggers = null)
     {
         Requires.NotNull(buildManager, nameof(buildManager));

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -31,7 +31,9 @@
     <PackageReference Include="7z.NET" Version="1.0.3" />
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.10" />
     <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
-    <PackageReference Include="Microsoft.Build" Version="15.9.20" Condition=" '$(TargetFramework)' == 'net461' " />
+    <PackageReference Include="Microsoft.Build" Version="15.1.548" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="15.1.548" ExcludeAssets="runtime" />
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.2.2" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
     <PackageReference Include="Xunit.Combinatorial" Version="1.2.7" />
     <PackageReference Include="xunit" Version="2.4.1" />
@@ -43,11 +45,7 @@
     </PackageReference>
     <PackageReference Include="Xunit.SkippableFact" Version="1.3.12" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.9.20" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="15.1.548" />
     <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
   </ItemGroup>
 </Project>