Bumped the version.

jexuswebserver · Mar 23, 2019 · d124b5e · d124b5e
1 parent f09c918
commit d124b5e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 14 deletions.
diff --git a/JexusManager/Features/Main/ApplicationPoolAdvancedSettings.cs b/JexusManager/Features/Main/ApplicationPoolAdvancedSettings.cs
@@ -16,11 +16,11 @@ internal class ApplicationPoolAdvancedSettings
     {
         public ApplicationPoolAdvancedSettings(ApplicationPool pool)
         {
-            if (pool.ManagedRuntimeVersion == "v4.0")
+            if (pool.ManagedRuntimeVersion == ApplicationPool.ManagedRuntimeVersion40)
             {
                 CLRVersion = CLRVersion.V40;
             }
-            else if (pool.ManagedRuntimeVersion == "v2.0")
+            else if (pool.ManagedRuntimeVersion == ApplicationPool.ManagedRuntimeVersion20)
             {
                 CLRVersion = CLRVersion.V20;
             }
@@ -117,15 +117,15 @@ internal void Apply(ApplicationPool pool)
         {
             if (CLRVersion == CLRVersion.V40)
             {
-                pool.ManagedRuntimeVersion = "v4.0";
+                pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersion40;
             }
             else if (CLRVersion == CLRVersion.V20)
             {
-                pool.ManagedRuntimeVersion = "v2.0";
+                pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersion20;
             }
             else if (CLRVersion == CLRVersion.NoManagedCode)
             {
-                pool.ManagedRuntimeVersion = string.Empty;
+                pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersionNone;
             }
 
             pool.Enable32BitAppOnWin64 = Enable32Bit;

diff --git a/JexusManager/Features/Main/ApplicationPoolBasicSettingsDialog.cs b/JexusManager/Features/Main/ApplicationPoolBasicSettingsDialog.cs
@@ -6,7 +6,6 @@ namespace JexusManager.Features.Main
 {
     using System;
     using System.ComponentModel;
-    using System.Diagnostics;
     using System.Windows.Forms;
 
     using Microsoft.Web.Administration;
@@ -80,15 +79,15 @@ public ApplicationPoolBasicSettingsDialog(IServiceProvider serviceProvider, Appl
 
                     if (cbVersion.SelectedIndex == 0)
                     {
-                        Pool.ManagedRuntimeVersion = "v4.0";
+                        Pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersion40;
                     }
                     else if (cbVersion.SelectedIndex == 1)
                     {
-                        Pool.ManagedRuntimeVersion = "v2.0";
+                        Pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersion20;
                     }
                     else
                     {
-                        Pool.ManagedRuntimeVersion = string.Empty;
+                        Pool.ManagedRuntimeVersion = ApplicationPool.ManagedRuntimeVersionNone;
                     }
 
                     if (add && collection.Parent.Mode == WorkingMode.IisExpress)

diff --git a/JexusManager/Features/Main/KestrelDiagDialog.cs b/JexusManager/Features/Main/KestrelDiagDialog.cs
@@ -160,7 +160,7 @@ public KestrelDiagDialog(IServiceProvider provider, Site site)
                             }
 
                             // check ASP.NET version.
-                            if (pool.ManagedRuntimeVersion != string.Empty)
+                            if (pool.ManagedRuntimeVersion != ApplicationPool.ManagedRuntimeVersionNone)
                             {
                                 Error($"The application pool '{name}' is using .NET CLR {pool.ManagedRuntimeVersion}. Please set it to 'No Managed Code'.");
                             }

diff --git a/JexusManager/Properties/AssemblyInfo.cs b/JexusManager/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 + "190a69a439dbfb969ebad72a6f7e2e047907da4a7b9c08c6e98d5f1be8b8cafaf3eb978914059a"
 + "245d4bc1")]
 
-[assembly: AssemblyVersion("12.0.80.0")]
-[assembly: AssemblyFileVersion("12.0.80.0")]
+[assembly: AssemblyVersion("12.0.81.0")]
+[assembly: AssemblyFileVersion("12.0.81.0")]
diff --git a/Microsoft.Web.Administration/ApplicationPool.cs b/Microsoft.Web.Administration/ApplicationPool.cs
@@ -14,6 +14,9 @@ public sealed class ApplicationPool : ConfigurationElement
         private ApplicationPoolCpu _cpu;
 
         private ObjectState? _state;
+        internal const string ManagedRuntimeVersion40 = "v4.0";
+        internal const string ManagedRuntimeVersion20 = "v2.0";
+        internal readonly static string ManagedRuntimeVersionNone = string.Empty;
 
         internal ApplicationPool(ConfigurationElement element, ApplicationPoolCollection parent)
             : base(element, "add", null, parent, null, null)

diff --git a/Microsoft.Web.Administration/JexusHelper.cs b/Microsoft.Web.Administration/JexusHelper.cs
@@ -226,7 +226,7 @@ public async Task LoadAsync()
             var newPool = new ApplicationPool(null, ApplicationPools)
             {
                 Name = "DefaultAppPool",
-                ManagedRuntimeVersion = variables.Load(new List<string> {"v2.0"}, "runtime")[0]
+                ManagedRuntimeVersion = variables.Load(new List<string> {ApplicationPool.ManagedRuntimeVersion20}, "runtime")[0]
             };
             newPool.ProcessModel.MaxProcesses = long.Parse(variables.Load(new List<string> { "1" }, "httpd.processes")[0]);
             newPool.ProcessModel.UserName = variables.Load(new List<string> { string.Empty }, "httpd.user")[0];

diff --git a/Tests/TestCases.cs b/Tests/TestCases.cs
@@ -47,7 +47,7 @@ public static void TestIisExpress(ServerManager server, string fileName)
             var model = pool.GetChildElement("processModel");
             var item = model["maxProcesses"];
             Assert.Equal("Clr4IntegratedAppPool", pool.Name);
-            Assert.Equal("v4.0", pool.ManagedRuntimeVersion);
+            Assert.Equal(ApplicationPool.ManagedRuntimeVersion40, pool.ManagedRuntimeVersion);
             Assert.Equal(1, pool.ProcessModel.MaxProcesses);
             Assert.Equal(string.Empty, pool.ProcessModel.UserName);
 #if IIS