diff --git a/Build/Tasks/PackageSharpZipLib.cs b/Build/Tasks/PackageSharpZipLib.cs
new file mode 100644
index 00000000000..4396939b865
--- /dev/null
+++ b/Build/Tasks/PackageSharpZipLib.cs
@@ -0,0 +1,68 @@
+// 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.Build.Tasks
+{
+ using System.Diagnostics;
+ using System.Linq;
+ using System.Xml;
+
+ using Cake.Common.Diagnostics;
+ using Cake.Common.IO;
+ using Cake.Frosting;
+ using Dnn.CakeUtils;
+
+ /// A cake task to generate the SharpZipLib package.
+ public sealed class PackageSharpZipLib : FrostingTask
+ {
+ ///
+ public override void Run(Context context)
+ {
+ var binDir = context.WebsiteDir.Path.Combine("bin");
+ var mainAssemblyPath = binDir.CombineWithFilePath("ICSharpCode.SharpZipLib.dll");
+ var packageVersion = FileVersionInfo.GetVersionInfo(context.MakeAbsolute(mainAssemblyPath).FullPath).FileVersion;
+
+ var packageZip = context.WebsiteDir.Path.CombineWithFilePath($"Install/Library/SharpZipLib_{packageVersion}_Install.zip");
+ var packageDir = context.Directory("DNN Platform/Components/SharpZipLib");
+
+ context.Information($"Creating {packageZip}");
+ context.Zip(
+ packageDir.ToString(),
+ packageZip,
+ context.GetFilesByPatterns(packageDir, new[] { "*" }, new[] { "*.dnn" }));
+
+ var manifestPath = context.GetFiles(packageDir.Path.CombineWithFilePath("*.dnn").ToString()).Single();
+ context.Information($"Reading manifest from {manifestPath}");
+ var manifest = new XmlDocument();
+ manifest.LoadXml(context.ReadFile(manifestPath));
+ var assemblies =
+ from XmlNode assemblyNode in manifest.SelectNodes("//assembly")
+ from XmlNode childNode in assemblyNode.ChildNodes
+ where childNode.LocalName.Equals("name")
+ select childNode;
+
+ foreach (var assemblyNameNode in assemblies)
+ {
+ var assemblyPath = binDir.CombineWithFilePath(assemblyNameNode.InnerText);
+ context.Information($"Adding {assemblyPath} to {packageZip}");
+ context.AddFilesToZip(
+ packageZip,
+ context.MakeAbsolute(context.WebsiteDir.Path),
+ context.GetFiles(assemblyPath.ToString()),
+ append: true);
+
+ var versionNode = assemblyNameNode.ParentNode.ChildNodes.Cast()
+ .SingleOrDefault(childNode => childNode.LocalName.Equals("version"));
+ if (versionNode != null)
+ {
+ versionNode.InnerText = FileVersionInfo.GetVersionInfo(context.MakeAbsolute(assemblyPath).FullPath).FileVersion;
+ context.Information($"Set {assemblyPath} version to {versionNode.InnerText}");
+ }
+ }
+
+ manifest.SelectSingleNode("//package[@version]").Attributes["version"].Value = packageVersion;
+
+ context.AddXmlFileToZip(packageZip, manifest, manifestPath.GetFilename().ToString(), append: true);
+ }
+ }
+}
diff --git a/Build/Tasks/unversionedManifests.txt b/Build/Tasks/unversionedManifests.txt
index c1174e1c4bc..68dd636b1ee 100644
--- a/Build/Tasks/unversionedManifests.txt
+++ b/Build/Tasks/unversionedManifests.txt
@@ -1,5 +1,6 @@
DNN Platform/Components/MailKit/*.dnn
DNN Platform/Components/Microsoft.*/**/*.dnn
DNN Platform/Components/Newtonsoft/*.dnn
+DNN Platform/Components/SharpZipLib/*.dnn
DNN Platform/JavaScript Libraries/**/*.dnn
Temp/**/*.dnn
\ No newline at end of file
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config b/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config
index 7d663d08216..5387ea732b5 100644
--- a/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config
+++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Components/SharpZipLib/License.txt b/DNN Platform/Components/SharpZipLib/License.txt
new file mode 100644
index 00000000000..f693de8bc2c
--- /dev/null
+++ b/DNN Platform/Components/SharpZipLib/License.txt
@@ -0,0 +1,17 @@
+Copyright © 2000-2018 SharpZipLib Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/DNN Platform/Components/SharpZipLib/SharpZipLib.dnn b/DNN Platform/Components/SharpZipLib/SharpZipLib.dnn
new file mode 100644
index 00000000000..1777bf4b442
--- /dev/null
+++ b/DNN Platform/Components/SharpZipLib/SharpZipLib.dnn
@@ -0,0 +1,28 @@
+
+
+
+ SharpZipLib
+ Library for managing zip archives.
+
+
+ DNN
+ .NET Foundation
+ https://dnncommunity.org
+ info@dnncommunity.org
+
+
+ https://github.com/icsharpcode/SharpZipLib/wiki/Release-History
+
+
+
+
+ bin
+ ICSharpCode.SharpZipLib.dll
+ 1.3.3
+
+
+
+
+
+
+
diff --git a/DNN Platform/Connectors/Azure/app.config b/DNN Platform/Connectors/Azure/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Connectors/Azure/app.config
+++ b/DNN Platform/Connectors/Azure/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleAnalytics/app.config b/DNN Platform/Connectors/GoogleAnalytics/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Connectors/GoogleAnalytics/app.config
+++ b/DNN Platform/Connectors/GoogleAnalytics/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Connectors/GoogleTagManager/app.config b/DNN Platform/Connectors/GoogleTagManager/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Connectors/GoogleTagManager/app.config
+++ b/DNN Platform/Connectors/GoogleTagManager/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Dnn.AuthServices.Jwt/app.config b/DNN Platform/Dnn.AuthServices.Jwt/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Dnn.AuthServices.Jwt/app.config
+++ b/DNN Platform/Dnn.AuthServices.Jwt/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/DotNetNuke.Web.Deprecated/app.config b/DNN Platform/DotNetNuke.Web.Deprecated/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/DotNetNuke.Web.Deprecated/app.config
+++ b/DNN Platform/DotNetNuke.Web.Deprecated/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/DotNetNuke.Web.Mvc/app.config b/DNN Platform/DotNetNuke.Web.Mvc/app.config
index ee87904d433..727a460afbf 100644
--- a/DNN Platform/DotNetNuke.Web.Mvc/app.config
+++ b/DNN Platform/DotNetNuke.Web.Mvc/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/DotNetNuke.Web/app.config b/DNN Platform/DotNetNuke.Web/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/DotNetNuke.Web/app.config
+++ b/DNN Platform/DotNetNuke.Web/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/DotNetNuke.Website.Deprecated/app.config b/DNN Platform/DotNetNuke.Website.Deprecated/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/DotNetNuke.Website.Deprecated/app.config
+++ b/DNN Platform/DotNetNuke.Website.Deprecated/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs b/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs
index 96908a141c4..58bb0967e10 100644
--- a/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs
+++ b/DNN Platform/Library/Common/Utilities/FileSystemUtils.cs
@@ -31,7 +31,7 @@ public class FileSystemUtils
/// Adds a File to a Zip File.
///
/// -----------------------------------------------------------------------------
- public static void AddToZip(ref ZipArchive ZipFile, string filePath, string fileName, string folder)
+ public static void AddToZip(ref ZipArchive zipFile, string filePath, string fileName, string folder)
{
FileStream fs = null;
try
@@ -51,7 +51,7 @@ public static void AddToZip(ref ZipArchive ZipFile, string filePath, string file
}
// Create Zip Entry
- var entry = ZipFile.CreateEntry(Path.Combine(folder, fileName));
+ var entry = zipFile.CreateEntry(Path.Combine(folder, fileName));
entry.LastWriteTime = DateTime.Now;
using (var zipStream = entry.Open())
{
@@ -537,7 +537,6 @@ private static void WriteStream(HttpResponse objResponse, Stream objStream)
}
}
-
[Obsolete("Deprecated in 9.11.0, will be removed in 11.0.0, replaced with .net compression types.")]
public static void AddToZip(ref ZipOutputStream ZipFile, string filePath, string fileName, string folder)
{
diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj
index 86a9f11f0ba..a4a8e5b5524 100644
--- a/DNN Platform/Library/DotNetNuke.Library.csproj
+++ b/DNN Platform/Library/DotNetNuke.Library.csproj
@@ -91,9 +91,8 @@
False
..\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll
-
- ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
- True
+
+ ..\..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
..\Components\Lucene.Net\bin\Lucene.Net.dll
diff --git a/DNN Platform/Library/packages.config b/DNN Platform/Library/packages.config
index 6b2fbd20a68..2dbc2cd3841 100644
--- a/DNN Platform/Library/packages.config
+++ b/DNN Platform/Library/packages.config
@@ -16,7 +16,7 @@
-
+
\ No newline at end of file
diff --git a/DNN Platform/Modules/CoreMessaging/web.config b/DNN Platform/Modules/CoreMessaging/web.config
index 5a152070121..0d69635bcda 100644
--- a/DNN Platform/Modules/CoreMessaging/web.config
+++ b/DNN Platform/Modules/CoreMessaging/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/DigitalAssets/web.config b/DNN Platform/Modules/DigitalAssets/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/DigitalAssets/web.config
+++ b/DNN Platform/Modules/DigitalAssets/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/DnnExportImport/app.config b/DNN Platform/Modules/DnnExportImport/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Modules/DnnExportImport/app.config
+++ b/DNN Platform/Modules/DnnExportImport/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Modules/Groups/web.config b/DNN Platform/Modules/Groups/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/Groups/web.config
+++ b/DNN Platform/Modules/Groups/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/HTML/web.config b/DNN Platform/Modules/HTML/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/HTML/web.config
+++ b/DNN Platform/Modules/HTML/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/HtmlEditorManager/web.config b/DNN Platform/Modules/HtmlEditorManager/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/HtmlEditorManager/web.config
+++ b/DNN Platform/Modules/HtmlEditorManager/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/Journal/web.config b/DNN Platform/Modules/Journal/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/Journal/web.config
+++ b/DNN Platform/Modules/Journal/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/MemberDirectory/web.config b/DNN Platform/Modules/MemberDirectory/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/MemberDirectory/web.config
+++ b/DNN Platform/Modules/MemberDirectory/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/RazorHost/web.config b/DNN Platform/Modules/RazorHost/web.config
index 49d94d8a958..d3a09cd807a 100644
--- a/DNN Platform/Modules/RazorHost/web.config
+++ b/DNN Platform/Modules/RazorHost/web.config
@@ -10,6 +10,10 @@
+
+
+
+
diff --git a/DNN Platform/Modules/ResourceManager/web.config b/DNN Platform/Modules/ResourceManager/web.config
index 7d4c43d8a9a..5ae95a9ea98 100644
--- a/DNN Platform/Modules/ResourceManager/web.config
+++ b/DNN Platform/Modules/ResourceManager/web.config
@@ -12,6 +12,10 @@
+
+
+
+
diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config
index c76a9d093ec..03f577f9e3b 100644
--- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config
+++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config
@@ -18,6 +18,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/App.config b/DNN Platform/Tests/App.config
index fbe4d76de3c..5390f27b37b 100644
--- a/DNN Platform/Tests/App.config
+++ b/DNN Platform/Tests/App.config
@@ -227,6 +227,10 @@
+
+
+
+
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config
index 7b393d83301..69add35b14b 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/app.config
@@ -22,6 +22,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj
index 96a4f967c21..4e3fc3cf86b 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj
@@ -72,8 +72,8 @@
False
..\..\DotNetNuke.Log4net\bin\dotnetnuke.log4net.dll
-
- ..\..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
+
+ ..\..\..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll
..\..\Components\Lucene.Net\bin\Lucene.Net.dll
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config
index 39e40aa8112..e6be29461a9 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config
@@ -5,5 +5,6 @@
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config b/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.UI/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config
index 2fd799c5541..8e9c70293d6 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/app.config
@@ -26,6 +26,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config
index 3ba879f1807..c3903fa2010 100644
--- a/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config
+++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/App.config
@@ -18,6 +18,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj
index 76a5f057357..08184dffff6 100644
--- a/DNN Platform/Website/DotNetNuke.Website.csproj
+++ b/DNN Platform/Website/DotNetNuke.Website.csproj
@@ -96,10 +96,6 @@
False
..\Components\PetaPoco\bin\PetaPoco.dll
-
- ..\..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
- True
-
diff --git a/DNN Platform/Website/Install/Web.config b/DNN Platform/Website/Install/Web.config
index 69b28ffee7c..c2e596aff9c 100644
--- a/DNN Platform/Website/Install/Web.config
+++ b/DNN Platform/Website/Install/Web.config
@@ -14,6 +14,10 @@
+
+
+
+
diff --git a/DNN Platform/Website/packages.config b/DNN Platform/Website/packages.config
index 9f888c9ff7a..13f450fb29b 100644
--- a/DNN Platform/Website/packages.config
+++ b/DNN Platform/Website/packages.config
@@ -10,6 +10,5 @@
-
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
index 7a8395dad41..6e2da108bbd 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Components/Sites/SitesController.cs
@@ -8,18 +8,19 @@ namespace Dnn.PersonaBar.Sites.Components
using System.Collections.Generic;
using System.Globalization;
using System.IO;
- using System.IO.Compression;
- using System.Linq;
+ using System.IO.Compression;
+ using System.Linq;
using System.Text;
using System.Threading;
using System.Web;
using System.Web.UI.WebControls;
using System.Xml;
-
+
using Dnn.PersonaBar.Library.Controllers;
using Dnn.PersonaBar.Library.DTO.Tabs;
using Dnn.PersonaBar.Sites.Components.Dto;
using Dnn.PersonaBar.Sites.Services.Dto;
+ using DotNetNuke.Abstractions.Portals;
using DotNetNuke.Common;
using DotNetNuke.Common.Internal;
using DotNetNuke.Common.Lists;
@@ -39,9 +40,9 @@ namespace Dnn.PersonaBar.Sites.Components
using DotNetNuke.Services.Localization;
using DotNetNuke.Services.Log.EventLog;
using DotNetNuke.Services.Mail;
-
+
using FileInfo = DotNetNuke.Services.FileSystem.FileInfo;
-
+
public class SitesController
{
internal static readonly IList ImageExtensions = new List() { ".png", ".jpg", ".jpeg" };
@@ -939,17 +940,18 @@ private void SerializeFolders(XmlWriter writer, PortalInfo objportal, ref ZipArc
writer.WriteEndElement();
}
- private void SerializeFiles(XmlWriter writer, PortalInfo objportal, string folderPath, ref ZipArchive zipFile)
+ private void SerializeFiles(XmlWriter writer, IPortalInfo portal, string folderPath, ref ZipArchive zipFile)
{
var folderManager = FolderManager.Instance;
- var objFolder = folderManager.GetFolder(objportal.PortalID, folderPath);
+ var objFolder = folderManager.GetFolder(portal.PortalId, folderPath);
writer.WriteStartElement("files");
foreach (var fileInfo in folderManager.GetFiles(objFolder))
{
var objFile = (FileInfo)fileInfo;
+
// verify that the file exists on the file system
- var filePath = objportal.HomeDirectoryMapPath + folderPath + this.GetActualFileName(objFile);
+ var filePath = portal.HomeDirectoryMapPath + folderPath + this.GetActualFileName(objFile);
if (File.Exists(filePath))
{
writer.WriteStartElement("file");
@@ -963,9 +965,14 @@ private void SerializeFiles(XmlWriter writer, PortalInfo objportal, string folde
writer.WriteEndElement();
- FileSystemUtils.AddToZip(ref zipFile, filePath, this.GetActualFileName(objFile), folderPath);
+ FileSystemUtils.AddToZip(
+ zipFile: ref zipFile,
+ filePath: filePath,
+ fileName: this.GetActualFileName(objFile),
+ folder: folderPath);
}
- }
+ }
+
writer.WriteEndElement();
}
diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config
index 40e08fb1194..b2232c60550 100644
--- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config
+++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config
@@ -14,6 +14,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config
index 53d99657444..4ba6a00807f 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config
index b0d92a71226..1aa60c3bc9b 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config
@@ -10,6 +10,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
index d9d17a63bb7..c20ee9ba313 100644
--- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
+++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config
@@ -6,6 +6,10 @@
+
+
+
+
\ No newline at end of file