Merge pull request #28 from valadas/dnn9

Author: david-poindexter

BuildScripts/ModulePackage.targets

@@ -72,6 +72,11 @@
     </CreateItem>
 
     <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\HtmlSanitizer.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\AngleSharp.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\AngleSharp.Css.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Collections.Immutable.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Text.Encoding.CodePages.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
     <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
     <Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
@@ -95,31 +100,7 @@
     <!-- Copy the Install package to the Packages folder -->
     <Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="install/" />
 
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
-    <RemoveDir Directories ="$(MSBuildProjectDirectory)\ResourcesZip" />
-
-    <Copy SourceFiles="$(MSBuildDnnBinPath)\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
-    <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-
-    <!-- create the SOURCE RESOURCES.ZIP file -->
-    <Copy SourceFiles="@(SourceInclude)" DestinationFolder="$(MSBuildProjectDirectory)\ResourcesZip\%(RecursiveDir)" />
-
-    <CreateItem Include="$(MSBuildProjectDirectory)\ResourcesZip\**\*.*">
-      <Output TaskParameter="Include" ItemName="SourceContent" />
-    </CreateItem>
-
-    <Zip Files="@(SourceContent)" WorkingDirectory="$(MSBuildProjectDirectory)\ResourcesZip" ZipFileName="Resources.$(Extension)" />
-    <Copy SourceFiles="$(MSBuildProjectDirectory)\Resources.$(Extension)" DestinationFolder="package/" />
-
-    <CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
-      <Output TaskParameter="Include" ItemName="OutputSource" />
-    </CreateItem>
-
-    <Zip Files="@(OutputSource)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Source.$(Extension)" />
-    <Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Source.$(Extension)" DestinationFolder="install/" />
-
+    
     <Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
     <Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Source.$(Extension)" />
 

BusinessObjects/Models/Topic.cs

@@ -283,7 +283,7 @@ public string UpdatedByUsername
             get
             {
                 UserInfo user = UserController.GetUserById(
-                    PortalController.Instance.GetCurrentPortalSettings().PortalId,
+                    PortalController.Instance.GetCurrentSettings().PortalId,
                     this.UpdatedByUserID);
                 if (user != null)
                 {

BusinessObjects/Models/TopicHistory.cs

@@ -209,7 +209,7 @@ public string UpdatedByUsername
             get
             {
                 UserInfo user = UserController.GetUserById(
-                    PortalController.Instance.GetCurrentPortalSettings().PortalId,
+                    PortalController.Instance.GetCurrentSettings().PortalId,
                     this.UpdatedByUserID);
                 if (user != null)
                 {

BusinessObjects/TopicBO.cs

@@ -188,7 +188,7 @@ public List<string> GetNotificationEmails(Topic topic)
                                 if (role.ToLower().Equals("all users"))
                                 {
                                     // Trap against fake roles
-                                    var arrUsers = UserController.GetUsers(DotNetNuke.Entities.Portals.PortalController.Instance.GetCurrentPortalSettings().PortalId).OfType<UserInfo>();
+                                    var arrUsers = UserController.GetUsers(DotNetNuke.Entities.Portals.PortalController.Instance.GetCurrentSettings().PortalId).OfType<UserInfo>();
                                     foreach (var objUser in arrUsers)
                                     {
                                         if (!lstUsers.Contains(objUser.Email))