diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-10-02 15:25:22 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-10-03 22:39:45 -0700 |
| commit | 2116d017c9dd7757c2eb3a201673b22c366d2541 (patch) | |
| tree | 82139a8071f0909ef36d27ed1dc99c35253dd2de /src | |
| parent | 6d4851fe2646a8f13fe04cb005a1ff13de26247c (diff) | |
| download | wix-2116d017c9dd7757c2eb3a201673b22c366d2541.tar.gz wix-2116d017c9dd7757c2eb3a201673b22c366d2541.tar.bz2 wix-2116d017c9dd7757c2eb3a201673b22c366d2541.zip | |
Enable NCrunch support
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cpp.Build.props | 5 | ||||
| -rw-r--r-- | src/Directory.Build.props | 15 | ||||
| -rw-r--r-- | src/ca/fwca.v3.ncrunchproject | 5 | ||||
| -rw-r--r-- | src/wixext/WixToolset.Firewall.wixext.csproj | 2 | ||||
| -rw-r--r-- | src/wixlib/firewall.v3.ncrunchproject | 5 |
5 files changed, 24 insertions, 8 deletions
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 @@ | |||
| 3 | 3 | ||
| 4 | <Project> | 4 | <Project> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <Platform Condition=" '$(Platform)' == 'AnyCPU' ">Win32</Platform> | 6 | <Platform Condition=" '$(Platform)' == '' OR '$(Platform)' == 'AnyCPU' ">Win32</Platform> |
| 7 | <BaseOutputPath>$(OutputPath)</BaseOutputPath> | 7 | <IntDir>$(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\</IntDir> |
| 8 | <IntDir>$(BaseIntermediateOutputPath)$(Platform)\</IntDir> | ||
| 9 | <OutDir>$(OutputPath)$(Platform)\</OutDir> | 8 | <OutDir>$(OutputPath)$(Platform)\</OutDir> |
| 10 | </PropertyGroup> | 9 | </PropertyGroup> |
| 11 | 10 | ||
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 @@ | |||
| 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 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 8 | <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | 11 | |
| 9 | <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</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> |
| 13 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> | 19 | <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright> |
| 20 | <Product>WiX Toolset</Product> | ||
| 14 | </PropertyGroup> | 21 | </PropertyGroup> |
| 15 | 22 | ||
| 16 | <PropertyGroup> | 23 | <PropertyGroup> |
diff --git a/src/ca/fwca.v3.ncrunchproject b/src/ca/fwca.v3.ncrunchproject new file mode 100644 index 00000000..319cd523 --- /dev/null +++ b/src/ca/fwca.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||
diff --git a/src/wixext/WixToolset.Firewall.wixext.csproj b/src/wixext/WixToolset.Firewall.wixext.csproj index 95bedb45..9982a551 100644 --- a/src/wixext/WixToolset.Firewall.wixext.csproj +++ b/src/wixext/WixToolset.Firewall.wixext.csproj | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | </ItemGroup> | 27 | </ItemGroup> |
| 28 | 28 | ||
| 29 | <ItemGroup> | 29 | <ItemGroup> |
| 30 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" /> | 30 | <ProjectReference Include="..\wixlib\firewall.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " /> |
| 31 | </ItemGroup> | 31 | </ItemGroup> |
| 32 | 32 | ||
| 33 | <ItemGroup> | 33 | <ItemGroup> |
diff --git a/src/wixlib/firewall.v3.ncrunchproject b/src/wixlib/firewall.v3.ncrunchproject new file mode 100644 index 00000000..319cd523 --- /dev/null +++ b/src/wixlib/firewall.v3.ncrunchproject | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | <ProjectConfiguration> | ||
| 2 | <Settings> | ||
| 3 | <IgnoreThisComponentCompletely>True</IgnoreThisComponentCompletely> | ||
| 4 | </Settings> | ||
| 5 | </ProjectConfiguration> \ No newline at end of file | ||