diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-10-02 10:39:58 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-10-03 10:33:19 -0700 |
| commit | b347a4e7361abae191e83f4f5dd82e0c97c984e5 (patch) | |
| tree | 6f301deee4323b47798addc99a4b981a74e77c99 /src | |
| parent | a076dd488c3daa82fd3326cfd01d8d1183d2cc02 (diff) | |
| download | wix-b347a4e7361abae191e83f4f5dd82e0c97c984e5.tar.gz wix-b347a4e7361abae191e83f4f5dd82e0c97c984e5.tar.bz2 wix-b347a4e7361abae191e83f4f5dd82e0c97c984e5.zip | |
Enable NCrunch support
Diffstat (limited to 'src')
| -rw-r--r-- | src/Directory.Build.props | 23 | ||||
| -rw-r--r-- | src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj | 4 | ||||
| -rw-r--r-- | src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | 2 | ||||
| -rw-r--r-- | src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj | 5 |
4 files changed, 26 insertions, 8 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 0f9c550d..9eacf3f5 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props | |||
| @@ -1,12 +1,29 @@ | |||
| 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. --> | ||
| 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 | --> | ||
| 2 | <Project> | 7 | <Project> |
| 3 | <PropertyGroup> | 8 | <PropertyGroup> |
| 4 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 9 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
| 5 | <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\build\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath> | 10 | <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink> |
| 6 | <OutputPath>$(MSBuildThisFileDirectory)..\build\$(Configuration)\</OutputPath> | ||
| 7 | 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> | ||
| 9 | <Company>WiX Toolset</Company> | 18 | <Company>WiX Toolset</Company> |
| 10 | <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> | ||
| 11 | </PropertyGroup> | 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') " /> | ||
| 12 | </Project> | 29 | </Project> |
diff --git a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj index b73b05b5..b0954998 100644 --- a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj +++ b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | 19 | ||
| 20 | <ItemGroup> | 20 | <ItemGroup> |
| 21 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" 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" /> | 22 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | </Project> | 25 | </Project> |
diff --git a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj index 01f733ba..bfee2da9 100644 --- a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj +++ b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" /> | 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> | 21 | </ItemGroup> |
| 22 | 22 | ||
| 23 | <ItemGroup> | 23 | <ItemGroup> |
diff --git a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj index c73fb703..d4c26dee 100644 --- a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj +++ b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj | |||
| @@ -19,7 +19,8 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" 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" /> | 23 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> |
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | |||
| 25 | </Project> | 26 | </Project> |