From 3c47a63dc4bc9dee8f242a93e27c9641da6bded5 Mon Sep 17 00:00:00 2001
From: Tim Retout <tim@retout.co.uk>
Date: Sun, 2 Sep 2012 21:06:37 +0100
Subject: installer: Inline $installer::globals::required_dotnet_version

Change-Id: I653cee6f86476520d12eaa42c2afecdad1e75dc0
---
 solenv/bin/modules/installer/globals.pm          |  1 -
 solenv/bin/modules/installer/windows/property.pm | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'solenv/bin')

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 1cd549e2da31..e4cee55ec155 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -44,7 +44,6 @@ BEGIN
     $destdir = "";
     $rootpath = "";
 
-    $required_dotnet_version = "2.0.0.0";
     $productextension = "";
     @languageproducts = ();
     $build = "";
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index 6e70a1c77785..519d2e1bd85b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -399,15 +399,8 @@ sub set_important_properties
     }
 
     # Setting .NET requirements
-    if ( $installer::globals::required_dotnet_version ne "" )
-    {
-        my $onepropertyline = "REQUIRED_DOTNET_VERSION" . "\t" . $installer::globals::required_dotnet_version . "\n";
-        push(@{$propertyfile}, $onepropertyline);
-
-        $onepropertyline = "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET
-        push(@{$propertyfile}, $onepropertyline);
-    }
-
+    push @{$propertyfile}, "REQUIRED_DOTNET_VERSION" . "\t" . "2.0.0.0" . "\n";
+    push @{$propertyfile}, "DOTNET_SUFFICIENT" . "\t" . "1" . "\n"; # default value for found .NET
 }
 
 #######################################################
-- 
cgit