Merge pull request #6201 from bdukes/fix-server-info-version

Fix server info error on .NET 4.8

DNN Platform/Library/Common/Globals.cs

@@ -478,6 +478,10 @@ public static TimeSpan ElapsedSinceAppStart
         /// </value>
         public static Version NETFrameworkVersion { get; set; }
 
+        /// <summary>Gets the .Net framework version text.</summary>
+        /// <value>The .Net framework version text.</value>
+        public static string FormattedNetFrameworkVersion => FormatVersion(NETFrameworkVersion, "0", 3, ".");
+
         /// <summary>Gets or sets the database engine version.</summary>
         /// <value>
         /// The database engine version.

DNN Platform/Tests/DotNetNuke.Tests.Core/Common/GlobalsTests.cs

@@ -0,0 +1,57 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace DotNetNuke.Tests.Core.Common;
+
+using System;
+
+using DotNetNuke.Common;
+
+using NUnit.Framework;
+
+[TestFixture]
+public class GlobalsTests
+{
+    [Test]
+    public void FormatVersion_WhenTwoDigitVersionFormattedWithThreeParts_UsesZeroForThirdPart()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8"), "0", 3, "."), Is.EqualTo("4.8.0"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenThreeDigitVersionFormattedWithThreeParts_DisplaysThirdPart()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8.1"), "0", 3, "."), Is.EqualTo("4.8.1"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenFourDigitVersionFormattedWithThreeParts_DoesNotDisplayFourthPart()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8.1.7"), "0", 3, "."), Is.EqualTo("4.8.1"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenTwoDigitVersion_DisplaysThreePartsWithLeadingZeroes_InABrokenWay()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8")), Is.EqualTo("04.08.-01"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenThreeDigitVersion_DisplaysThirdPartWithLeadingZeroes()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8.1")), Is.EqualTo("04.08.01"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenFourDigitVersion_DisplaysThreePartsWithLeadingZeroes()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8.1.7")), Is.EqualTo("04.08.01"));
+    }
+
+    [Test]
+    public void FormatVersion_WhenFourDigitVersionWithRevision_DisplaysThreePartsWithLeadingZeroes()
+    {
+        Assert.That(Globals.FormatVersion(new Version("4.8.1.7"), true), Is.EqualTo("04.08.01 (7)"));
+    }
+}

DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj

@@ -162,6 +162,7 @@
     <Compile Include="Collections\ReaderWriterSlimLockTests.cs" />
     <Compile Include="Collections\SharedDictionaryTests.cs" />
     <Compile Include="Collections\SharedListTests.cs" />
+    <Compile Include="Common\GlobalsTests.cs" />
     <Compile Include="Common\NavigationManagerTests.cs" />
     <Compile Include="Common\UrlUtilsTests.cs" />
     <Compile Include="ComponentModel\ComponentFactoryTests.cs" />

Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Prompt/Models/HostModel.cs

@@ -1,20 +1,20 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information
-
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
 namespace Dnn.PersonaBar.Prompt.Components.Models
 {
     using System.Web;
-
+
     using DotNetNuke.Common;
     using DotNetNuke.Entities.Host;
     using DotNetNuke.Entities.Users;
-
+
     public class HostModel
     {
         // DNN Platform for example
         public string Product { get; set; }
-
+
         public string Version { get; set; }
 
         public bool UpgradeAvailable { get; set; }
@@ -30,23 +30,23 @@ public class HostModel
 
         // prompt.com
         public string Site { get; set; }
-
+
         public string Title { get; set; }
-
+
         public string Url { get; set; }
-
+
         public string Email { get; set; }
-
+
         public string Theme { get; set; }
-
+
         public string Container { get; set; }
-
+
         public string EditTheme { get; set; }
-
+
         public string EditContainer { get; set; }
-
+
         public int PortalCount { get; set; }
-
+
         public static HostModel Current()
         {
             var application = DotNetNuke.Application.DotNetNukeContext.Current.Application;
@@ -63,7 +63,7 @@ public static HostModel Current()
                 Version = "v." + Globals.FormatVersion(application.Version, true),
                 Product = application.Description,
                 UpgradeAvailable = upgradeIndicator != null,
-                Framework = isHost ? Globals.NETFrameworkVersion.ToString(3) : string.Empty,
+                Framework = isHost ? Globals.FormattedNetFrameworkVersion : string.Empty,
                 IpAddress = System.Net.Dns.GetHostEntry(hostName).AddressList[0].ToString(),
                 Permissions = DotNetNuke.Framework.SecurityPolicy.Permissions,
                 Site = hostPortal.PortalName,

Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Servers/WebServer/ServerInfo.cs

@@ -15,7 +15,7 @@ public class ServerInfo
     {
         public string Framework => Environment.Version.ToString();
 
-        public string NetFrameworkVersion => Globals.NETFrameworkVersion.ToString(3);
+        public string NetFrameworkVersion => Globals.FormattedNetFrameworkVersion;
 
         public string HostName => Dns.GetHostName();
 

Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Services/ServerSummaryController.cs

@@ -51,7 +51,7 @@ public HttpResponseMessage GetServerInfo()
                 {
                     ProductName = DotNetNukeContext.Current.Application.Description,
                     ProductVersion = "v. " + Globals.FormatVersion(DotNetNukeContext.Current.Application.Version, true),
-                    FrameworkVersion = isHost ? Globals.NETFrameworkVersion.ToString(3) : string.Empty,
+                    FrameworkVersion = isHost ? Globals.FormattedNetFrameworkVersion : string.Empty,
                     ServerName = isHost ? Globals.ServerName : string.Empty,
                     LicenseVisible = isHost && this.GetVisibleSetting("LicenseVisible"),
                     DocCenterVisible = this.GetVisibleSetting("DocCenterVisible"),