diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-08-11 01:04:30 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-10-03 10:33:24 -0700 |
| commit | ead6d68c71b88f309f75c66c1632f8e7d5ce3954 (patch) | |
| tree | 4d8bd0a881ea941f50c083158788da78aaeca973 | |
| parent | 0459e7204648c6915f9ee89bd6e292d506a505fd (diff) | |
| download | wix-ead6d68c71b88f309f75c66c1632f8e7d5ce3954.tar.gz wix-ead6d68c71b88f309f75c66c1632f8e7d5ce3954.tar.bz2 wix-ead6d68c71b88f309f75c66c1632f8e7d5ce3954.zip | |
Enable NCrunch support
| -rw-r--r-- | WixToolset.Data.v3.ncrunchsolution | 6 | ||||
| -rw-r--r-- | src/Directory.Build.props | 15 |
2 files changed, 17 insertions, 4 deletions
diff --git a/WixToolset.Data.v3.ncrunchsolution b/WixToolset.Data.v3.ncrunchsolution new file mode 100644 index 00000000..10420ac9 --- /dev/null +++ b/WixToolset.Data.v3.ncrunchsolution | |||
| @@ -0,0 +1,6 @@ | |||
| 1 | <SolutionConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <AllowParallelTestExecution>True</AllowParallelTestExecution> | ||
| 4 | <SolutionConfigured>True</SolutionConfigured> | ||
| 5 | </Settings> | ||
| 6 | </SolutionConfiguration> \ No newline at end of file | ||
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7cd6767f..9eacf3f5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -1,12 +1,18 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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 | --> | ||
| 4 | <Project> | 7 | <Project> |
| 5 | <PropertyGroup> | 8 | <PropertyGroup> |
| 6 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 7 | <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 8 | <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</BaseOutputPath> | 11 | |
| 9 | <OutputPath>$(BaseOutputPath)</OutputPath> | 12 | <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName> |
| 13 | <BaseOutputPath>$(MSBuildThisFileDirectory)..\build\</BaseOutputPath> | ||
| 14 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(ProjectName)\</BaseIntermediateOutputPath> | ||
| 15 | <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath> | ||
| 10 | 16 | ||
| 11 | <Authors>WiX Toolset Team</Authors> | 17 | <Authors>WiX Toolset Team</Authors> |
| 12 | <Company>WiX Toolset</Company> | 18 | <Company>WiX Toolset</Company> |
| @@ -18,5 +24,6 @@ | |||
| 18 | <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> | 24 | <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder> |
| 19 | </PropertyGroup> | 25 | </PropertyGroup> |
| 20 | 26 | ||
| 27 | <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> | ||
| 21 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> | 28 | <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " /> |
| 22 | </Project> | 29 | </Project> |