diff options
| author | Andras Timar <atimar@suse.com> | 2013-01-29 13:20:07 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-01-30 15:25:05 +0100 |
| commit | cf4ca992349492019938b68ae33ec9fec7cd5e16 (patch) | |
| tree | a8463c2c9bc1d5aca03ea1784de360e319267926 /solenv/bin/modules | |
| parent | d14c765b6e20158af34520e1092c552a6d28bbb3 (diff) | |
remove DotNetCheck CustomAction
We do not need to call a dll function for a simple version check.
Change-Id: If82b06a61f10dbfe3eb92b6fe495e6d800c57aff
Diffstat (limited to 'solenv/bin/modules')
| -rw-r--r-- | solenv/bin/modules/installer/windows/assembly.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/windows/property.pm | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/windows/assembly.pm b/solenv/bin/modules/installer/windows/assembly.pm index e639ee2a4989..a03c4de8fb76 100644 --- a/solenv/bin/modules/installer/windows/assembly.pm +++ b/solenv/bin/modules/installer/windows/assembly.pm @@ -283,7 +283,7 @@ sub add_assembly_condition_into_component_table { # setting the condition - $condition = "DOTNET_SUFFICIENT=1"; + $condition = "MsiNetAssemblySupport >= \"4.0.0.0\""; $oneline = $component . "\t" . $componentid . "\t" . $directory . "\t" . $attributes . "\t" . $condition . "\t" . $keypath . "\n"; ${$componenttable}[$j] = $oneline; $changed = 1; diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index f780a6dddd59..7cf568ea7f57 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -360,10 +360,6 @@ sub set_important_properties push(@{$propertyfile}, $onepropertyline); } } - - # Setting .NET requirements - push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "4.0.0.0" . "\n"; - push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET } ####################################################### |