From 39191332831f49cd03b688793842dfd2d2e2a0ad Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 2 Oct 2018 15:25:09 -0700
Subject: Enable NCrunch support
---
VisualStudio.wixext.sln | 8 ++++----
src/Cpp.Build.props | 5 ++---
src/Directory.Build.props | 15 +++++++++++----
src/wixext/WixToolset.VisualStudio.wixext.csproj | 2 +-
.../WixToolset.VisualStudio.wixext.v3.ncrunchproject | 7 +++++++
src/wixlib/vs.v3.ncrunchproject | 5 +++++
6 files changed, 30 insertions(+), 12 deletions(-)
create mode 100644 src/wixext/WixToolset.VisualStudio.wixext.v3.ncrunchproject
create mode 100644 src/wixlib/vs.v3.ncrunchproject
diff --git a/VisualStudio.wixext.sln b/VisualStudio.wixext.sln
index d787afa2..30cdb4a3 100644
--- a/VisualStudio.wixext.sln
+++ b/VisualStudio.wixext.sln
@@ -22,6 +22,7 @@ Global
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|Any CPU.Build.0 = Debug|Win32
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x64.ActiveCfg = Debug|Win32
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.Build.0 = Debug|Win32
@@ -42,13 +43,12 @@ Global
{61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU
{61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.Build.0 = Release|Any CPU
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.ActiveCfg = Debug|x86
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x64
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.Build.0 = Debug|x64
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.Build.0 = Debug|x86
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x86
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.ActiveCfg = Debug|x86
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.Build.0 = Debug|x86
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.ActiveCfg = Release|x86
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x64
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.Build.0 = Release|x64
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x86
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.ActiveCfg = Release|x86
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.Build.0 = Release|x86
{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.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.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj
index a7702183..3131b64c 100644
--- a/src/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" />
+ <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
</ItemGroup>
<ItemGroup>
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.v3.ncrunchproject b/src/wixext/WixToolset.VisualStudio.wixext.v3.ncrunchproject
new file mode 100644
index 00000000..56556a9f
--- /dev/null
+++ b/src/wixext/WixToolset.VisualStudio.wixext.v3.ncrunchproject
@@ -0,0 +1,7 @@
+<ProjectConfiguration>
+ <Settings>
+ <AdditionalFilesToIncludeForProject>
+ <Value>..\..\build\Debug\vs.wixlib</Value>
+ </AdditionalFilesToIncludeForProject>
+ </Settings>
+</ProjectConfiguration>
\ No newline at end of file
diff --git a/src/wixlib/vs.v3.ncrunchproject b/src/wixlib/vs.v3.ncrunchproject
new file mode 100644
index 00000000..319cd523
--- /dev/null
+++ b/src/wixlib/vs.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