Merge pull request #4009 from dnnsoftware/release/9.7.0

Release/9.7.0

.github/ISSUE_TEMPLATE/bug-report.md

@@ -41,8 +41,8 @@ Provide any additional context that may be helpful in understanding and/or resol
 Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
 -->
 * [ ] 10.00.00 alpha build
-* [ ] 09.06.02 release candidate
-* [ ] 09.06.01 latest supported release
+* [ ] 09.07.00 release candidate
+* [ ] 09.06.02 latest supported release
 
 ## Affected browser
 <!-- 

Build/Cake/devsite.cake

@@ -1,13 +1,19 @@
 // Tasks to help you create and maintain a local DNN development site.
 // Note these tasks depend on the correct settings in your settings file.
 
-Task("ResetDevSite")
+Task("BuildToTempFolder")
     .IsDependentOn("SetVersion")
     .IsDependentOn("UpdateDnnManifests")
     .IsDependentOn("ResetDatabase")
     .IsDependentOn("PreparePackaging")
 	.IsDependentOn("OtherPackages")
 	.IsDependentOn("ExternalExtensions")
+    .Does(() => 
+    {
+    });
+
+Task("ResetDevSite")
+	.IsDependentOn("BuildToTempFolder")
 	.IsDependentOn("CopyToDevSite")
 	.IsDependentOn("CopyWebConfigToDevSite")
     .Does(() => 

Build/Symbols/DotNetNuke_Symbols.dnn

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

Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec

@@ -19,8 +19,8 @@
       <dependency id="DotNetNuke.Web.Client" version="$version$" />
       <dependency id="DotNetNuke.WebApi" version="$version$" />
       <dependency id="Microsoft.AspNet.Mvc" version="5.1.3" />
-      <dependency id="Microsoft.AspNet.Razor" version="3.1.1" />
-      <dependency id="Microsoft.AspNet.WebPages" version="3.1.1" />
+      <dependency id="Microsoft.AspNet.Razor" version="3.1.2" />
+      <dependency id="Microsoft.AspNet.WebPages" version="3.1.2" />
       <dependency id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
     </dependencies>
   </metadata>

DNN Platform/Admin Modules/Dnn.Modules.Console/Components/BusinessController.cs

@@ -30,7 +30,7 @@ public string UpgradeModule(string version)
 
                         break;
                 }
-
+
                 return "Success";
             }
             catch (Exception)

DNN Platform/Admin Modules/Dnn.Modules.Console/Settings.ascx.cs

@@ -42,7 +42,7 @@ public override void LoadSettings()
                         // DefaultSize.Items.Add(new ListItem(Localization.GetString(val, LocalResourceFile), val));
                         this.DefaultSize.AddItem(Localization.GetString(val, this.LocalResourceFile), val);
                     }
-
+
                     this.SelectDropDownListItem(ref this.DefaultSize, "DefaultSize");
 
                     this.SelectDropDownListItem(ref this.modeList, "Mode");
@@ -51,39 +51,39 @@ public override void LoadSettings()
                     {
                         this.AllowResize.Checked = Convert.ToBoolean(this.Settings["AllowSizeChange"]);
                     }
-
+
                     foreach (var val in ConsoleController.GetViewValues())
                     {
                         // DefaultView.Items.Add(new ListItem(Localization.GetString(val, LocalResourceFile), val));
                         this.DefaultView.AddItem(Localization.GetString(val, this.LocalResourceFile), val);
                     }
-
+
                     this.SelectDropDownListItem(ref this.DefaultView, "DefaultView");
                     if (this.Settings.ContainsKey("IncludeParent"))
                     {
                         this.IncludeParent.Checked = Convert.ToBoolean(this.Settings["IncludeParent"]);
                     }
-
+
                     if (this.Settings.ContainsKey("AllowViewChange"))
                     {
                         this.AllowViewChange.Checked = Convert.ToBoolean(this.Settings["AllowViewChange"]);
                     }
-
+
                     if (this.Settings.ContainsKey("ShowTooltip"))
                     {
                         this.ShowTooltip.Checked = Convert.ToBoolean(this.Settings["ShowTooltip"]);
                     }
-
+
                     if (this.Settings.ContainsKey("OrderTabsByHierarchy"))
                     {
                         this.OrderTabsByHierarchy.Checked = Convert.ToBoolean(this.Settings["OrderTabsByHierarchy"]);
                     }
-
+
                     if (this.Settings.ContainsKey("IncludeHiddenPages"))
                     {
                         this.IncludeHiddenPages.Checked = Convert.ToBoolean(this.Settings["IncludeHiddenPages"]);
                     }
-
+
                     if (this.Settings.ContainsKey("ConsoleWidth"))
                     {
                         this.ConsoleWidth.Text = Convert.ToString(this.Settings["ConsoleWidth"]);
@@ -117,7 +117,7 @@ public override void UpdateSettings()
                         throw new Exception("ConsoleWidth value is invalid. Value must be numeric.");
                     }
                 }
-
+
                 if (this.ParentTab.SelectedItemValueAsInt == Null.NullInteger)
                 {
                     ModuleController.Instance.DeleteModuleSetting(this.ModuleId, "ParentTabID");
@@ -156,6 +156,21 @@ public override void UpdateSettings()
             }
         }
 
+        protected override void OnInit(EventArgs e)
+        {
+            base.OnInit(e);
+
+            this.tabs.ItemDataBound += this.tabs_ItemDataBound;
+            this.modeList.SelectedIndexChanged += this.modeList_SelectedIndexChanged;
+
+            this.ParentTab.UndefinedItem = new ListItem(DynamicSharedConstants.Unspecified, string.Empty);
+        }
+
+        protected void parentTab_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.BindTabs(this.ParentTab.SelectedItemValueAsInt, this.IncludeParent.Checked);
+        }
+
         private void BindTabs(int tabId, bool includeParent)
         {
             List<TabInfo> tempTabs = TabController.GetTabsBySortOrder(this.PortalId).OrderBy(t => t.Level).ThenBy(t => t.HasChildren).ToList();
@@ -173,25 +188,25 @@ private void BindTabs(int tabId, bool includeParent)
                     tabList.Add(consoleTab);
                 }
             }
-
+
             foreach (TabInfo tab in tempTabs)
             {
                 bool canShowTab = TabPermissionController.CanViewPage(tab) &&
-                        !tab.IsDeleted &&
-                        (tab.StartDate < DateTime.Now || tab.StartDate == Null.NullDate);
+                                  !tab.IsDeleted &&
+                                  (tab.StartDate < DateTime.Now || tab.StartDate == Null.NullDate);
 
                 if (!canShowTab)
                 {
                     continue;
                 }
-
+
                 if (tabIdList.Contains(tab.ParentId))
                 {
                     if (!tabIdList.Contains(tab.TabID))
                     {
                         tabIdList.Add(tab.TabID);
                     }
-
+
                     tabList.Add(tab);
                 }
             }
@@ -207,7 +222,7 @@ private void SwitchMode()
             {
                 parentTabId = Convert.ToInt32(this.Settings["ParentTabID"]);
             }
-
+
             switch (this.modeList.SelectedValue)
             {
                 case "Normal":
@@ -232,21 +247,6 @@ private void SwitchMode()
             this.BindTabs(parentTabId, this.IncludeParent.Checked);
         }
 
-        protected override void OnInit(EventArgs e)
-        {
-            base.OnInit(e);
-
-            this.tabs.ItemDataBound += this.tabs_ItemDataBound;
-            this.modeList.SelectedIndexChanged += this.modeList_SelectedIndexChanged;
-
-            this.ParentTab.UndefinedItem = new ListItem(DynamicSharedConstants.Unspecified, string.Empty);
-        }
-
-        protected void parentTab_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.BindTabs(this.ParentTab.SelectedItemValueAsInt, this.IncludeParent.Checked);
-        }
-
         private void modeList_SelectedIndexChanged(object sender, EventArgs e)
         {
             this.SwitchMode();
@@ -263,7 +263,7 @@ private void tabs_ItemDataBound(object Sender, RepeaterItemEventArgs e)
                 var tabPathField = (HiddenField)e.Item.FindControl("tabPath");
 
                 visibilityDropDown.Items.Clear();
-
+
                 // visibilityDropDown.Items.Add(new ListItem(LocalizeString("AllUsers"), "AllUsers"));
                 visibilityDropDown.AddItem(this.LocalizeString("AllUsers"), "AllUsers");
                 if (this.modeList.SelectedValue == "Profile")