Fix detect only upgrade logic
Rob Mensching committed
Oct 7, 2019 at 15:40 UTC
5edc560ee89bc8c7522c867aea2cc4aa42b63c2c
2 files changed
+2
-3
src/WixToolset.Core/Compiler.cs
-1
@@ -7170,7 +7170,6 @@ namespace WixToolset.Core
7170
VersionMin = productVersion,
7171
Language = productLanguage,
7172
OnlyDetect = true,
7173
- MigrateFeatures = migrateFeatures,
7173
IgnoreRemoveFailures = ignoreRemoveFailure,
7174
ActionProperty = Common.DowngradeDetectedProperty
7175
};
src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+2
-2
@@ -578,7 +578,7 @@ namespace WixToolsetTest.CoreIntegration
578
}
579
}
580
581
- [Fact(Skip = "Test demonstrates failure")]
581
+ [Fact]
582
public void PopulatesUpgradeTableFromDetectOnlyUpgrade()
583
{
584
var folder = TestData.Get(@"TestData");
@@ -607,7 +607,7 @@ namespace WixToolsetTest.CoreIntegration
607
Assert.Equal(new[]
608
{
609
"Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED",
610
- "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t1033\t\t2\t\tWIX_DOWNGRADE_DETECTED",
610
+ "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t1.0.0.0\t\t1033\t2\t\tWIX_DOWNGRADE_DETECTED",
611
"Upgrade:{B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D}\t1.0.0\t\t\t256\t\tRELPRODFOUND",
612
}, results);
613
}