From f71e6a5dfdda7f12bac06b36ef6761af41b94ea1 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 18 Mar 2021 02:33:32 -0700 Subject: Re-enable suppressed ICES test and update dependencies Completes wixtoolset/issues#5946 --- 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 + 5 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') 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 @@ + 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 @@ + 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 @@ - + 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 @@ + -- cgit v1.2.3-55-g6feb