aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2023-01-11 20:21:00 -0800
committerRob Mensching <rob@firegiant.com>2023-01-11 22:05:39 -0800
commit80326388ce249e92874ed97193c4be4fec25d790 (patch)
tree1cb55267339f37cc12615642bb7d004e42121cc6 /src
parent28b700be89603860f2127dc21170e8f413385602 (diff)
downloadwix-80326388ce249e92874ed97193c4be4fec25d790.tar.gz
wix-80326388ce249e92874ed97193c4be4fec25d790.tar.bz2
wix-80326388ce249e92874ed97193c4be4fec25d790.zip
Remove support for importing WixToolset.Sdk via PackageReference
The WixToolset.Sdk is an MSBuild project SDK. It should be imported using the Sdk.props. Allowing it to be imported via PackageReference is unnecessary and creates double import problems. Prevent such imports to point WiX users that don't understand the new MSBuild functionality in the right direction. Fixes 7148
Diffstat (limited to 'src')
-rw-r--r--src/wix/WixToolset.Sdk/Sdk/Sdk.props1
-rw-r--r--src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj1
-rw-r--r--src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props11
-rw-r--r--src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets7
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs14
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj35
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj7
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj3
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj15
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj11
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj9
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj22
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj25
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj2
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj33
-rw-r--r--src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj4
16 files changed, 27 insertions, 173 deletions
diff --git a/src/wix/WixToolset.Sdk/Sdk/Sdk.props b/src/wix/WixToolset.Sdk/Sdk/Sdk.props
index b293f911..4e2d4dfc 100644
--- a/src/wix/WixToolset.Sdk/Sdk/Sdk.props
+++ b/src/wix/WixToolset.Sdk/Sdk/Sdk.props
@@ -3,6 +3,7 @@
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <PropertyGroup> 5 <PropertyGroup>
6 <WixSdkPropsImported>true</WixSdkPropsImported>
6 <WixPropsPath Condition=" '$(WixPropsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.props'))</WixPropsPath> 7 <WixPropsPath Condition=" '$(WixPropsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.props'))</WixPropsPath>
7 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath> 8 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath>
8 </PropertyGroup> 9 </PropertyGroup>
diff --git a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
index eca65bda..46ff4d80 100644
--- a/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
+++ b/src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj
@@ -11,7 +11,6 @@
11 </PropertyGroup> 11 </PropertyGroup>
12 12
13 <ItemGroup> 13 <ItemGroup>
14 <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
15 <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" /> 14 <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" />
16 <Content Include="tools\WixToolset.Signing.props" CopyToOutputDirectory="PreserveNewest" /> 15 <Content Include="tools\WixToolset.Signing.props" CopyToOutputDirectory="PreserveNewest" />
17 <Content Include="tools\WixToolset.Signing.targets" CopyToOutputDirectory="PreserveNewest" /> 16 <Content Include="tools\WixToolset.Signing.targets" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props
deleted file mode 100644
index e70d4024..00000000
--- a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props
+++ /dev/null
@@ -1,11 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <PropertyGroup>
6 <WixPropsPath Condition=" '$(WixPropsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.props'))</WixPropsPath>
7 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath>
8 </PropertyGroup>
9
10 <Import Project="$(WixPropsPath)" Condition=" '$(WixPropsPath)' != '' and Exists('$(WixPropsPath)')" />
11</Project>
diff --git a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets
index 3940d6d5..8d83e004 100644
--- a/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets
+++ b/src/wix/WixToolset.Sdk/build/WixToolset.Sdk.targets
@@ -1,6 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> 2<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3 3
4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 4<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="_CannotPackageReferenceWixToolsetSdk" >
5 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" /> 5 <Target Name="_CannotPackageReferenceWixToolsetSdk"
6 Condition=" '$(WixSdkPropsImported)' == 'true' ">
7 <Error Text="The WixToolset.Sdk is an MSBuild project SDK and cannot be referenced using a PackageReference. See the MSBuild documentation how to use SDKs https://learn.microsoft.com/en-us/visualstudio/msbuild/how-to-use-project-sdk" />
8 </Target>
6</Project> 9</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
index 2c106015..98fffbbc 100644
--- a/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
+++ b/src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs
@@ -12,7 +12,7 @@ namespace WixToolsetTest.Sdk
12 public class MsbuildFixture 12 public class MsbuildFixture
13 { 13 {
14 public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).LocalPath), "..", "..", "..", "publish", "WixToolset.Sdk"); 14 public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).LocalPath), "..", "..", "..", "publish", "WixToolset.Sdk");
15 public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props"); 15 public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "Sdk", "Sdk.props");
16 16
17 [Theory] 17 [Theory]
18 [InlineData(BuildSystem.DotNetCoreSdk)] 18 [InlineData(BuildSystem.DotNetCoreSdk)]
@@ -63,7 +63,7 @@ namespace WixToolsetTest.Sdk
63 [InlineData(BuildSystem.MSBuild64)] 63 [InlineData(BuildSystem.MSBuild64)]
64 public void CanBuildUncompressedBundle(BuildSystem buildSystem) 64 public void CanBuildUncompressedBundle(BuildSystem buildSystem)
65 { 65 {
66 var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage"); 66 var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage");
67 67
68 using (var fs = new TestDataFolderFileSystem()) 68 using (var fs = new TestDataFolderFileSystem())
69 { 69 {
@@ -106,7 +106,7 @@ namespace WixToolsetTest.Sdk
106 [InlineData(BuildSystem.MSBuild64)] 106 [InlineData(BuildSystem.MSBuild64)]
107 public void CanBuildSimpleMergeModule(BuildSystem buildSystem) 107 public void CanBuildSimpleMergeModule(BuildSystem buildSystem)
108 { 108 {
109 var sourceFolder = TestData.Get(@"TestData\MergeModule\SimpleMergeModule"); 109 var sourceFolder = TestData.Get("TestData", "MergeModule", "SimpleMergeModule");
110 110
111 using (var fs = new TestDataFolderFileSystem()) 111 using (var fs = new TestDataFolderFileSystem())
112 { 112 {
@@ -199,7 +199,7 @@ namespace WixToolsetTest.Sdk
199 [InlineData(BuildSystem.MSBuild64)] 199 [InlineData(BuildSystem.MSBuild64)]
200 public void CanBuildSimpleMsiPackageWithMergeModule(BuildSystem buildSystem) 200 public void CanBuildSimpleMsiPackageWithMergeModule(BuildSystem buildSystem)
201 { 201 {
202 var sourceFolder = TestData.Get(@"TestData\MergeModule"); 202 var sourceFolder = TestData.Get(@"TestData", "MergeModule");
203 203
204 using (var fs = new TestDataFolderFileSystem()) 204 using (var fs = new TestDataFolderFileSystem())
205 { 205 {
@@ -390,7 +390,7 @@ namespace WixToolsetTest.Sdk
390 [InlineData(BuildSystem.MSBuild64)] 390 [InlineData(BuildSystem.MSBuild64)]
391 public void CanBuildMsiPackageWithIceSuppressions(BuildSystem buildSystem) 391 public void CanBuildMsiPackageWithIceSuppressions(BuildSystem buildSystem)
392 { 392 {
393 var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage"); 393 var sourceFolder = TestData.Get("TestData", "MsiPackageWithIceError", "MsiPackage");
394 394
395 using (var fs = new TestDataFolderFileSystem()) 395 using (var fs = new TestDataFolderFileSystem())
396 { 396 {
@@ -414,7 +414,7 @@ namespace WixToolsetTest.Sdk
414 [InlineData(BuildSystem.MSBuild64)] 414 [InlineData(BuildSystem.MSBuild64)]
415 public void CanBuildSimpleMsiPackageWithWarningSuppressions(BuildSystem buildSystem) 415 public void CanBuildSimpleMsiPackageWithWarningSuppressions(BuildSystem buildSystem)
416 { 416 {
417 var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); 417 var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
418 418
419 using (var fs = new TestDataFolderFileSystem()) 419 using (var fs = new TestDataFolderFileSystem())
420 { 420 {
@@ -738,7 +738,7 @@ namespace WixToolsetTest.Sdk
738 738
739 private void AssertWixpdb(BuildSystem buildSystem, string debugType, string[] expectedOutputFiles) 739 private void AssertWixpdb(BuildSystem buildSystem, string debugType, string[] expectedOutputFiles)
740 { 740 {
741 var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage"); 741 var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
742 742
743 using (var fs = new TestDataFolderFileSystem()) 743 using (var fs = new TestDataFolderFileSystem())
744 { 744 {
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
index 77ee4420..8bd1cea3 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/MergeMsiPackage/MergeMsiPackage.wixproj
@@ -1,44 +1,15 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7 </PropertyGroup> 8 </PropertyGroup>
8 9
9 <PropertyGroup>
10 <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
11 </PropertyGroup>
12
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
14 <PlatformName>$(Platform)</PlatformName>
15 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
16 <DefineConstants>Debug</DefineConstants>
17 </PropertyGroup>
18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
19 <PlatformName>$(Platform)</PlatformName>
20 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
23 <PlatformName>$(Platform)</PlatformName>
24 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
25 <DefineConstants>Debug</DefineConstants>
26 </PropertyGroup>
27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
28 <PlatformName>$(Platform)</PlatformName>
29 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
30 </PropertyGroup>
31
32 <ItemGroup>
33 <Compile Include="Package.wxs" />
34 </ItemGroup>
35
36 <ItemGroup> 10 <ItemGroup>
37 <ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj"> 11 <ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj" />
38 <Name>SimpleMergeModule</Name>
39 <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
40 </ProjectReference>
41 </ItemGroup> 12 </ItemGroup>
42 13
43 <Import Project="$(WixTargetsPath)" /> 14 <Import Project="$(WixTargetsPath)" />
44</Project> \ No newline at end of file 15</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
index 91579790..718ebfc2 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MergeModule/SimpleMergeModule/SimpleMergeModule.wixproj
@@ -1,6 +1,7 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -31,12 +32,8 @@
31 </PropertyGroup> 32 </PropertyGroup>
32 33
33 <ItemGroup> 34 <ItemGroup>
34 <Compile Include="MergeModule.wxs" />
35 </ItemGroup>
36
37 <ItemGroup>
38 <BindInputPaths Include="data" /> 35 <BindInputPaths Include="data" />
39 </ItemGroup> 36 </ItemGroup>
40 37
41 <Import Project="$(WixTargetsPath)" /> 38 <Import Project="$(WixTargetsPath)" />
42</Project> \ No newline at end of file 39</Project>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
index e6978f49..a3d9a7c5 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithBindVariables/MsiPackageWithBindVariables.wixproj
@@ -1,12 +1,11 @@
1<Project> 1<Project>
2 <Import Project="$(WixMSBuildProps)" /> 2 <Import Project="$(WixMSBuildProps)" />
3
3 <PropertyGroup> 4 <PropertyGroup>
4 <WixVariables>DataFolderVar=data</WixVariables> 5 <WixVariables>DataFolderVar=data</WixVariables>
5 </PropertyGroup> 6 </PropertyGroup>
6 7
7 <ItemGroup> 8 <ItemGroup>
8 <Compile Include="Package.wxs" />
9
10 <BindVariable Include="VersionVar=1.2.3" /> 9 <BindVariable Include="VersionVar=1.2.3" />
11 </ItemGroup> 10 </ItemGroup>
12 11
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj
index acbcd85d..ba2955fa 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MsiPackageWithIceError/MsiPackage/MsiPackage.wixproj
@@ -6,10 +6,6 @@
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <PropertyGroup>
10 <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
11 </PropertyGroup>
12
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 9 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
14 <PlatformName>$(Platform)</PlatformName> 10 <PlatformName>$(Platform)</PlatformName>
15 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath> 11 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -30,16 +26,7 @@
30 </PropertyGroup> 26 </PropertyGroup>
31 27
32 <ItemGroup> 28 <ItemGroup>
33 <Compile Include="Package.wxs" /> 29 <BindPath Include="data" />
34 <Compile Include="PackageComponents.wxs" />
35 </ItemGroup>
36
37 <ItemGroup>
38 <EmbeddedResource Include="Package.en-us.wxl" />
39 </ItemGroup>
40
41 <ItemGroup>
42 <BindInputPaths Include="data" />
43 </ItemGroup> 30 </ItemGroup>
44 31
45 <Import Project="$(WixTargetsPath)" /> 32 <Import Project="$(WixTargetsPath)" />
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
index 49ef7fbf..05688322 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/MultiCulturalMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -6,17 +6,6 @@
6 </PropertyGroup> 6 </PropertyGroup>
7 7
8 <ItemGroup> 8 <ItemGroup>
9 <Compile Include="Package.wxs" />
10 <Compile Include="PackageComponents.wxs" />
11 </ItemGroup>
12
13 <ItemGroup>
14 <EmbeddedResource Include="Package.en-us.wxl" />
15 <EmbeddedResource Include="Package.en.wxl" />
16 <EmbeddedResource Include="Package.de-de.wxl" />
17 </ItemGroup>
18
19 <ItemGroup>
20 <BindInputPaths Include="data" /> 9 <BindInputPaths Include="data" />
21 </ItemGroup> 10 </ItemGroup>
22 11
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
index f3155cf6..fc239a83 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/MsiPackage/MsiPackage.wixproj
@@ -30,15 +30,6 @@
30 </PropertyGroup> 30 </PropertyGroup>
31 31
32 <ItemGroup> 32 <ItemGroup>
33 <Compile Include="Package.wxs" />
34 <Compile Include="PackageComponents.wxs" />
35 </ItemGroup>
36
37 <ItemGroup>
38 <EmbeddedResource Include="Package.en-us.wxl" />
39 </ItemGroup>
40
41 <ItemGroup>
42 <BindInputPaths Include="data" /> 33 <BindInputPaths Include="data" />
43 </ItemGroup> 34 </ItemGroup>
44 35
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
index 8f06f328..2d90cd19 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/SimpleBundle/SimpleBundle.wixproj
@@ -1,33 +1,15 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7 </PropertyGroup> 8 </PropertyGroup>
8 9
9 <PropertyGroup> 10 <PropertyGroup>
10 <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid>
11 <OutputType>Bundle</OutputType> 11 <OutputType>Bundle</OutputType>
12 </PropertyGroup> 12 <EnableDefaultItems>false</EnableDefaultItems>
13
14 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
15 <PlatformName>$(Platform)</PlatformName>
16 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
17 <DefineConstants>Debug</DefineConstants>
18 </PropertyGroup>
19 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
20 <PlatformName>$(Platform)</PlatformName>
21 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
22 </PropertyGroup>
23 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
24 <PlatformName>$(Platform)</PlatformName>
25 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
26 <DefineConstants>Debug</DefineConstants>
27 </PropertyGroup>
28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
29 <PlatformName>$(Platform)</PlatformName>
30 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
31 </PropertyGroup> 13 </PropertyGroup>
32 14
33 <ItemGroup> 15 <ItemGroup>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj
index 8f06f328..2f1785b2 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SimpleMsiPackage/UncompressedBundle/UncompressedBundle.wixproj
@@ -1,39 +1,16 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7 </PropertyGroup> 8 </PropertyGroup>
8 9
9 <PropertyGroup> 10 <PropertyGroup>
10 <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid>
11 <OutputType>Bundle</OutputType> 11 <OutputType>Bundle</OutputType>
12 </PropertyGroup> 12 </PropertyGroup>
13 13
14 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
15 <PlatformName>$(Platform)</PlatformName>
16 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
17 <DefineConstants>Debug</DefineConstants>
18 </PropertyGroup>
19 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
20 <PlatformName>$(Platform)</PlatformName>
21 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
22 </PropertyGroup>
23 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
24 <PlatformName>$(Platform)</PlatformName>
25 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
26 <DefineConstants>Debug</DefineConstants>
27 </PropertyGroup>
28 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
29 <PlatformName>$(Platform)</PlatformName>
30 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
31 </PropertyGroup>
32
33 <ItemGroup>
34 <Compile Include="Bundle.wxs" />
35 </ItemGroup>
36
37 <ItemGroup> 14 <ItemGroup>
38 <BindInputPaths Include="..\MsiPackage\data" /> 15 <BindInputPaths Include="..\MsiPackage\data" />
39 </ItemGroup> 16 </ItemGroup>
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj
index 86b4d786..1a923cbf 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/SingleCultureWithFallbackMsiPackage/SingleCultureWithFallbackMsiPackage.wixproj
@@ -1,7 +1,9 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build"> 2<Project ToolsVersion="15.0" DefaultTargets="Build">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
6 <EnableDefaultItems>false</EnableDefaultItems>
5 <Cultures>de-DE,en-us</Cultures> 7 <Cultures>de-DE,en-us</Cultures>
6 </PropertyGroup> 8 </PropertyGroup>
7 9
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj
index 6ada19b8..c53050cb 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/PackageIncludesWixlib/PackageIncludesWixlib.wixproj
@@ -1,43 +1,14 @@
1<?xml version="1.0" encoding="utf-8"?> 1<?xml version="1.0" encoding="utf-8"?>
2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="$(WixMSBuildProps)" /> 3 <Import Project="$(WixMSBuildProps)" />
4
4 <PropertyGroup> 5 <PropertyGroup>
5 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 6 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6 <Platform Condition=" '$(Platform)' == '' ">x86</Platform> 7 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
7 </PropertyGroup> 8 </PropertyGroup>
8 9
9 <PropertyGroup>
10 <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
11 </PropertyGroup>
12
13 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
14 <PlatformName>$(Platform)</PlatformName>
15 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
16 <DefineConstants>Debug</DefineConstants>
17 </PropertyGroup>
18 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
19 <PlatformName>$(Platform)</PlatformName>
20 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
23 <PlatformName>$(Platform)</PlatformName>
24 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
25 <DefineConstants>Debug</DefineConstants>
26 </PropertyGroup>
27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
28 <PlatformName>$(Platform)</PlatformName>
29 <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
30 </PropertyGroup>
31
32 <ItemGroup>
33 <Compile Include="Package.wxs" />
34 </ItemGroup>
35
36 <ItemGroup> 10 <ItemGroup>
37 <ProjectReference Include="..\SimpleWixlib\SimpleWixlib.wixproj"> 11 <ProjectReference Include="..\SimpleWixlib\SimpleWixlib.wixproj" />
38 <Name>SimpleWixlib</Name>
39 <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
40 </ProjectReference>
41 </ItemGroup> 12 </ItemGroup>
42 13
43 <Import Project="$(WixTargetsPath)" /> 14 <Import Project="$(WixTargetsPath)" />
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
index 415bacc7..09200d19 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
@@ -9,10 +9,6 @@
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <ItemGroup> 11 <ItemGroup>
12 <Compile Include="Library.wxs" />
13 </ItemGroup>
14
15 <ItemGroup>
16 <BindPath Include="data" /> 12 <BindPath Include="data" />
17 </ItemGroup> 13 </ItemGroup>
18 14
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-17 08:22:59 +0000