diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-10-07 14:50:34 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-07 21:44:46 -0700 |
| commit | 4a32d8c4dd2073182cebcc3f1423fa618bd7e13d (patch) | |
| tree | 757535dc5296b293d56adb89a0bee26c8d8ff809 /src | |
| parent | 32ac87b2bf1a3a5bddb0630b65e52d117e5e2323 (diff) | |
| download | wix-4a32d8c4dd2073182cebcc3f1423fa618bd7e13d.tar.gz wix-4a32d8c4dd2073182cebcc3f1423fa618bd7e13d.tar.bz2 wix-4a32d8c4dd2073182cebcc3f1423fa618bd7e13d.zip | |
Fix Upgrade IncludeMinimum attribute
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler_2.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index 3ad8acf9..445e8dfa 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs | |||
| @@ -4849,7 +4849,7 @@ namespace WixToolset.Core | |||
| 4849 | includeMax = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); | 4849 | includeMax = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); |
| 4850 | break; | 4850 | break; |
| 4851 | case "IncludeMinimum": // this is "yes" by default | 4851 | case "IncludeMinimum": // this is "yes" by default |
| 4852 | includeMin = YesNoType.No == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); | 4852 | includeMin = YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); |
| 4853 | break; | 4853 | break; |
| 4854 | case "Language": | 4854 | case "Language": |
| 4855 | language = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 4855 | language = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs index cb798777..a6a1705f 100644 --- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs +++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs | |||
| @@ -546,7 +546,7 @@ namespace WixToolsetTest.CoreIntegration | |||
| 546 | } | 546 | } |
| 547 | } | 547 | } |
| 548 | 548 | ||
| 549 | [Fact(Skip = "Test demonstrates failure")] | 549 | [Fact] |
| 550 | public void PopulatesUpgradeTableFromManualUpgrade() | 550 | public void PopulatesUpgradeTableFromManualUpgrade() |
| 551 | { | 551 | { |
| 552 | var folder = TestData.Get(@"TestData\ManualUpgrade"); | 552 | var folder = TestData.Get(@"TestData\ManualUpgrade"); |