Merges latest changes from 9.4.x into development (#3366)

* Do not store these portal settings when setting their property on the portalsettings object * Removed DnnHttpControllerActivator and added DependencyResolver implementation using the IServiceProvider * Added xml comments for the new DnnDependencyResolver * Added DnnDependencyResolver Unit Tests * Replaced IServiceProvider mock with full IServiceProvider implementation to work with Web API tests * Added more unit tests for the DnnDependencyResolver to cover GetServices (multiple) and BeginScope * Do not show "No Search results" message when no search is performed. (#3203) * Revision of build process part 1 (#3137) * Move website folder * repairs * Update Cake * Move external task to its own file * Begin packaging scripts in cake * Further work on packaging * Ensure Telerik project also gets new version nr * Move Telerik PDF to its proper place * New logic for packages that are already in final form in the repo and just need to be zipped. * Bring fips Lucene lib back under git control * Newtonsoft package and repair to telerik package * Splitting off other tasks * Upgrade and deploy packages * Symbols package * Get rid of platform ver in manifest * Final fixes - working packages * Move compilation stuff * House cleaning * peg utils version * Fix to ckep script * suppress warnings * Variable initialization issue * Removing unused scripts * Revert change to Telerik package version * Move "other" to "thirdparty" * Get rid of hard coded Newtonsoft version * Max cpu to 4 for compiling * Repairs to MSBuild scripts to get AE to build properly * Correcting paths * Cleaning up * Trying to fix ignore file * Update Build/Cake/thirdparty.json Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Remove absolute path from .gitignore * Fix extension of DNC library package * Merging AE and DNN build scripts * Fixes to scripts * Clean up symbols project for AE since they are included in DNN project now * Add previously untracked Yahoo compressor dlls * Remove version information from SolutionInfo.cs * Fix errors introduced in rebase * Fix incorrect paths * Change build order of MSBuild to build extensions before personabar ui. * Make white-space visible in log viewer (#3198) * DNN-34236: check the url with case insensitive. * DNN-29417 Username is changed to email address in the user profile if the "Use Email Address as Username" is enabled. * Fix to installer and the dependencies of the HTML and DA modules * DNN-24945 - Always redirect to the source portal page after creating (#3223) group * Fix Typo (#3234) * Improve querystring parse (#3242) * Improve props popup * Improve input checking of sites (#3243) * Fixes an upgrade issue that affects 9.4.1 => 9.4.2 upgrades (#3282) * Fixes an issue with a duplication of assembly binding * Removed hardcode version in manifest * Further reorganization of build process (#3236) * Introduce settings and add custom version nr * Ability to create a local dev site * Move node workspaces to root * Reshuffling of variables in MSBuild * Repairs * Fix * Allow local override of global build variables * Only save manifests if the file is not there. This prevents overwriting in case of a failed build before. * Ensure projects build in debug to the website path specified by the platform build settings * Don't track vscode folder * Fixes #3168 Test Sending Email Issues (#3237) * Use Admin Email for Send if smtpHostMode false * Fix Test Email Settings TO and FROM Addresses If I did this right and it should make sense is I set the test email to be able to go to the user testing. After all they are who are trying to make it work. It can be any email used by anyone and usually to see this feature you are a host or portal administrator so security should not be as much of a concern here. The FROM address will use the HOST email settings if set to HOST mode in DNN for the portal, otherwise it should use the Portal Administrators Email account to send from. This however does not address the issue of using the email address supplied in settings and creating another setting which will be applied next to figure out the correct logic. * Update ServerSettingsSmtpAdminController.cs * Fix build issue to previous changes. PortalSettings.UserInfo.Email is this the current user email? I am still getting my things setup. I ran VS 2019 to build successfully and I am trying to read through the namespaces correctly so I can understand the changes. I noticed a number of files possibly needing updates due to being deprecated in 9.4.2 but after I changed the namespace issue those warnings went away. One last thought is how do you get intellisense working on DNN solution. Is that a dream to have or am I missing something in my setup? * Change to address to the current user's email testing the server. I believe a UI to set the TO address would be nice to help troubleshoot and address issues trying to send to a specific user. * Corrected To address for current user email * TO Current User Email * DNN-29110 Site Assets > Select All is not working (#3251) * DNN-29110 Site Assets > Select All is not working * Code review fix * Moves Remember Login above Login Button: referenced in issue #2471 #3255 (#3256) * Move Remember Login Above Login Button * Update Login.ascx * file copy paste issue... * DNN-34250 Search is not working even after re-Indexing Search for All DNN Portals (#3260) * DNN-32474 - Recursive delete option is added (#3249) * Move Country Above Region in UserProfile.cs * spacing issue resolved. * I keep saving but github is moving it on its own. * Fixed tab for spaces to resolve spacing issues * Add PortalSettings overloads back (#3295) Fixes #3289 * Updates issue templates as per 9.4.2 release * Move Email Above Username in User.ascx #3305 (#3306) * Move Email Above Username in User.ascx * Fixed tab index values in User.ascx * Fix NuGet warning NU5048 (#3304) The iconUrl property of the nuspec file is deprecated, it's recommended to add an icon property, which points to a file within the package, while also retaining the iconUrl property for older clients. See https://docs.microsoft.com/en-us/nuget/reference/nuspec#iconurl * Word-Break added to Journal P (#3307) * Set core object versions to core version (#3287) Ensure skin and radeditorprovider get the core version nr and add SPROC to set the version of all core packages/desktopmodules to the core version Fixes #3239 * Third installment of build reorganization (#3285) * Improve versioning * New approach: keep versions in source control and change upon CI build * Remove previous versioning logic * Cleaning up tasks * Fixes * Ensure UpdateDnnManifests targets just the right manifests * Harmonize naming of zips and nuget packages * Testing webpack building to dev website * Adjust webpack projects in AE to build to dev site * Fixes * Delete duplicate stuff * This is generated by Webpack and shouldn't be tracked * Include missing project from Lerna * Fixes for building SitesListView * Update to packages * Further cleaning * Remove RadEditorProvider * Fix ModuleSettings > Added to Pages grid, pager wasn't working * Allow only alphanumeric characters to be used when forming url from website name (#3316) * Ensure UpdateDnnManifests doesn't run for building dev site (#3314) * Reload page when the code tells you to (#3315) * Reload page when the code tells you to * Optimize code * Google Analytics TrackingID is stored in lowercase #3318 (#3322) * Update sums.resources * Fix casing mismatch errors in security analyzer file compare * Update Dnn.AdminExperience/Extensions/Content/Dnn.PersonaBar.Extensions/Components/Security/Checks/CheckDefaultPage.cs Co-Authored-By: Brian Dukes <bdukes@engagesoftware.com> * Registered IPersonaBarContainer with DI (#3329) * Document approval process and group * Fix typo * Relaxed nuget.cake wildcard (#3331)
dnnsoftware · Dec 3, 2019 · d668508 · d668508
1 parent 73c0106
commit d668508
Show file tree

Hide file tree

Showing 212 changed files with 2,926 additions and 183,461 deletions.
diff --git a/.github/APPROVERS.md b/.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
+
diff --git a/Build/Cake/ci.cake b/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(() =>
+	{
+	});
diff --git a/Build/Cake/compiling.cake b/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(() =>
 	{

diff --git a/Build/Cake/create-database.cake b/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(() => 
     {

diff --git a/Build/Cake/devsite.cake b/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(() => 
     {
     });

diff --git a/Build/Cake/nuget.cake b/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);
 

diff --git a/Build/Cake/packaging.cake b/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/");

diff --git a/Build/Cake/settings.cake b/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;

diff --git a/Build/Cake/testing.cake b/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 {

diff --git a/Build/Cake/thirdparty.cake b/Build/Cake/thirdparty.cake
@@ -11,7 +11,6 @@ public class OtherPackage {
 }
 
 Task("OtherPackages")
-    .IsDependentOn("UpdateDnnManifests")
     .IsDependentOn("Newtonsoft")
     .Does(() =>
 	{

diff --git a/Build/Cake/unit-tests.cake b/Build/Cake/unit-tests.cake
@@ -1,4 +1,3 @@
-
 Task("EnsureAllProjectsBuilt")
   .IsDependentOn("UpdateDnnManifests")
   .IsDependentOn("Restore-NuGet-Packages")

diff --git a/Build/Cake/version.cake b/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>";
 }
diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/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>

diff --git a/Build/Tools/NuGet/Dnn.PersonaBar.Library.nuspec b/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>
diff --git a/Build/Tools/NuGet/DotNetNuke.Abstractions.nuspec b/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>
diff --git a/Build/Tools/NuGet/DotNetNuke.Bundle.nuspec b/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>
diff --git a/Build/Tools/NuGet/DotNetNuke.Core.nuspec b/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>
diff --git a/Build/Tools/NuGet/DotNetNuke.DependencyInjection.nuspec b/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>
diff --git a/Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec b/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>