diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-28 21:49:14 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-28 22:04:11 -0600 |
| commit | b3fa4360440e42f162d695423b50f6cbc45f7f35 (patch) | |
| tree | 20ad9cfbe4b70a31f828b47aa4d68860f4637dc1 | |
| parent | 50f38d69001b2eb457a4603e14c98d05e28c3a5d (diff) | |
| download | wix-b3fa4360440e42f162d695423b50f6cbc45f7f35.tar.gz wix-b3fa4360440e42f162d695423b50f6cbc45f7f35.tar.bz2 wix-b3fa4360440e42f162d695423b50f6cbc45f7f35.zip | |
Use LatestMajor roll forward for Heat so it can load newer MSBuild.
| -rw-r--r-- | src/heat/heat.csproj | 2 | ||||
| -rw-r--r-- | 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 @@ | |||
| 13 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier> | 13 | <RuntimeIdentifier Condition=" '$(RuntimeIdentifier)'=='' and '$(TargetFramework)'!='netcoreapp2.1' ">win-x86</RuntimeIdentifier> |
| 14 | <AppConfig>app.config</AppConfig> | 14 | <AppConfig>app.config</AppConfig> |
| 15 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> | 15 | <ApplicationManifest>heat.exe.manifest</ApplicationManifest> |
| 16 | <RollForward>Major</RollForward> | 16 | <RollForward>LatestMajor</RollForward> |
| 17 | </PropertyGroup> | 17 | </PropertyGroup> |
| 18 | 18 | ||
| 19 | <PropertyGroup> | 19 | <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 | |||
| 257 | } | 257 | } |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | [Theory(Skip = "DotNetCoreSdk builds fail in 16.8.1")] | 260 | [Theory] |
| 261 | [InlineData(BuildSystem.DotNetCoreSdk, true)] | 261 | [InlineData(BuildSystem.DotNetCoreSdk, true)] |
| 262 | [InlineData(BuildSystem.DotNetCoreSdk, false)] | 262 | [InlineData(BuildSystem.DotNetCoreSdk, false)] |
| 263 | [InlineData(BuildSystem.MSBuild, true)] | 263 | [InlineData(BuildSystem.MSBuild, true)] |