Skip to content

Commit ce266ec

Browse files
donkerbdukes
authored andcommitted
Fix the addition of assemblies and sql scripts to module build
1 parent 020548b commit ce266ec

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

Build/BuildScripts/Package.targets

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
let name = file.Element("name")
3030
let sourceFileName = file.Element("sourceFileName")
3131
let fullFilePath = sourceFileName?.Value ?? Path.Combine(path?.Value ?? string.Empty, name.Value)
32-
select new TaskItem(fullFilePath)
32+
select new TaskItem(fullFilePath, new Dictionary<string, object> { { "RecursiveDir", Path.GetDirectoryName(fullFilePath) }, })
3333
).ToArray();
3434
]]>
3535
</Code>
@@ -46,7 +46,7 @@
4646
<Output TaskParameter="Value" PropertyName="Version" />
4747
</XmlRead>
4848
<ExtensionPackager Manifest="$(DNNFileName).dnn" WorkingFolder="$(MSBuildProjectDirectory)\">
49-
<Output TaskParameter="PackageFiles" PropertyName="PackageFiles">
49+
<Output TaskParameter="PackageFiles" ItemName="PackageFiles">
5050
</Output>
5151
</ExtensionPackager>
5252

@@ -58,19 +58,20 @@
5858
<LicenseFiles Include="license.txt"/>
5959
</ItemGroup>
6060
<Copy SourceFiles="@(LicenseFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
61+
6162
<ItemGroup>
6263
<ReleaseNotesFiles Include="releaseNotes.txt"/>
6364
</ItemGroup>
6465
<Copy SourceFiles="@(ReleaseNotesFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
65-
<CreateItem Include="$(PackageFiles)">
66-
<Output TaskParameter="Include" ItemName="OutputContent" />
67-
</CreateItem>
68-
<Copy SourceFiles="$(OutputContent)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(OutputContent.RecursiveDir)" />
66+
67+
<Copy SourceFiles="@(PackageFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(PackageFiles.RecursiveDir)" />
68+
6969
<CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
7070
<Output TaskParameter="Include" ItemName="ZipOutputContent" />
7171
</CreateItem>
7272
<Zip Files="@(ZipOutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
7373
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />
74+
7475
<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
7576
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
7677
</Target>

0 commit comments

Comments
 (0)