From 80326388ce249e92874ed97193c4be4fec25d790 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Wed, 11 Jan 2023 20:21:00 -0800
Subject: 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
---
 src/wix/WixToolset.Sdk/Sdk/Sdk.props               |  1 +
 src/wix/WixToolset.Sdk/WixToolset.Sdk.csproj       |  1 -
 src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props  | 11 -------
 .../WixToolset.Sdk/build/WixToolset.Sdk.targets    |  7 +++--
 src/wix/test/WixToolsetTest.Sdk/MsbuildFixture.cs  | 14 ++++-----
 .../MergeMsiPackage/MergeMsiPackage.wixproj        | 35 ++--------------------
 .../SimpleMergeModule/SimpleMergeModule.wixproj    |  7 ++---
 .../MsiPackageWithBindVariables.wixproj            |  3 +-
 .../MsiPackage/MsiPackage.wixproj                  | 15 +---------
 .../MsiPackage/MsiPackage.wixproj                  | 11 -------
 .../SimpleMsiPackage/MsiPackage/MsiPackage.wixproj |  9 ------
 .../SimpleBundle/SimpleBundle.wixproj              | 22 ++------------
 .../UncompressedBundle/UncompressedBundle.wixproj  | 25 +---------------
 .../SingleCultureWithFallbackMsiPackage.wixproj    |  2 ++
 .../PackageIncludesWixlib.wixproj                  | 33 ++------------------
 .../Wixlib/SimpleWixlib/SimpleWixlib.wixproj       |  4 ---
 16 files changed, 27 insertions(+), 173 deletions(-)
 delete mode 100644 src/wix/WixToolset.Sdk/build/WixToolset.Sdk.props

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 @@
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <WixSdkPropsImported>true</WixSdkPropsImported>
     <WixPropsPath Condition=" '$(WixPropsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.props'))</WixPropsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath>
   </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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="build\$(MSBuildThisFileName).props" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="build\$(MSBuildThisFileName).targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\WixToolset.Signing.props" CopyToOutputDirectory="PreserveNewest" />
     <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 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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. -->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WixPropsPath Condition=" '$(WixPropsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.props'))</WixPropsPath>
-    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([MSBuild]::NormalizePath($(MSBuildThisFileDirectory), '..\tools\wix.targets'))</WixTargetsPath>
-  </PropertyGroup>
-
-  <Import Project="$(WixPropsPath)" Condition=" '$(WixPropsPath)' != '' and Exists('$(WixPropsPath)')" />
-</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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 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. -->
 
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" />
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="_CannotPackageReferenceWixToolsetSdk" >
+  <Target Name="_CannotPackageReferenceWixToolsetSdk"
+          Condition=" '$(WixSdkPropsImported)' == 'true' ">
+    <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" />
+  </Target>
 </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
     public class MsbuildFixture
     {
         public static readonly string WixMsbuildPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(MsbuildFixture).Assembly.CodeBase).LocalPath), "..", "..", "..", "publish", "WixToolset.Sdk");
-        public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "build", "WixToolset.Sdk.props");
+        public static readonly string WixPropsPath = Path.Combine(WixMsbuildPath, "Sdk", "Sdk.props");
 
         [Theory]
         [InlineData(BuildSystem.DotNetCoreSdk)]
@@ -63,7 +63,7 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildUncompressedBundle(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage");
+            var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -106,7 +106,7 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildSimpleMergeModule(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\MergeModule\SimpleMergeModule");
+            var sourceFolder = TestData.Get("TestData", "MergeModule", "SimpleMergeModule");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -199,7 +199,7 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildSimpleMsiPackageWithMergeModule(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\MergeModule");
+            var sourceFolder = TestData.Get(@"TestData", "MergeModule");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -390,7 +390,7 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildMsiPackageWithIceSuppressions(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\MsiPackageWithIceError\MsiPackage");
+            var sourceFolder = TestData.Get("TestData", "MsiPackageWithIceError", "MsiPackage");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -414,7 +414,7 @@ namespace WixToolsetTest.Sdk
         [InlineData(BuildSystem.MSBuild64)]
         public void CanBuildSimpleMsiPackageWithWarningSuppressions(BuildSystem buildSystem)
         {
-            var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
+            var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
 
             using (var fs = new TestDataFolderFileSystem())
             {
@@ -738,7 +738,7 @@ namespace WixToolsetTest.Sdk
 
         private void AssertWixpdb(BuildSystem buildSystem, string debugType, string[] expectedOutputFiles)
         {
-            var sourceFolder = TestData.Get(@"TestData\SimpleMsiPackage\MsiPackage");
+            var sourceFolder = TestData.Get("TestData", "SimpleMsiPackage", "MsiPackage");
 
             using (var fs = new TestDataFolderFileSystem())
             {
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj">
-      <Name>SimpleMergeModule</Name>
-      <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
-    </ProjectReference>
+    <ProjectReference Include="..\SimpleMergeModule\SimpleMergeModule.wixproj" />
   </ItemGroup>
 
   <Import Project="$(WixTargetsPath)" />
-</Project>
\ No newline at end of file
+</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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -30,13 +31,9 @@
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="MergeModule.wxs" />
-  </ItemGroup>
-
   <ItemGroup>
     <BindInputPaths Include="data" />
   </ItemGroup>
 
   <Import Project="$(WixTargetsPath)" />
-</Project>
\ No newline at end of file
+</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 @@
 <Project>
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <WixVariables>DataFolderVar=data</WixVariables>
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Package.wxs" />
-
     <BindVariable Include="VersionVar=1.2.3" />
   </ItemGroup>
 
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 @@
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <ProjectGuid>7fb77005-c6e0-454f-8c2d-0a4a79c918ba</ProjectGuid>
-  </PropertyGroup>
-
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformName>$(Platform)</PlatformName>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
@@ -30,16 +26,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="Package.wxs" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <BindInputPaths Include="data" />
+    <BindPath Include="data" />
   </ItemGroup>
 
   <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
@@ -5,17 +5,6 @@
     <Cultures>en-US,en;de-DE</Cultures>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-    <EmbeddedResource Include="Package.en.wxl" />
-    <EmbeddedResource Include="Package.de-de.wxl" />
-  </ItemGroup>
-
   <ItemGroup>
     <BindInputPaths Include="data" />
   </ItemGroup>
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
@@ -29,15 +29,6 @@
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-    <Compile Include="PackageComponents.wxs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="Package.en-us.wxl" />
-  </ItemGroup>
-
   <ItemGroup>
     <BindInputPaths Include="data" />
   </ItemGroup>
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid>
     <OutputType>Bundle</OutputType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
   </PropertyGroup>
 
   <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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
   </PropertyGroup>
 
   <PropertyGroup>
-    <ProjectGuid>6670d5c9-bbec-4828-ab60-4a1c0ffeb97d</ProjectGuid>
     <OutputType>Bundle</OutputType>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Bundle.wxs" />
-  </ItemGroup>
-
   <ItemGroup>
     <BindInputPaths Include="..\MsiPackage\data" />
   </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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
+    <EnableDefaultItems>false</EnableDefaultItems>
     <Cultures>de-DE,en-us</Cultures>
   </PropertyGroup>
 
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 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(WixMSBuildProps)" />
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <ProjectGuid>{B00939D5-7952-4ADF-BEB1-507D227B2FE2}</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <PlatformName>$(Platform)</PlatformName>
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="Package.wxs" />
-  </ItemGroup>
-
   <ItemGroup>
-    <ProjectReference Include="..\SimpleWixlib\SimpleWixlib.wixproj">
-      <Name>SimpleWixlib</Name>
-      <Project>{9F84998B-7F45-4CB3-8795-915801DBBB74}</Project>
-    </ProjectReference>
+    <ProjectReference Include="..\SimpleWixlib\SimpleWixlib.wixproj" />
   </ItemGroup>
 
   <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
@@ -8,10 +8,6 @@
     <WixVariables>SubfolderVar=subfolder</WixVariables>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="Library.wxs" />
-  </ItemGroup>
-
   <ItemGroup>
     <BindPath Include="data" />
   </ItemGroup>
-- 
cgit v1.2.3-55-g6feb