From f71e6a5dfdda7f12bac06b36ef6761af41b94ea1 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 18 Mar 2021 02:33:32 -0700
Subject: Re-enable suppressed ICES test and update dependencies

Completes wixtoolset/issues#5946
---
 appveyor.cmd                                                        | 2 +-
 appveyor.yml                                                        | 2 ++
 src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj              | 1 +
 src/heat/heat.csproj                                                | 1 +
 src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj | 2 +-
 src/test/WixToolsetTest.Sdk/MsbuildFixture.cs                       | 2 +-
 src/wix/wix.csproj                                                  | 1 +
 7 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/appveyor.cmd b/appveyor.cmd
index 23058ece..0cf8062c 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -1,9 +1,9 @@
 @setlocal
 @pushd %~dp0
 @set _C=Release
+@if /i "%1"=="debug" set _C=Debug
 @set _P=%~dp0build\%_C%\publish
 @set _RCO=/S /R:1 /W:1 /NP /XO  /NS /NC /NFL /NDL /NJH /NJS
-@if /i "%1"=="debug" set _C=Debug
 
 :: Restore
 nuget restore || exit /b
diff --git a/appveyor.yml b/appveyor.yml
index 43014705..d3b93b78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,6 +30,8 @@ nuget:
 skip_branch_with_pr: true
 skip_tags: true
 
+test: off
+
 artifacts:
 - path: build\Release\**\*.msi
   name: msi
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index e4dfaf2f..20ae6931 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -20,6 +20,7 @@
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
   </ItemGroup>
diff --git a/src/heat/heat.csproj b/src/heat/heat.csproj
index 53446e2f..83f97343 100644
--- a/src/heat/heat.csproj
+++ b/src/heat/heat.csproj
@@ -26,6 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
     <PackageReference Include="WixToolset.Harvesters" Version="4.0.*" />
   </ItemGroup>
 
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index 696e5845..95a88190 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -28,7 +28,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index f505dbb5..034f5b0b 100644
--- a/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -240,7 +240,7 @@ namespace WixToolsetTest.Sdk
             }
         }
 
-        [Theory(Skip = "https://github.com/wixtoolset/issues/issues/5946")]
+        [Theory]
         [InlineData(BuildSystem.DotNetCoreSdk)]
         [InlineData(BuildSystem.MSBuild)]
         [InlineData(BuildSystem.MSBuild64)]
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index f414bf41..648816fd 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -27,6 +27,7 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.Converters" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Native" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.ExtensionCache" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
-- 
cgit v1.2.3-55-g6feb