Merge pull request #7098 from donker/fix-build-20260309

Fix the addition of assemblies and sql scripts to module build

Author: valadas

Build/BuildScripts/Package.targets

@@ -25,11 +25,12 @@
         from component in package.Element("components").Descendants("component")
         let componentType = component.Attribute("type").Value
         from file in component.Descendants().Descendants<XElement>(componentType.ToLowerInvariant())
+        where file.Attribute("action")?.Value != "UnRegister"
         let path = file.Element("path")
         let name = file.Element("name")
         let sourceFileName = file.Element("sourceFileName")
         let fullFilePath = sourceFileName?.Value ?? Path.Combine(path?.Value ?? string.Empty, name.Value)
-        select new TaskItem(fullFilePath)
+        select new TaskItem(fullFilePath, new Dictionary<string, object> { { "RecursiveDir", Path.GetDirectoryName(fullFilePath) }, })
     ).ToArray();
 ]]>
       </Code>
@@ -46,7 +47,7 @@
       <Output TaskParameter="Value" PropertyName="Version" />
     </XmlRead>
     <ExtensionPackager Manifest="$(DNNFileName).dnn" WorkingFolder="$(MSBuildProjectDirectory)\">
-      <Output TaskParameter="PackageFiles" PropertyName="PackageFiles">
+      <Output TaskParameter="PackageFiles" ItemName="PackageFiles">
       </Output>
     </ExtensionPackager>
 
@@ -58,19 +59,20 @@
       <LicenseFiles Include="license.txt"/>
     </ItemGroup>
     <Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
+    
     <ItemGroup>
       <ReleaseNotesFiles Include="releaseNotes.txt"/>
     </ItemGroup>
     <Copy SourceFiles="@(ReleaseNotesFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
-    <CreateItem Include="$(PackageFiles)">
-      <Output TaskParameter="Include" ItemName="OutputContent" />
-    </CreateItem>
-    <Copy SourceFiles="$(OutputContent)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(OutputContent.RecursiveDir)" />
+    
+    <Copy SourceFiles="@(PackageFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(PackageFiles.RecursiveDir)" />
+
     <CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
       <Output TaskParameter="Include" ItemName="ZipOutputContent" />
     </CreateItem>
     <Zip Files="@(ZipOutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
     <Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />
+
     <Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
     <RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
   </Target>

DNN_Platform.sln

@@ -354,11 +354,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript
 		Build\BuildScripts\AEModule.build = Build\BuildScripts\AEModule.build
 		Build\BuildScripts\AEPackage.targets = Build\BuildScripts\AEPackage.targets
 		Build\BuildScripts\CombineSymbols.ps1 = Build\BuildScripts\CombineSymbols.ps1
-		Build\BuildScripts\ICSharpCode.SharpZipLib.dll = Build\BuildScripts\ICSharpCode.SharpZipLib.dll
-		Build\BuildScripts\DotNetNuke.MSBuild.Tasks.dll = Build\BuildScripts\DotNetNuke.MSBuild.Tasks.dll
-		Build\BuildScripts\Microsoft.Build.Framework.dll = Build\BuildScripts\Microsoft.Build.Framework.dll
-		Build\BuildScripts\Microsoft.Build.Utilities.dll = Build\BuildScripts\Microsoft.Build.Utilities.dll
-		Build\BuildScripts\Microsoft.Build.Utilities.v3.5.dll = Build\BuildScripts\Microsoft.Build.Utilities.v3.5.dll
 		Build\BuildScripts\Module.build = Build\BuildScripts\Module.build
 		Build\BuildScripts\ModulePackage.targets = Build\BuildScripts\ModulePackage.targets
 		Build\BuildScripts\MSBuild.Community.Tasks.dll = Build\BuildScripts\MSBuild.Community.Tasks.dll