@joebigelow / wix / commits / 37440a2e

Support SDK-style projects with MSBuild SDK assets.

Bob Arnson committed Jun 25, 2020 at 16:40 UTC 37440a2e80c30cdce283bc570d92afe94430a345
4 files changed +40
src/WixToolset.MSBuild/Sdk/Sdk.props new
+22
@@ -0,0 +1,22 @@
1 +<!-- 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 +
3 +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
4 + <PropertyGroup>
5 + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
6 + </PropertyGroup>
7 +
8 + <PropertyGroup>
9 + <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\wix.targets'))</WixTargetsPath>
10 + </PropertyGroup>
11 +
12 + <PropertyGroup>
13 + <EnableDefaultItems Condition=" '$(EnableDefaultItems)' == '' ">true</EnableDefaultItems>
14 + <EnableDefaultCompileItems Condition=" '$(EnableDefaultCompileItems)' == '' ">true</EnableDefaultCompileItems>
15 + <EnableDefaultEmbeddedResourceItems Condition=" '$(EnableDefaultEmbeddedResourceItems)' == '' ">true</EnableDefaultEmbeddedResourceItems>
16 + </PropertyGroup>
17 +
18 + <ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' ">
19 + <Compile Include="**/*.wxs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultCompileItems)' == 'true' " />
20 + <EmbeddedResource Include="**/*.wxl" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" Condition=" '$(EnableDefaultEmbeddedResourceItems)' == 'true' " />
21 + </ItemGroup>
22 +</Project>
src/WixToolset.MSBuild/Sdk/Sdk.targets new
+15
@@ -0,0 +1,15 @@
1 +<!-- 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 +
3 +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
4 + <PropertyGroup>
5 + <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
6 + </PropertyGroup>
7 +
8 + <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' and Exists('$(WixTargetsPath)')" />
9 +
10 + <PropertyGroup>
11 + <DefaultItemExcludes Condition=" '$(BaseOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseOutputPath)**</DefaultItemExcludes>
12 + <DefaultItemExcludes Condition=" '$(BaseIntermediateOutputPath)' != '' ">$(DefaultItemExcludes);$(BaseIntermediateOutputPath)**</DefaultItemExcludes>
13 + <DefaultExcludesInProjectFolder>$(DefaultItemExcludesInProjectFolder);**/.*/**</DefaultExcludesInProjectFolder>
14 + </PropertyGroup>
15 +</Project>
src/WixToolset.MSBuild/WixToolset.MSBuild.csproj
+2
@@ -17,6 +17,8 @@
17 <Content Include="tools\wix.harvest.targets" CopyToOutputDirectory="PreserveNewest" />
18 <Content Include="tools\wix.signing.targets" CopyToOutputDirectory="PreserveNewest" />
19 <Content Include="tools\wix.targets" CopyToOutputDirectory="PreserveNewest" />
20 + <Content Include="Sdk\Sdk.props" CopyToOutputDirectory="PreserveNewest" />
21 + <Content Include="Sdk\Sdk.targets" CopyToOutputDirectory="PreserveNewest" />
22 </ItemGroup>
23
24 <ItemGroup>
src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec
+1
@@ -12,6 +12,7 @@
12
13 <files>
14 <file src="build\**\*" target="build" />
15 + <file src="Sdk\**\*" target="Sdk" />
16 <file src="tools\**\*" target="tools" />
17 </files>
18 </package>