From 5edc560ee89bc8c7522c867aea2cc4aa42b63c2c Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 7 Oct 2019 15:40:11 -0700 Subject: Fix detect only upgrade logic --- src/WixToolset.Core/Compiler.cs | 1 - src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 7f078dbc..480e8758 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs @@ -7170,7 +7170,6 @@ namespace WixToolset.Core VersionMin = productVersion, Language = productLanguage, OnlyDetect = true, - MigrateFeatures = migrateFeatures, IgnoreRemoveFailures = ignoreRemoveFailure, ActionProperty = Common.DowngradeDetectedProperty }; diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index a6a1705f..3218c5ac 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs @@ -578,7 +578,7 @@ namespace WixToolsetTest.CoreIntegration } } - [Fact(Skip = "Test demonstrates failure")] + [Fact] public void PopulatesUpgradeTableFromDetectOnlyUpgrade() { var folder = TestData.Get(@"TestData"); @@ -607,7 +607,7 @@ namespace WixToolsetTest.CoreIntegration Assert.Equal(new[] { "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", - "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t1033\t\t2\t\tWIX_DOWNGRADE_DETECTED", + "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED", "Upgrade:{B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D}\t1.0.0\t\t\t256\t\tRELPRODFOUND", }, results); } -- cgit v1.2.3-55-g6feb