diff options
| author | Bob Arnson <bob@firegiant.com> | 2019-11-10 18:19:36 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2019-11-10 18:31:56 -0500 |
| commit | df709d87c25945c10b9d29273dd90b6df6359a99 (patch) | |
| tree | cd4cfca3ce6f548988a35cf38b7e428e3600505e /src/WixToolset.Core/Compiler.cs | |
| parent | e29c25090e26c8cca52232d580528840d1161b73 (diff) | |
| download | wix-df709d87c25945c10b9d29273dd90b6df6359a99.tar.gz wix-df709d87c25945c10b9d29273dd90b6df6359a99.tar.bz2 wix-df709d87c25945c10b9d29273dd90b6df6359a99.zip | |
Clean up upgrade properties; support <?ifdef $()?>
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index b983981b..56d3a8b4 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -7137,9 +7137,6 @@ namespace WixToolset.Core | |||
| 7137 | 7137 | ||
| 7138 | this.Core.AddTuple(tuple); | 7138 | this.Core.AddTuple(tuple); |
| 7139 | 7139 | ||
| 7140 | // Ensure the action property is secure. | ||
| 7141 | this.AddWixPropertyRow(sourceLineNumbers, new Identifier(AccessModifier.Public, Common.UpgradeDetectedProperty), false, true, false); | ||
| 7142 | |||
| 7143 | // Add launch condition that blocks upgrades | 7140 | // Add launch condition that blocks upgrades |
| 7144 | if (blockUpgrades) | 7141 | if (blockUpgrades) |
| 7145 | { | 7142 | { |
| @@ -7167,9 +7164,6 @@ namespace WixToolset.Core | |||
| 7167 | 7164 | ||
| 7168 | this.Core.AddTuple(upgradeTuple); | 7165 | this.Core.AddTuple(upgradeTuple); |
| 7169 | 7166 | ||
| 7170 | // Ensure the action property is secure. | ||
| 7171 | this.AddWixPropertyRow(sourceLineNumbers, new Identifier(AccessModifier.Public, Common.DowngradeDetectedProperty), false, true, false); | ||
| 7172 | |||
| 7173 | var conditionTuple = new LaunchConditionTuple(sourceLineNumbers) | 7167 | var conditionTuple = new LaunchConditionTuple(sourceLineNumbers) |
| 7174 | { | 7168 | { |
| 7175 | Condition = Common.DowngradePreventedCondition, | 7169 | Condition = Common.DowngradePreventedCondition, |
