Third installment of build reorganization

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/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/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>

DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Console" type="Module">
+        <package name="DotNetNuke.Console" type="Module" version="09.04.02">
             <friendlyName>Console</friendlyName>
             <description>Display children pages as icon links for navigation.</description>
             <iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
@@ -27,7 +27,7 @@
                                 <friendlyName>Console</friendlyName>
                                 <moduleControls>
                                     <moduleControl>
-                                        <controlKey />
+                                        <controlKey/>
                                         <controlSrc>DesktopModules/Admin/Console/ViewConsole.ascx</controlSrc>
                                         <controlTitle>Console</controlTitle>
                                         <controlType>View</controlType>

DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Module Creator" type="Module">
+        <package name="DotNetNuke.Module Creator" type="Module" version="09.04.02">
             <friendlyName>Module Creator</friendlyName>
             <description>Development of modules.</description>
             <iconFile>~/Icons/Sigma/ModuleCreator_32x32.png</iconFile>
@@ -27,7 +27,7 @@
                                 <friendlyName>Module Creator</friendlyName>
                                 <moduleControls>
                                     <moduleControl>
-                                        <controlKey />
+                                        <controlKey/>
                                         <controlSrc>DesktopModules/Admin/ModuleCreator/CreateModule.ascx</controlSrc>
                                         <controlTitle></controlTitle>
                                         <controlType>Host</controlType>

DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform-net46/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn

@@ -10,7 +10,7 @@
         <url>http://www.dnnsoftware.com</url>
         <email>support@dnnsoftware.com</email>
       </owner>
-      <license />
+      <license/>
       <releaseNotes src="releaseNotes.txt"></releaseNotes>
       <components>
         <component type="Assembly">

DNN Platform/Components/Microsoft.CodeDom.Providers.DotNetCompilerPlatform/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dnn

@@ -10,7 +10,7 @@
         <url>http://www.dnnsoftware.com</url>
         <email>support@dnnsoftware.com</email>
       </owner>
-      <license />
+      <license/>
       <releaseNotes src="releaseNotes.txt"></releaseNotes>
       <components>
         <component type="Assembly">

DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true">
+    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.04.02">
       <friendlyName>DotNetNuke Telerik Web Components</friendlyName>
       <description>Provides Telerik Components for DotNetNuke.</description>
       <dependencies/>

DNN Platform/Connectors/Azure/AzureConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.AzureConnector" type="Connector" isSystem="false">
+        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.04.02">
             <friendlyName>Dnn Azure Connector</friendlyName>
             <description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
             <iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>

DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false">
+        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.04.02">
             <friendlyName>Google Analytics Connector</friendlyName>
             <description>Configure your sites Google Analytics settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>

DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNJWT" type="Provider">
+    <package name="DNNJWT" type="Provider" version="09.04.02">
       <friendlyName>DNN JWT Auth Handler</friendlyName>
       <description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
       <dependencies/>

DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true">
+    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.04.02">
       <friendlyName>DNN Deprecated Web Controls Library</friendlyName>
       <description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
       <dependencies/>

DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.ClientAPI" type="Library" >
+        <package name="DotNetNuke.ClientAPI" type="Library" version="09.04.02" >
             <friendlyName>DotNetNuke ClientAPI</friendlyName>
             <description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
             <dependencies/>

DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true">
+    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.04.02">
       <friendlyName>DNN Deprecated Website Codebehind files</friendlyName>
       <description>DNN Deprecated Website Codebehind files for backward compability.</description>
       <dependencies/>

DNN Platform/Library/DotNetNuke.Library.csproj

@@ -1864,9 +1864,9 @@
     <RootDirectory>$(MSBuildProjectDirectory)\..\..</RootDirectory>
   </PropertyGroup>
   <Import Project="..\..\DNN_Platform.build" />
-  <Target Name="AfterBuild" DependsOnTargets="DebugProject">
+  <Target Name="AfterBuild" DependsOnTargets="CopyBin">
   </Target>
-  <Target Name="DebugProject">
+  <Target Name="CopyBin">
     <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\DotNetNuke.dll" DestinationFolder="$(WebsitePath)\bin" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\DotNetNuke.pdb" DestinationFolder="$(WebsitePath)\bin" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\bin\DotNetNuke.xml" DestinationFolder="$(WebsitePath)\bin" />

DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true">
+    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.04.02">
       <friendlyName>Message Center</friendlyName>      
       <description>Core Messaging module allows users to message each other.</description>
       <iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
@@ -22,7 +22,7 @@
             <moduleName>DotNetNuke.Modules.CoreMessaging</moduleName>
             <foldername>CoreMessaging</foldername>
             <businessControllerClass>DotNetNuke.Modules.CoreMessaging.Components.CoreMessagingBusinessController, DotNetNuke.Modules.CoreMessaging</businessControllerClass>
-            <supportedFeatures />
+            <supportedFeatures/>
             <moduleDefinitions>
               <moduleDefinition>
                 <friendlyName>Message Center</friendlyName>
@@ -35,7 +35,7 @@
                     <supportsPartialRendering>True</supportsPartialRendering>
                     <controlTitle>Core Messaging View</controlTitle>
                     <controlType>View</controlType>
-                    <iconFile />
+                    <iconFile/>
                     <helpUrl>http://www.dnnsoftware.com/help</helpUrl>
                     <viewOrder>0</viewOrder>
                   </moduleControl>

DNN Platform/Modules/DDRMenu/DDRMenu.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
-		<package name="DDRMenu" type="Module">
+		<package name="DDRMenu" type="Module" version="09.04.02">
 			<friendlyName>DDR Menu</friendlyName>
 			<description>DotNetNuke Navigation Provider.</description>
 			<owner>
@@ -34,7 +34,7 @@
 								<defaultCacheTime>0</defaultCacheTime>
 								<moduleControls>
 									<moduleControl>
-										<controlKey />
+										<controlKey/>
 										<controlSrc>DesktopModules/DDRMenu/MenuView.ascx</controlSrc>
 										<supportsPartialRendering>False</supportsPartialRendering>
 										<controlTitle>DDR menu</controlTitle>