Changeset 11920 for stable/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling

Timestamp:

02/05/15 17:37:03 (10 years ago)

Author:

ascheibe

Message:

#2280 merged r11623, r11631, r11634 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/FrameworkVersionErrorDialog.Designer.cs (modified) (2 diffs)
• HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/FrameworkVersionErrorDialog.cs (modified) (3 diffs)

stable/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/FrameworkVersionErrorDialog.Designer.cs

@@ -85 +85 @@
       this.linkLabel.TabIndex = 2;
       this.linkLabel.TabStop = true;
-      this.linkLabel.Text = "Download Microsoft .NET Framework 4 (Full Profile)";
+      this.linkLabel.Text = "Download Microsoft .NET Framework 4.5";
       this.linkLabel.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel_LinkClicked);
       // 
@@ -96 +96 @@
       this.label.Size = new System.Drawing.Size(301, 43);
       this.label.TabIndex = 1;
-      this.label.Text = "To run HeuristicLab you need at least the Microsoft .NET Framework 4 (Full Profil" +
-    "e) or Mono version 2.11.4 or higher. Please download and install it.";
+      this.label.Text = "To run HeuristicLab you need at least the Microsoft .NET Framework 4.5 or Mono ve" +
+    "rsion 3.6.0 or higher. Please download and install it.";
       // 
       // linkLabelMono

stable/HeuristicLab.PluginInfrastructure/3.3/ErrorHandling/FrameworkVersionErrorDialog.cs

@@ -26 +26 @@
 namespace HeuristicLab.PluginInfrastructure {
   public partial class FrameworkVersionErrorDialog : Form {
-    public static bool NET4FullProfileInstalled {
+    private const string NETVersionPath = @"Software\Microsoft\NET Framework Setup\NDP\v4\Full";
+    private const string NETVersion = "Version";
+
+    public static bool NET4_5Installed {
       get {
         try {
-          return Microsoft.Win32.Registry.LocalMachine.OpenSubKey("Software\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full") != null;
+          var registryKey = Microsoft.Win32.Registry.LocalMachine.OpenSubKey(NETVersionPath);
+          if (registryKey != null) {
+            var versionKey = registryKey.GetValue(NETVersion);
+            if (versionKey != null) {
+              Version version = new Version(versionKey.ToString());
+              return version.Major >= 4 && version.Minor >= 5;
+            }
+          }
         }
         catch (System.Security.SecurityException) {
           return false;
         }
+        return false;
       }
     }
@@ -44 +55 @@
       get {
         var monoVersion = MonoVersion;
-        var minRequiredVersion = new Version(2, 11, 4);
-                                                                     
-        //we need at least mono version 2.11.4
+        var minRequiredVersion = new Version(3, 6, 0);
+
+        //we need at least mono version 3.6.0
         if (monoVersion != null && monoVersion >= minRequiredVersion) {
           return true;
@@ -84 +95 @@
     private void linkLabel_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
       try {
-        System.Diagnostics.Process.Start("http://www.microsoft.com/downloads/en/details.aspx?displaylang=en&FamilyID=0a391abd-25c1-4fc0-919f-b21f31ab88b7");
+        System.Diagnostics.Process.Start("http://www.microsoft.com/en-us/download/details.aspx?id=30653");
         linkLabel.LinkVisited = true;
       }