Skip to content

Fix handling of default items #672

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
robmen merged 1 commit into from
Dec 14, 2025
Merged

Fix handling of default items #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/wix/WixToolset.Sdk/tools/wix.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
</PropertyGroup>

<!-- Default items -->
<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
<Compile Include="**/*.wxs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
<EmbeddedResource Include="**/*.wxl" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " />
</ItemGroup>
<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' And '$(EnableDefaultNoneItems)' == 'true' ">
<None Include="**/*" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<None Remove="**/*.wxs" />
<None Remove="**/*.wxl" />
<None Remove="**/*.wxi" />
</ItemGroup>

<PropertyGroup>
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
Expand Down
5 changes: 0 additions & 5 deletions src/wix/WixToolset.Sdk/tools/wix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@
<WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixBinDir)WixToolset.BuildTasks.dll</WixTasksPath>
</PropertyGroup>

<ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
<Compile Include="**/*.wxs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
<EmbeddedResource Include="**/*.wxl" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " />
</ItemGroup>

<ItemGroup>
<AvailableItemName Include="BindPath;BindVariable;WixLibrary;WixExtension" />
</ItemGroup>
Expand Down
62 changes: 62 additions & 0 deletions src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,68 @@ public void CanBuildSimpleWixlib(BuildSystem buildSystem)
}
}

[TestMethod]
[DataRow(BuildSystem.DotNetCoreSdk)]
[DataRow(BuildSystem.MSBuild)]
[DataRow(BuildSystem.MSBuild64)]
public void CanBuildWixlibOnlyGoodFiles(BuildSystem buildSystem)
{
var sourceFolder = TestData.Get(@"TestData", "Wixlib", "WithBadFiles");

using (var fs = new TestDataFolderFileSystem())
{
fs.Initialize(sourceFolder);
var baseFolder = fs.BaseFolder;
var binFolder = Path.Combine(baseFolder, @"bin\");
var projectPath = Path.Combine(baseFolder, "OnlyGoodFiles.wixproj");

var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
{
MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
});
result.AssertSuccess();

var wixBuildCommands = MsbuildUtilities.GetToolCommandLines(result, "wix", "build", buildSystem);
WixAssert.Single(wixBuildCommands);

var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
.Select(s => s.Substring(baseFolder.Length + 1))
.Single();
WixAssert.StringEqual(@"bin\Release\OnlyGoodFiles.wixlib", path);
}
}

[TestMethod]
[DataRow(BuildSystem.DotNetCoreSdk)]
[DataRow(BuildSystem.MSBuild)]
[DataRow(BuildSystem.MSBuild64)]
public void CanBuildWixlibSkippingBadFiles(BuildSystem buildSystem)
{
var sourceFolder = TestData.Get(@"TestData", "Wixlib", "WithBadFiles");

using (var fs = new TestDataFolderFileSystem())
{
fs.Initialize(sourceFolder);
var baseFolder = fs.BaseFolder;
var binFolder = Path.Combine(baseFolder, @"bin\");
var projectPath = Path.Combine(baseFolder, "SkipBadFiles.wixproj");

var result = MsbuildUtilities.BuildProject(buildSystem, projectPath, new[]
{
MsbuildUtilities.GetQuotedPropertySwitch(buildSystem, "WixMSBuildProps", MsbuildFixture.WixPropsPath),
});
result.AssertSuccess();

var wixBuildCommands = MsbuildUtilities.GetToolCommandLines(result, "wix", "build", buildSystem);
WixAssert.Single(wixBuildCommands);

var path = Directory.EnumerateFiles(binFolder, @"*.*", SearchOption.AllDirectories)
.Select(s => s.Substring(baseFolder.Length + 1))
.Single();
WixAssert.StringEqual(@"bin\Release\SkipBadFiles.wixlib", path);
}
}

[TestMethod]
[DataRow(BuildSystem.DotNetCoreSdk)]
[DataRow(BuildSystem.MSBuild)]
Expand Down
1 change: 1 addition & 0 deletions src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Bad.wxl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Not a proper XML file, will break the build.
1 change: 1 addition & 0 deletions src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Bad.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Not a proper XML file, will break the build.
7 changes: 7 additions & 0 deletions src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/Library.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<StandardDirectory Id="ProgramFilesFolder">
<Directory Id="WixLibFolder" />
</StandardDirectory>
</Fragment>
</Wix>
15 changes: 15 additions & 0 deletions src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/OnlyGoodFiles.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="$(WixMSBuildProps)" />

<PropertyGroup>
<OutputType>Library</OutputType>
<EnableDefaultItems>false</EnableDefaultItems>
</PropertyGroup>

<ItemGroup>
<Compile Include="Library.wxs" />
</ItemGroup>

<Import Project="$(WixTargetsPath)" />
</Project>
15 changes: 15 additions & 0 deletions src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/WithBadFiles/SkipBadFiles.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="$(WixMSBuildProps)" />

<PropertyGroup>
<OutputType>Library</OutputType>
</PropertyGroup>

<ItemGroup>
<Compile Remove="Bad.wxs" />
<EmbeddedResource Remove="Bad.wxl" />
</ItemGroup>

<Import Project="$(WixTargetsPath)" />
</Project>