Skip to content

MSBuild clean up #7101

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
donker merged 4 commits into from
Mar 13, 2026
Merged

MSBuild clean up #7101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ea9917d
Sync build script solution items
bdukes Mar 9, 2026
0272309
Convert XmlRead task to built-in XmlPeek task
bdukes Mar 9, 2026
3509e00
Move instead of Copy & Delete
bdukes Mar 9, 2026
dee386a
Use ItemGroup instead of CreateItem
bdukes Mar 10, 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
79 changes: 25 additions & 54 deletions Build/BuildScripts/ModulePackage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,57 +8,26 @@
XmlFileName="$(DNNFileName).dnn">
<Output TaskParameter="Value" PropertyName="Version" />
</XmlRead>
<CreateItem Include="$(DNNFileName).dnn">
<Output TaskParameter="Include" ItemName="PackageManifestFiles" />
</CreateItem>
<CreateItem Include="*.txt">
<Output TaskParameter="Include" ItemName="PackageTextFiles" />
</CreateItem>
<CreateItem Include="Components\**\*.dll">
<Output TaskParameter="Include" ItemName="ComponentReferences" />
</CreateItem>
<CreateItem Include="*.asmx;*.ascx;*.css;*.xsl;*.svc;*.xml;*.gif;*.png">
<Output TaskParameter="Include" ItemName="PackageSourceFiles" />
</CreateItem>
<CreateItem Include="*.config">
<Output TaskParameter="Include" ItemName="PackageConfigFiles" />
</CreateItem>
<CreateItem Include="App_LocalResources\*.resx">
<Output TaskParameter="Include" ItemName="PackageLocalResourceFiles" />
</CreateItem>
<CreateItem Include="Documentation\*.txt">
<Output TaskParameter="Include" ItemName="PackageDocumentationFiles" />
</CreateItem>
<CreateItem Include="Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="PackageSqlDataProviderFiles" />
</CreateItem>
<CreateItem Include="Data\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="PackageDataFiles" />
</CreateItem>
<CreateItem Include="images\*.*">
<Output TaskParameter="Include" ItemName="MyImages" />
</CreateItem>
<CreateItem Include="js\*.js">
<Output TaskParameter="Include" ItemName="MyJsFiles" />
</CreateItem>
<CreateItem Include="keys\*.*">
<Output TaskParameter="Include" ItemName="MyKeys" />
</CreateItem>
<CreateItem Include="Views\*.ascx">
<Output TaskParameter="Include" ItemName="MyViews" />
</CreateItem>
<CreateItem Include="Views\Controls\*.ascx">
<Output TaskParameter="Include" ItemName="MyViewControls" />
</CreateItem>
<CreateItem Include="RazorHelpers\*.cshtml">
<Output TaskParameter="Include" ItemName="MyRazorHelpers" />
</CreateItem>
<CreateItem Include="Scripts\*.cshtml">
<Output TaskParameter="Include" ItemName="MyScripts" />
</CreateItem>
<CreateItem Include="Scripts\Shared\*.cshtml">
<Output TaskParameter="Include" ItemName="MySharedScripts" />
</CreateItem>

<ItemGroup>
<PackageManifestFiles Include="$(DNNFileName).dnn" />
<PackageTextFiles Include="*.txt" />
<ComponentReferences Include="Components\**\*.dll" />
<PackageSourceFiles Include="*.asmx;*.ascx;*.css;*.xsl;*.svc;*.xml;*.gif;*.png" />
<PackageConfigFiles Include="*.config" />
<PackageLocalResourceFiles Include="App_LocalResources\*.resx" />
<PackageDocumentationFiles Include="Documentation\*.txt" />
<PackageSqlDataProviderFiles Include="Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
<PackageDataFiles Include="Data\*.SqlDataProvider" />
<MyImages Include="images\*.*" />
<MyJsFiles Include="js\*.js" />
<MyKeys Include="keys\*.*" />
<MyViews Include="Views\*.ascx" />
<MyViewControls Include="Views\Controls\*.ascx" />
<MyRazorHelpers Include="RazorHelpers\*.cshtml" />
<MyScripts Include="Scripts\*.cshtml" />
<MySharedScripts Include="Scripts\Shared\*.cshtml" />
</ItemGroup>
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin" />
<Copy SourceFiles="@(PackageSourceFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
<Copy SourceFiles="@(PackageLocalResourceFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\App_LocalResources" />
Expand All @@ -77,11 +46,13 @@
<Copy SourceFiles="@(MyScripts)" DestinationFolder="$(MSBuildProjectDirectory)\Package\Scripts" />
<Copy SourceFiles="@(MySharedScripts)" DestinationFolder="$(MSBuildProjectDirectory)\Package\Scripts\Shared" />
<Copy SourceFiles="@(MyRazorHelpers)" DestinationFolder="$(MSBuildProjectDirectory)\Package\RazorHelpers" />
<CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
<Output TaskParameter="Include" ItemName="OutputContent" />
</CreateItem>

<ItemGroup>
<OutputContent Include="$(MSBuildProjectDirectory)\Package\**\*.*" />
</ItemGroup>
<Zip Files="@(OutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(WebsiteInstallPath)" />

<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
</Target>
Expand Down
24 changes: 11 additions & 13 deletions Build/BuildScripts/Package.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@
<!--<UsingTask AssemblyFile="$(YuiLib)" TaskName="JavaScriptCompressorTask" />-->

<Target Name="Package" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<XmlRead Prefix="n"
Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
XPath="dotnetnuke/packages/package/@version"
XmlFileName="$(DNNFileName).dnn">
<Output TaskParameter="Value" PropertyName="Version" />
</XmlRead>
<XmlPeek Namespaces="&lt;Namespace Prefix='n' Uri='http://schemas.microsoft.com/developer/msbuild/2003' /&gt;"
Query="dotnetnuke/packages/package/@version"
XmlInputPath="$(DNNFileName).dnn">
<Output TaskParameter="Result" PropertyName="Version" />
</XmlPeek>
<ExtensionPackager Manifest="$(DNNFileName).dnn" WorkingFolder="$(MSBuildProjectDirectory)\">
<Output TaskParameter="PackageFiles" ItemName="PackageFiles">
</Output>
Expand All @@ -66,15 +65,14 @@
<Copy SourceFiles="@(ReleaseNotesFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />

<Copy SourceFiles="@(PackageFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(PackageFiles.RecursiveDir)" />

<CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
<Output TaskParameter="Include" ItemName="ZipOutputContent" />
</CreateItem>
<ItemGroup>
<ZipOutputContent Include="$(MSBuildProjectDirectory)\Package\**\*.*" />
</ItemGroup>
<Zip Files="@(ZipOutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />
<Move SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="$(InstallPath)" />

<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
<RemoveDir Directories="$(MSBuildProjectDirectory)\Package" ContinueOnError="WarnAndContinue" />
</Target>

<Target Name="Minification">
Expand Down
22 changes: 10 additions & 12 deletions Build/BuildScripts/ProviderPackage.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,25 @@
XmlFileName="$(DNNFileName).dnn">
<Output TaskParameter="Value" PropertyName="Version" />
</XmlRead>
<CreateItem Include="*.dnn">
<Output TaskParameter="Include" ItemName="PackageManifestFiles" />
</CreateItem>
<CreateItem Include="*.txt">
<Output TaskParameter="Include" ItemName="PackageTextFiles" />
</CreateItem>
<CreateItem Include="*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="PackageSqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<PackageManifestFiles Include="*.dnn" />
<PackageTextFiles Include="*.txt" />
<PackageSqlDataProviderFiles Include="*.SqlDataProvider" />
</ItemGroup>
<Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
<Copy SourceFiles="@(PackageTextFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
<Copy SourceFiles="@(PackageSqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin$(Providers)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).dll" DestinationFolder="../../../../Website/bin$(Providers)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).pdb" DestinationFolder="../../../../Website/bin$(Providers)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\$(AssemblyName).xml" DestinationFolder="../../../../Website/bin$(Providers)" />
<CreateItem Include="$(MSBuildProjectDirectory)\Package\**\*.*">
<Output TaskParameter="Include" ItemName="OutputContent" />
</CreateItem>

<ItemGroup>
<OutputContent Include="$(MSBuildProjectDirectory)\Package\**\*.*" />
</ItemGroup>
<Zip Files="@(OutputContent)" WorkingDirectory="$(MSBuildProjectDirectory)\Package" ZipFileName="$(PackageName)_$(Version)_Install.$(Extension)" />
<Copy SourceFiles="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" DestinationFolder="../../../../Website/Install/Provider" />

<Delete Files="$(MSBuildProjectDirectory)\$(PackageName)_$(Version)_Install.$(Extension)" />
<RemoveDir Directories ="$(MSBuildProjectDirectory)\Package" />
</Target>
Expand Down
12 changes: 6 additions & 6 deletions DNN Platform/Modules/Samples/Dnn.ContactList.Mvc/Module.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<InstallPath>$(PathToArtifacts)\SampleModules</InstallPath>
</PropertyGroup>
<Target Name="CopySqlDataProviderFiles" BeforeTargets="Build" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreateItem Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<SqlDataProviderFiles Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider" />
</Target>
<Target Name="CopyBinOrNot" Condition=" '$(CopySampleProjects)' == 'True' ">
Expand All @@ -25,9 +25,9 @@
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.ContactList.Api.xml" DestinationFolder="$(WebsitePath)/bin" />
</Target>
<Target Name="PostBuild" AfterTargets="Package" DependsOnTargets="CopyBinOrNot;GetFiles;UpdateFiles;DebugProject;Package">
<CreateItem Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="CopiedSqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<CopiedSqlDataProviderFiles Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Delete Files="@(CopiedSqlDataProviderFiles)" />
<RemoveDir Directories="$(MSBuildProjectDirectory)\Providers" />
</Target>
Expand Down
12 changes: 6 additions & 6 deletions DNN Platform/Modules/Samples/Dnn.ContactList.Spa/Module.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<InstallPath>$(PathToArtifacts)\SampleModules</InstallPath>
</PropertyGroup>
<Target Name="CopySqlDataProviderFiles" BeforeTargets="Build" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreateItem Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<SqlDataProviderFiles Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider" />
</Target>
<Target Name="CopyBinOrNot" Condition=" '$(CopySampleProjects)' == 'True' ">
Expand All @@ -25,9 +25,9 @@
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.ContactList.Api.xml" DestinationFolder="$(WebsitePath)/bin" />
</Target>
<Target Name="PostBuild" AfterTargets="Package" DependsOnTargets="CopyBinOrNot;GetFiles;UpdateFiles;DebugProject;Package">
<CreateItem Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="CopiedSqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<CopiedSqlDataProviderFiles Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Delete Files="@(CopiedSqlDataProviderFiles)" />
<RemoveDir Directories="$(MSBuildProjectDirectory)\Providers" />
</Target>
Expand Down
12 changes: 6 additions & 6 deletions DNN Platform/Modules/Samples/Dnn.ContactList.SpaReact/Module.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
<InstallPath>$(PathToArtifacts)\SampleModules</InstallPath>
</PropertyGroup>
<Target Name="CopySqlDataProviderFiles" BeforeTargets="Build" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<CreateItem Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="SqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<SqlDataProviderFiles Include="$(MSBuildProjectDirectory)\..\Dnn.ContactList.Api\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider" />
</Target>
<Target Name="CopyBinOrNot" Condition=" '$(CopySampleProjects)' == 'True' ">
Expand All @@ -25,9 +25,9 @@
<Copy SourceFiles="$(MSBuildProjectDirectory)\bin\Dnn.ContactList.Api.xml" DestinationFolder="$(WebsitePath)/bin" />
</Target>
<Target Name="PostBuild" AfterTargets="Package" DependsOnTargets="CopyBinOrNot;GetFiles;UpdateFiles;DebugProject;Package">
<CreateItem Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider">
<Output TaskParameter="Include" ItemName="CopiedSqlDataProviderFiles" />
</CreateItem>
<ItemGroup>
<CopiedSqlDataProviderFiles Include="$(MSBuildProjectDirectory)\Providers\DataProviders\SqlDataProvider\*.SqlDataProvider" />
</ItemGroup>
<Delete Files="@(CopiedSqlDataProviderFiles)" />
<RemoveDir Directories="$(MSBuildProjectDirectory)\Providers" />
</Target>
Expand Down
7 changes: 4 additions & 3 deletions DNN_Platform.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,10 +157,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Knockout", "Knockout", "{63
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build Scripts", "Build Scripts", "{D8E1B782-01BB-4FEC-8E8D-E5729CBB3C5E}"
ProjectSection(SolutionItems) = preProject
Build\BuildScripts\AEModule.build = Build\BuildScripts\AEModule.build
DNN_Platform.build = DNN_Platform.build
Build\BuildScripts\Module.build = Build\BuildScripts\Module.build
Build\BuildScripts\Provider.build = Build\BuildScripts\Provider.build
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.Authentication", "DNN Platform\Tests\DotNetNuke.Tests.Authentication\DotNetNuke.Tests.Authentication.csproj", "{0E8502FD-DE8B-46A5-AB96-B1BE39777917}"
Expand Down Expand Up @@ -361,6 +358,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildScripts", "BuildScript
Build\BuildScripts\Package.targets = Build\BuildScripts\Package.targets
Build\BuildScripts\Provider.build = Build\BuildScripts\Provider.build
Build\BuildScripts\ProviderPackage.targets = Build\BuildScripts\ProviderPackage.targets
Build\BuildScripts\PublishArtifacts.ps1 = Build\BuildScripts\PublishArtifacts.ps1
Build\BuildScripts\Yahoo.Yui.Compressor.dll = Build\BuildScripts\Yahoo.Yui.Compressor.dll
Build\BuildScripts\Yahoo.Yui.Compressor.MsBuild.dll = Build\BuildScripts\Yahoo.Yui.Compressor.MsBuild.dll
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Symbols", "Symbols", "{4F538A14-38F5-473F-8386-60D81F3F530A}"
Expand All @@ -386,6 +386,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuGet", "NuGet", "{F4AAB2C9
Build\Tools\NuGet\DotNetNuke.Web.Mvc.nuspec = Build\Tools\NuGet\DotNetNuke.Web.Mvc.nuspec
Build\Tools\NuGet\DotNetNuke.Web.nuspec = Build\Tools\NuGet\DotNetNuke.Web.nuspec
Build\Tools\NuGet\DotNetNuke.WebApi.nuspec = Build\Tools\NuGet\DotNetNuke.WebApi.nuspec
Build\Tools\NuGet\logo-for-nuget.png = Build\Tools\NuGet\logo-for-nuget.png
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Providers.AspNetCCP", "DNN Platform\Providers\ClientCapabilityProviders\Provider.AspNetCCP\DotNetNuke.Providers.AspNetCCP.csproj", "{A3B3F1E8-6C1A-4E35-A5B4-51ECC5A43AF7}"
Expand Down