Merges latest changes from 9.4.x into development

.github/APPROVERS.md

@@ -0,0 +1,38 @@
+# The Approvers Group
+
+A vital role in our project is reserved for the people who decide what code is accepted into our framework, and what 
+is not. This is the task of the (Git) Approvers Group. To explain let's look at how the code of DNN gets changed.
+
+As you are probably aware the way the source code of DNN (which is hosted on Github)
+is currently managed, is through accepting so-called Pull Requests (or PRs). These PRs are submitted by
+enthusiasts like you and me where we aim to change the Repository ("base code") of the platform. The current list
+of PRs can be found here: [https://github.com/dnnsoftware/Dnn.Platform/pulls](https://github.com/dnnsoftware/Dnn.Platform/pulls)
+
+Before any PR gets accepted it has to be reviewed by 2 people before it can be "merged" into the main repository. 
+This reviewing and merging is done by a handful of people. 
+Due to the sensitive nature of this task and the skills required to do it, this is a highly restricted group.
+In the interest of transparency and to avoid any confusion here is a list of criteria that guide our decision as to who is part of this group:
+
+- Actively take part in the project (like attending Tech meetings, contributing code, etc)
+- Having in-depth knowledge of the overall organization and architecture of the project (this favors people who have been with the project for some time)
+- Having a track record of good code contributions
+- Knowledge of Git and Github
+- Having enough time to devote to this task
+
+This group is dynamic. Meaning: we expect people to float into and out of this group. 
+It is not an award that you put on a shelf like an MVP-ship.
+It is an ongoing task and if someone drifts away to focus on something else that person will be removed from this group.
+
+This group is practical. Meaning: there are no stacks of procedures. 
+We try to keep things simple and focus on a smooth development process for DNN.
+Members stay in touch through a Slack channel and meet
+bi-weekly to discuss progress.
+
+The current members are:
+- Brian Dukes
+- Peter Donker
+- Mitch Sellers
+- David Poindexter
+- Daniel Valadas
+- Matt Rutledge
+

Build/Cake/ci.cake

@@ -0,0 +1,11 @@
+Task("BuildAll")
+    .IsDependentOn("CleanArtifacts")
+    .IsDependentOn("UpdateDnnManifests")
+	.IsDependentOn("CreateInstall")
+	.IsDependentOn("CreateUpgrade")
+    .IsDependentOn("CreateDeploy")
+    .IsDependentOn("CreateSymbols")
+    .IsDependentOn("CreateNugetPackages")
+    .Does(() =>
+	{
+	});

Build/Cake/compiling.cake

@@ -1,9 +1,8 @@
 // Main solution
 var dnnSolutionPath = "./DNN_Platform.sln";
 
-Task("CompileSource")
+Task("Build")
     .IsDependentOn("CleanWebsite")
-    .IsDependentOn("UpdateDnnManifests")
 	.IsDependentOn("Restore-NuGet-Packages")
 	.Does(() =>
 	{

Build/Cake/create-database.cake

@@ -1,6 +1,17 @@
-
 string connectionString = @"server=(localdb)\MSSQLLocalDB";
 
+Task("BuildWithDatabase")
+    .IsDependentOn("CleanArtifacts")
+    .IsDependentOn("UpdateDnnManifests")
+	.IsDependentOn("CreateInstall")
+	.IsDependentOn("CreateUpgrade")
+	.IsDependentOn("CreateDeploy")
+    .IsDependentOn("CreateSymbols")
+    .IsDependentOn("CreateDatabase")
+    .Does(() =>
+	{
+	});
+
 Task("CreateDatabase")
   .Does(() => 
     {

Build/Cake/devsite.cake

@@ -1,12 +1,10 @@
 Task("ResetDevSite")
     .IsDependentOn("ResetDatabase")
-	.IsDependentOn("BackupManifests")
     .IsDependentOn("PreparePackaging")
 	.IsDependentOn("OtherPackages")
 	.IsDependentOn("ExternalExtensions")
 	.IsDependentOn("CopyToDevSite")
 	.IsDependentOn("CopyWebConfigToDevSite")
-	.IsDependentOn("RestoreManifests")
     .Does(() => 
     {
     });

Build/Cake/nuget.cake

@@ -3,7 +3,7 @@ Task("CreateNugetPackages")
 	.Does(() =>
 	{
 		//look for solutions and start building them
-		var nuspecFiles = GetFiles("./Build/Tools/NuGet/DotNetNuke.*.nuspec");
+		var nuspecFiles = GetFiles("./Build/Tools/NuGet/*.nuspec");
 
 		Information("Found {0} nuspec files.", nuspecFiles.Count);
 

Build/Cake/packaging.cake

@@ -12,7 +12,7 @@ PackagingPatterns packagingPatterns;
 
 Task("PreparePackaging")
 	.IsDependentOn("CopyWebsite")
-	.IsDependentOn("CompileSource")
+	.IsDependentOn("Build")
 	.IsDependentOn("CopyWebConfig")
 	.IsDependentOn("CopyWebsiteBinFolder")
     .Does(() =>
@@ -53,7 +53,7 @@ Task("CreateInstall")
         var files = GetFilesByPatterns(websiteFolder, new string[] {"**/*"}, packagingPatterns.installExclude);
         files.Add(GetFilesByPatterns(websiteFolder, packagingPatterns.installInclude));
         Information("Zipping {0} files for Install zip", files.Count);
-        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Install.zip", GetProductVersion());
+        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Install.zip", GetBuildNumber());
         Zip(websiteFolder, packageZip, files);
 	});
 
@@ -70,7 +70,7 @@ Task("CreateUpgrade")
         var files = GetFilesByPatterns(websiteFolder, new string[] {"**/*"}, excludes);
 		files.Add(GetFiles("./Website/Install/Module/DNNCE_Website.Deprecated_*_Install.zip"));
         Information("Zipping {0} files for Upgrade zip", files.Count);
-        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Upgrade.zip", GetProductVersion());
+        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Upgrade.zip", GetBuildNumber());
         Zip(websiteFolder, packageZip, files);
 	});
 
@@ -81,7 +81,7 @@ Task("CreateDeploy")
 	.Does(() =>
 	{
         CreateDirectory(artifactsFolder);
-        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Deploy.zip", GetProductVersion());
+        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Deploy.zip", GetBuildNumber());
 		var deployFolder = "./DotNetNuke/";
 		var deployDir = Directory(deployFolder);
 		System.IO.Directory.Move(websiteDir.Path.FullPath, deployDir.Path.FullPath);
@@ -99,7 +99,7 @@ Task("CreateSymbols")
 	.Does(() =>
 	{
         CreateDirectory(artifactsFolder);
-        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Symbols.zip", GetProductVersion());
+        var packageZip = string.Format(artifactsFolder + "DNN_Platform_{0}_Symbols.zip", GetBuildNumber());
         Zip("./Build/Symbols/", packageZip, GetFiles("./Build/Symbols/*"));
 		// Fix for WebUtility symbols missing from bin folder
 		CopyFiles(GetFiles("./DNN Platform/DotNetNuke.WebUtility/bin/DotNetNuke.WebUtility.*"), websiteFolder + "bin/");

Build/Cake/settings.cake

@@ -8,7 +8,6 @@ public class LocalSettings {
     public string DnnDatabaseName {get; set;} = "Dnn_Platform";
     public string DnnSqlUsername {get; set;} = "";
     public string DatabasePath {get; set;} = "";
-    public string Version {get; set;} = "auto";
 }
 
 LocalSettings Settings;

Build/Cake/testing.cake

@@ -1,5 +1,5 @@
 Task("Run-Unit-Tests")
-    .IsDependentOn("CompileSource")
+    .IsDependentOn("Build")
     .Does(() =>
 	{
 		NUnit3("./src/**/bin/" + configuration + "/*.Test*.dll", new NUnit3Settings {

Build/Cake/thirdparty.cake

@@ -11,7 +11,6 @@ public class OtherPackage {
 }
 
 Task("OtherPackages")
-    .IsDependentOn("UpdateDnnManifests")
     .IsDependentOn("Newtonsoft")
     .Does(() =>
 	{

Build/Cake/unit-tests.cake

@@ -1,4 +1,3 @@
-
 Task("EnsureAllProjectsBuilt")
   .IsDependentOn("UpdateDnnManifests")
   .IsDependentOn("Restore-NuGet-Packages")

Build/Cake/version.cake

@@ -1,58 +1,54 @@
+// These tasks are meant for our CI build process. They set the versions of the assemblies and manifests to the version found on Github.
+
 GitVersion version;
 var buildId = EnvironmentVariable("BUILD_BUILDID") ?? "0";
+var buildNumber = "";
+var productVersion = "";
+
+var unversionedManifests = new string[] {
+  "DNN Platform/Components/Microsoft.*/**/*.dnn",
+  "DNN Platform/Components/Newtonsoft/*.dnn",
+  "DNN Platform/JavaScript Libraries/**/*.dnn",
+  "Temp/**/*.dnn"
+};
 
 Task("BuildServerSetVersion")
-  .IsDependentOn("GitVersion")
+  .IsDependentOn("SetVersion")
   .Does(() => {
     StartPowershellScript($"Write-Host ##vso[build.updatebuildnumber]{version.FullSemVer}.{buildId}");
 });
 
-Task("GitVersion")
+Task("SetVersion")
   .Does(() => {
-    Information("Local Settings Version is : " + Settings.Version);
-    if (Settings.Version == "auto") {
-      version = GitVersion(new GitVersionSettings {
-          UpdateAssemblyInfo = true,
-          UpdateAssemblyInfoFilePath = @"SolutionInfo.cs"
-      });
-      Information(Newtonsoft.Json.JsonConvert.SerializeObject(version));
-    } else {
-      version = new GitVersion();
-      var v = new System.Version(Settings.Version);
-      version.AssemblySemFileVer = Settings.Version.ToString();
-      version.Major = v.Major;
-      version.Minor = v.Minor;
-      version.Patch = v.Build;
-      version.Patch = v.Revision;
-      version.FullSemVer = v.ToString();
-      version.InformationalVersion = v.ToString() + "-custom";
-      FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyVersion(\"{0}\")]\r\n", v.ToString(3)));
-      FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyFileVersion(\"{0}\")]\r\n", version.FullSemVer));
-      FileAppendText("SolutionInfo.cs", string.Format("[assembly: AssemblyInformationalVersion(\"{0}\")]\r\n", version.InformationalVersion));
-    }
-    Information("AssemblySemFileVer : " + version.AssemblySemFileVer);
-    Information("Manifests Version String : " + $"{version.Major.ToString("00")}.{version.Minor.ToString("00")}.{version.Patch.ToString("00")}");
-    Information("The full sevVer is : " + version.FullSemVer);
+    version = GitVersion();
+    Information(Newtonsoft.Json.JsonConvert.SerializeObject(version));
+    Dnn.CakeUtils.Utilities.UpdateAssemblyInfoVersion(new System.Version(version.Major, version.Minor, version.Patch, version.CommitsSinceVersionSource != null ? (int)version.CommitsSinceVersionSource : 0), version.InformationalVersion, "SolutionInfo.cs");
+    Information("Informational Version : " + version.InformationalVersion);
+    buildNumber = version.LegacySemVerPadded;
+    productVersion = version.MajorMinorPatch;
+    Information("Product Version : " + productVersion);
+    Information("Build Number : " + buildNumber);
     Information("The build Id is : " + buildId);
 });
 
 Task("UpdateDnnManifests")
-  .IsDependentOn("GitVersion")
-  .DoesForEach(GetFiles("**/*.dnn"), (file) => 
+  .IsDependentOn("SetVersion")
+  .DoesForEach(GetFilesByPatterns(".", new string[] {"**/*.dnn"}, unversionedManifests), (file) => 
   { 
+    Information("Transforming: " + file);
     var transformFile = File(System.IO.Path.GetTempFileName());
     FileAppendText(transformFile, GetXdtTransformation());
     XdtTransformConfig(file, transformFile, file);
 });
 
 public string GetBuildNumber()
 {
-    return version.LegacySemVerPadded;
+    return buildNumber;
 }
 
 public string GetProductVersion()
 {
-    return version.MajorMinorPatch;
+    return productVersion;
 }
 
 public string GetXdtTransformation()
@@ -63,8 +59,7 @@ public string GetXdtTransformation()
 <dotnetnuke xmlns:xdt=""http://schemas.microsoft.com/XML-Document-Transform"">
   <packages>
     <package version=""{versionString}"" 
-             xdt:Transform=""SetAttributes(version)""
-             xdt:Locator=""Condition([not(@version)])"" />
+             xdt:Transform=""SetAttributes(version)"" />
   </packages>
 </dotnetnuke>";
 }

Build/Symbols/DotNetNuke_Symbols.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.04.02" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>

Build/Tools/NuGet/Dnn.PersonaBar.Library.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>DNN PersonaBar Common Library</description>
     <copyright>Copyright (c) .NET Foundation and Contributors, All Rights Reserved.</copyright>
@@ -22,5 +23,6 @@
     <file src="..\..\..\Website\bin\Dnn.PersonaBar.Library.dll" target="lib\net45\"/>
     <file src="..\..\..\Website\bin\Dnn.PersonaBar.Library.pdb" target="lib\net45\"/>
     <file src="..\..\..\Website\bin\Dnn.PersonaBar.Library.xml" target="lib\net45\"/>
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
-</package>
+</package>

Build/Tools/NuGet/DotNetNuke.Abstractions.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       Provides common abstraction API references for the DNN Platform.
@@ -18,5 +19,6 @@
   <files>
     <file src="..\..\..\Website\bin\DotNetNuke.Abstractions.dll" target="lib\netstandard2.0" />
     <file src="..\..\..\Website\bin\DotNetNuke.Abstractions.pdb" target="lib\netstandard2.0" />
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
 </package>

Build/Tools/NuGet/DotNetNuke.Bundle.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       This package is a metapackage that automatically includes all other available DNN Packages, this should only be used in situations where support for ALL types of development are truly needed.
@@ -40,5 +41,6 @@
     <file src="..\..\..\DNN Platform\Tests\DotNetNuke.Tests.Utilities\bin\DotNetNuke.Tests.Utilities.pdb" target="lib\net45\"/>
 
     <file src="..\..\..\DNN Platform\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll" target="lib\net45\"/>
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
 </package>

Build/Tools/NuGet/DotNetNuke.Core.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       Provides basic references to the DotNetNuke.dll to develop extensions for the DNN Platform.  For MVC or WebAPI please see other packages available as well
@@ -22,5 +23,6 @@
     <file src="..\..\..\Website\bin\DotNetNuke.dll" target="lib\net45\" />
     <file src="..\..\..\Website\bin\DotNetNuke.pdb" target="lib\net45\" />
     <file src="..\..\..\Website\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\net45\" />
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
-</package>
+</package>

Build/Tools/NuGet/DotNetNuke.DependencyInjection.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       Provides API references needed to use Dependency Injection for the DNN Platform.
@@ -21,5 +22,6 @@
   <files>
     <file src="..\..\..\Website\bin\DotNetNuke.DependencyInjection.dll" target="lib\netstandard2.0" />
     <file src="..\..\..\Website\bin\DotNetNuke.DependencyInjection.pdb" target="lib\netstandard2.0" />
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
 </package>

Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec

@@ -8,7 +8,8 @@
     <owners>DNN Corp</owners>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>http://www.dnnsoftware.com/favicon.ico</iconUrl>
+    <icon>images\logo-for-nuget.png</icon>
+    <iconUrl>https://dnncommunity.org/favicon.ico</iconUrl>
     <projectUrl>https://github.com/dnnsoftware/Dnn.Platform</projectUrl>
     <description>
       Provides references to enhanced logging and instrumentation available within DNN Platform for extension developers. Including access to Log4Net
@@ -23,5 +24,6 @@
     <file src="..\..\..\Website\bin\DotNetNuke.Instrumentation.pdb" target="lib\net45\" />
     <file src="..\..\..\Website\bin\DotNetNuke.Log4Net.dll" target="lib\net45\"/>
     <file src="..\..\..\Website\bin\DotNetNuke.Log4Net.pdb" target="lib\net45\"/>
+    <file src="logo-for-nuget.png" target="images\"/>
   </files>
-</package>
+</package>