Enable NCrunch support
Rob Mensching committed
Oct 2, 2018 at 15:25 UTC
39191332831f49cd03b688793842dfd2d2e2a0ad
6 files changed
+30
-12
VisualStudio.wixext.sln
+4
-4
@@ -22,6 +22,7 @@ Global
22
EndGlobalSection
23
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|Any CPU.ActiveCfg = Debug|Win32
25
+ {45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|Any CPU.Build.0 = Debug|Win32
26
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x64.ActiveCfg = Debug|Win32
27
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.ActiveCfg = Debug|Win32
28
{45308B85-0628-4978-8FC8-6AD9E1AD5949}.Debug|x86.Build.0 = Debug|Win32
@@ -42,13 +43,12 @@ Global
43
{61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.ActiveCfg = Release|Any CPU
44
{61BFD377-9DE1-48B4-8687-560DF68D6F3B}.Release|x86.Build.0 = Release|Any CPU
45
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.ActiveCfg = Debug|x86
45
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x64
46
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.Build.0 = Debug|x64
46
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|Any CPU.Build.0 = Debug|x86
47
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x64.ActiveCfg = Debug|x86
48
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.ActiveCfg = Debug|x86
49
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Debug|x86.Build.0 = Debug|x86
50
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|Any CPU.ActiveCfg = Release|x86
50
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x64
51
- {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.Build.0 = Release|x64
51
+ {14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x64.ActiveCfg = Release|x86
52
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.ActiveCfg = Release|x86
53
{14345C9D-8AF8-435A-BB1B-E067CE7EB321}.Release|x86.Build.0 = Release|x86
54
{DD2BD0F7-1E4A-4D11-954C-3505323C4E1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
src/Cpp.Build.props
+2
-3
@@ -3,9 +3,8 @@
3
4
<Project>
5
<PropertyGroup>
6
- <Platform Condition=" '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7
- <BaseOutputPath>$(OutputPath)</BaseOutputPath>
8
- <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir>
6
+ <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform>
7
+ <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir>
8
<OutDir>$(OutputPath)$(Platform)\</OutDir>
9
</PropertyGroup>
10
src/Directory.Build.props
+11
-4
@@ -1,16 +1,23 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<!-- 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. -->
3
-
3
+<!--
4
+ Do NOT modify this file. Update the canonical version in Home\src\Directory.Build.props
5
+ then update all of the repos.
6
+-->
7
<Project>
8
<PropertyGroup>
9
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
7
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8
- <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
9
- <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
10
+ <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
+
12
+ <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
13
+ <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath>
14
+ <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath>
15
+ <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
16
17
<Authors>WiX Toolset Team</Authors>
18
<Company>WiX Toolset</Company>
19
<Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
20
+ <Product>WiX Toolset</Product>
21
</PropertyGroup>
22
23
<PropertyGroup>
src/wixext/WixToolset.VisualStudio.wixext.csproj
+1
-1
@@ -25,7 +25,7 @@
25
</ItemGroup>
26
27
<ItemGroup>
28
- <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" />
28
+ <ProjectReference Include="..\wixlib\vs.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
29
</ItemGroup>
30
31
<ItemGroup>
src/wixext/WixToolset.VisualStudio.wixext.v3.ncrunchproject
new
+7
@@ -0,0 +1,7 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <AdditionalFilesToIncludeForProject>
4
+ <Value>..\..\build\Debug\vs.wixlib</Value>
5
+ </AdditionalFilesToIncludeForProject>
6
+ </Settings>
7
+</ProjectConfiguration>
\ No newline at end of file
src/wixlib/vs.v3.ncrunchproject
new
+5
@@ -0,0 +1,5 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely>
4
+ </Settings>
5
+</ProjectConfiguration>
\ No newline at end of file