@joebigelow / wix-1 / commits / b347a4e7

Enable NCrunch support

Rob Mensching committed Oct 2, 2018 at 10:39 UTC b347a4e7361abae191e83f4f5dd82e0c97c984e5
5 files changed +32 -8
WixBuildTools.v3.ncrunchsolution new
+6
@@ -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
src/Directory.Build.props
+20 -3
@@ -1,12 +1,29 @@
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 +<!--
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>
5 - <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
6 - <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath>
10 + <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>
11
8 - <Authors>Rob Mensching, Bob Arnson</Authors>
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>
24 + <WixToolsetRootFolder>$(MSBuildThisFileDirectory)..\..\</WixToolsetRootFolder>
25 + </PropertyGroup>
26 +
27 + <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
28 + <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
29 </Project>
src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+2 -2
@@ -18,8 +18,8 @@
18 </ItemGroup>
19
20 <ItemGroup>
21 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
22 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
22 + <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
23 </ItemGroup>
24
25 </Project>
src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+1 -1
@@ -17,7 +17,7 @@
17
18 <ItemGroup>
19 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
20 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
20 + <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
21 </ItemGroup>
22
23 <ItemGroup>
src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+3 -2
@@ -19,7 +19,8 @@
19 </ItemGroup>
20
21 <ItemGroup>
22 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
23 - <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
22 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
23 + <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
24 </ItemGroup>
25 +
26 </Project>