From 4f732dd1b9dd8b1a13b1b0be4d18d4e8d10f106e Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 2 Oct 2018 15:25:13 -0700
Subject: Enable NCrunch support
---
Util.wixext.sln | 8 ++++----
src/Cpp.Build.props | 5 ++---
src/Directory.Build.props | 15 +++++++++++----
src/wixext/WixToolset.Util.wixext.csproj | 2 +-
src/wixext/WixToolset.Util.wixext.v3.ncrunchproject | 7 +++++++
src/wixlib/util.v3.ncrunchproject | 5 +++++
6 files changed, 30 insertions(+), 12 deletions(-)
create mode 100644 src/wixext/WixToolset.Util.wixext.v3.ncrunchproject
create mode 100644 src/wixlib/util.v3.ncrunchproject
diff --git a/Util.wixext.sln b/Util.wixext.sln
index e25aa4fd..39f5646c 100644
--- a/Util.wixext.sln
+++ b/Util.wixext.sln
@@ -22,6 +22,7 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|Any CPU.Build.0 = Debug|Win32
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x64.ActiveCfg = Debug|Win32
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.ActiveCfg = Debug|Win32
{076018F7-19BD-423A-ABBF-229273DA08D8}.Debug|x86.Build.0 = Debug|Win32
@@ -30,13 +31,12 @@ Global
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.ActiveCfg = Release|Win32
{076018F7-19BD-423A-ABBF-229273DA08D8}.Release|x86.Build.0 = Release|Win32
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.ActiveCfg = Debug|x86
- {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x64
- {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.Build.0 = Debug|x64
+ {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|Any CPU.Build.0 = Debug|x86
+ {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x64.ActiveCfg = Debug|x86
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.ActiveCfg = Debug|x86
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Debug|x86.Build.0 = Debug|x86
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|Any CPU.ActiveCfg = Release|x86
- {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x64
- {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.Build.0 = Release|x64
+ {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x64.ActiveCfg = Release|x86
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.ActiveCfg = Release|x86
{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}.Release|x86.Build.0 = Release|x86
{6CF033EB-0A39-4AC6-9D41-9BD506352045}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props
index 453aa442..296b36ca 100644
--- a/src/Cpp.Build.props
+++ b/src/Cpp.Build.props
@@ -3,9 +3,8 @@
<Project>
<PropertyGroup>
- <Platform Condition=" '$(Platform)' == 'AnyCPU' ">Win32</Platform>
- <BaseOutputPath>$(OutputPath)</BaseOutputPath>
- <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
+ <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
<OutDir>$(OutputPath)$(Platform)\</OutDir>
</PropertyGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 63ad5d6e..9eacf3f5 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,16 +1,23 @@
<?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. -->
-
+<!--
+ Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props
+ then update all of the repos.
+-->
<Project>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
- <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
+ <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
+
+ <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
+ <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
+ <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
+ <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
<Authors>WiX Toolset Team</Authors>
<Company>WiX Toolset</Company>
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+ <Product>WiX Toolset</Product>
</PropertyGroup>
<PropertyGroup>
diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj
index 553ae43a..e86a57c1 100644
--- a/src/wixext/WixToolset.Util.wixext.csproj
+++ b/src/wixext/WixToolset.Util.wixext.csproj
@@ -27,7 +27,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" />
+ <ProjectReference Include="..\wixlib\util.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
<ItemGroup>
diff --git a/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject b/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject
new file mode 100644
index 00000000..d75e7ab3
--- /dev/null
+++ b/src/wixext/WixToolset.Util.wixext.v3.ncrunchproject
@@ -0,0 +1,7 @@
+<ProjectConfiguration>
+ <Settings>
+ <AdditionalFilesToIncludeForProject>
+ <Value>..\..\build\Debug\util.wixlib</Value>
+ </AdditionalFilesToIncludeForProject>
+ </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/wixlib/util.v3.ncrunchproject b/src/wixlib/util.v3.ncrunchproject
new file mode 100644
index 00000000..319cd523
--- /dev/null
+++ b/src/wixlib/util.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+ <Settings>
+ <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
+ </Settings>
+</ProjectConfiguration>
\ No newline at end of file
--
cgit v1.2.3-55-g6feb