Skip to content

Fix the addition of assemblies and sql scripts to module build #7098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
valadas merged 3 commits into from
Mar 9, 2026
Merged

Fix the addition of assemblies and sql scripts to module build #7098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fb0c68
Fix the addition of assemblies and sql scripts to module build
donker Mar 9, 2026
780e9aa
Don't try to include files with action=UnRegister
bdukes Mar 9, 2026
6e38739
Remove references to removed build script DLLs
bdukes Mar 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions Build/BuildScripts/Package.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

Expand All @@ -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>
Expand Down
5 changes: 0 additions & 5 deletions DNN_Platform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down