From b3fa4360440e42f162d695423b50f6cbc45f7f35 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 28 Nov 2020 21:49:14 -0600
Subject: Use LatestMajor roll forward for Heat so it can load newer MSBuild.

---
 src/heat/heat.csproj                              | 2 +-
 src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj
index b82087df..f21f2eb6 100644
--- a/src/heat/heat.csproj
+++ b/src/heat/heat.csproj
@@ -13,7 +13,7 @@
     <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier>
     <AppConfig>app.config</AppConfig>
     <ApplicationManifest>heat.exe.manifest</ApplicationManifest>
-    <RollForward>Major</RollForward>
+    <RollForward>LatestMajor</RollForward>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
index bbf151eb..10840c56 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
+++ b/src/test/WixToolsetTest.Sdk/MsbuildHeatFixture.cs
@@ -257,7 +257,7 @@ namespace WixToolsetTest.Sdk
             }
         }
 
-        [Theory(Skip = "DotNetCoreSdk builds fail in 16.8.1")]
+        [Theory]
         [InlineData(BuildSystem.DotNetCoreSdk, true)]
         [InlineData(BuildSystem.DotNetCoreSdk, false)]
         [InlineData(BuildSystem.MSBuild, true)]
-- 
cgit v1.2.3-55-g6feb