diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-07 15:40:11 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-07 21:44:46 -0700 |
| commit | 5edc560ee89bc8c7522c867aea2cc4aa42b63c2c (patch) | |
| tree | cbccf3e01d18864a0a46865bfc25f85d1ac89961 /src | |
| parent | 4a32d8c4dd2073182cebcc3f1423fa618bd7e13d (diff) | |
| download | wix-5edc560ee89bc8c7522c867aea2cc4aa42b63c2c.tar.gz wix-5edc560ee89bc8c7522c867aea2cc4aa42b63c2c.tar.bz2 wix-5edc560ee89bc8c7522c867aea2cc4aa42b63c2c.zip | |
Fix detect only upgrade logic
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 1 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 4 |
2 files changed, 2 insertions, 3 deletions
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 | |||
| 7170 | VersionMin = productVersion, | 7170 | VersionMin = productVersion, |
| 7171 | Language = productLanguage, | 7171 | Language = productLanguage, |
| 7172 | OnlyDetect = true, | 7172 | OnlyDetect = true, |
| 7173 | MigrateFeatures = migrateFeatures, | ||
| 7174 | IgnoreRemoveFailures = ignoreRemoveFailure, | 7173 | IgnoreRemoveFailures = ignoreRemoveFailure, |
| 7175 | ActionProperty = Common.DowngradeDetectedProperty | 7174 | ActionProperty = Common.DowngradeDetectedProperty |
| 7176 | }; | 7175 | }; |
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 | |||
| 578 | } | 578 | } |
| 579 | } | 579 | } |
| 580 | 580 | ||
| 581 | [Fact(Skip = "Test demonstrates failure")] | 581 | [Fact] |
| 582 | public void PopulatesUpgradeTableFromDetectOnlyUpgrade() | 582 | public void PopulatesUpgradeTableFromDetectOnlyUpgrade() |
| 583 | { | 583 | { |
| 584 | var folder = TestData.Get(@"TestData"); | 584 | var folder = TestData.Get(@"TestData"); |
| @@ -607,7 +607,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 607 | Assert.Equal(new[] | 607 | Assert.Equal(new[] |
| 608 | { | 608 | { |
| 609 | "Upgrade:{12E4699F-E774-4D05-8A01-5BDD41BBA127}\t\t1.0.0.0\t1033\t1\t\tWIX_UPGRADE_DETECTED", | 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", | 611 | "Upgrade:{B05772EA-82B8-4DE0-B7EB-45B5F0CCFE6D}\t1.0.0\t\t\t256\t\tRELPRODFOUND", |
| 612 | }, results); | 612 | }, results); |
| 613 | } | 613 | } |