From 37440a2e80c30cdce283bc570d92afe94430a345 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Thu, 25 Jun 2020 16:40:41 -0400
Subject: Support SDK-style projects with MSBuild SDK assets.

---
 src/WixToolset.MSBuild/Sdk/Sdk.props             | 22 ++++++++++++++++++++++
 src/WixToolset.MSBuild/Sdk/Sdk.targets           | 15 +++++++++++++++
 src/WixToolset.MSBuild/WixToolset.MSBuild.csproj |  2 ++
 src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec |  1 +
 4 files changed, 40 insertions(+)
 create mode 100644 src/WixToolset.MSBuild/Sdk/Sdk.props
 create mode 100644 src/WixToolset.MSBuild/Sdk/Sdk.targets

diff --git a/src/WixToolset.MSBuild/Sdk/Sdk.props b/src/WixToolset.MSBuild/Sdk/Sdk.props
new file mode 100644
index 00000000..acbe994c
--- /dev/null
+++ b/src/WixToolset.MSBuild/Sdk/Sdk.props
@@ -0,0 +1,22 @@
+<!-- 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" ToolsVersion="14.0">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EnableDefaultItems Condition=" '$(EnableDefaultItems)' == '' ">true</EnableDefaultItems>
+    <EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">true</EnableDefaultCompileItems>
+    <EnableDefaultEmbeddedResourceItems Condition=" '$(EnableDefaultEmbeddedResourceItems)' == '' ">true</EnableDefaultEmbeddedResourceItems>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
+    <Compile Include="**/*.wxs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
+    <EmbeddedResource Include="**/*.wxl" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " />
+  </ItemGroup>
+</Project>
diff --git a/src/WixToolset.MSBuild/Sdk/Sdk.targets b/src/WixToolset.MSBuild/Sdk/Sdk.targets
new file mode 100644
index 00000000..e21cf5c6
--- /dev/null
+++ b/src/WixToolset.MSBuild/Sdk/Sdk.targets
@@ -0,0 +1,15 @@
+<!-- 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" ToolsVersion="14.0">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" />
+  
+  <PropertyGroup>
+    <DefaultItemExcludes Condition=" '$(BaseOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseOutputPath)**</DefaultItemExcludes>
+    <DefaultItemExcludes Condition=" '$(BaseIntermediateOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseIntermediateOutputPath)**</DefaultItemExcludes>
+    <DefaultExcludesInProjectFolder>$(DefaultItemExcludesInProjectFolder);**/.*/**</DefaultExcludesInProjectFolder>
+  </PropertyGroup>
+</Project>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
index ba67660c..a145c864 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
@@ -17,6 +17,8 @@
     <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
+    <Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
index be04d21b..591b63a6 100644
--- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
@@ -12,6 +12,7 @@
 
   <files>
     <file src="build\**\*" target="build" />
+    <file src="Sdk\**\*" target="Sdk" />
     <file src="tools\**\*" target="tools" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb