aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-18 16:54:06 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-18 23:51:27 -0600
commit2c1f4a40640536f52d7eff717980e9be7785672a (patch)
treefd50272226a937d30187b8aaf9d85038e70ed048 /src
parent730f9d2f8c62e282b6f0eba644fa5ac90a0a558f (diff)
downloadwix-2c1f4a40640536f52d7eff717980e9be7785672a.tar.gz
wix-2c1f4a40640536f52d7eff717980e9be7785672a.tar.bz2
wix-2c1f4a40640536f52d7eff717980e9be7785672a.zip
Enable XML doc, but disable warning since this is an internal project.
Diffstat (limited to 'src')
-rw-r--r--src/CSharp.Build.props2
-rw-r--r--src/Directory.Build.targets8
-rw-r--r--src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj2
-rw-r--r--src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj8
-rw-r--r--src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj2
5 files changed, 19 insertions, 3 deletions
diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props
index b12f4c6e..81d24ad1 100644
--- a/src/CSharp.Build.props
+++ b/src/CSharp.Build.props
@@ -5,7 +5,9 @@
5--> 5-->
6<Project> 6<Project>
7 <PropertyGroup> 7 <PropertyGroup>
8 <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
8 <SignAssembly>true</SignAssembly> 9 <SignAssembly>true</SignAssembly>
9 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile> 10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
10 </PropertyGroup> 12 </PropertyGroup>
11</Project> 13</Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index dac7452a..cb988931 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -10,6 +10,11 @@
10--> 10-->
11<Project> 11<Project>
12 <PropertyGroup> 12 <PropertyGroup>
13 <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 </PropertyGroup>
16
17 <PropertyGroup>
13 <ReplacePackageReferences>true</ReplacePackageReferences> 18 <ReplacePackageReferences>true</ReplacePackageReferences>
14 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath> 19 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
15 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath> 20 <TheSolutionPath Condition=" '$(NCrunch)'=='1' ">$(NCrunchOriginalSolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
45 50
46 </When> 51 </When>
47 </Choose> 52 </Choose>
53
54 <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
55 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
48</Project> 56</Project>
diff --git a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index 98cd46d9..954ffa59 100644
--- a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -4,8 +4,10 @@
4 <OutputType>Exe</OutputType> 4 <OutputType>Exe</OutputType>
5 <TargetFramework>net461</TargetFramework> 5 <TargetFramework>net461</TargetFramework>
6 <IsTool>true</IsTool> 6 <IsTool>true</IsTool>
7 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
7 <DebugType>embedded</DebugType> 8 <DebugType>embedded</DebugType>
8 <PublishRepositoryUrl>true</PublishRepositoryUrl> 9 <PublishRepositoryUrl>true</PublishRepositoryUrl>
10 <NoWarn>CS0618</NoWarn>
9 </PropertyGroup> 11 </PropertyGroup>
10 12
11 <ItemGroup> 13 <ItemGroup>
diff --git a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
index 859a9e22..f59e5eca 100644
--- a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
@@ -8,13 +8,15 @@
8 <IsPackable>true</IsPackable> 8 <IsPackable>true</IsPackable>
9 <DebugType>embedded</DebugType> 9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <CreateDocumentationFile>true</CreateDocumentationFile>
12 <NoWarn>CS1591</NoWarn>
11 </PropertyGroup> 13 </PropertyGroup>
12 14
13 <ItemGroup> 15 <ItemGroup>
14 <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" /> 16 <PackageReference Include="Microsoft.Build.Tasks.Core" Version="14.3" />
15 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" NoWarn="NU1701" /> 17 <PackageReference Include="WixToolset.Dtf.WindowsInstaller" Version="4.0.*" />
16 <PackageReference Include="WixToolset.Dtf.Compression" Version="4.0.*" NoWarn="NU1701" /> 18 <PackageReference Include="WixToolset.Dtf.Compression" Version="4.0.*" />
17 <PackageReference Include="WixToolset.Dtf.Compression.Cab" Version="4.0.*" NoWarn="NU1701" /> 19 <PackageReference Include="WixToolset.Dtf.Compression.Cab" Version="4.0.*" />
18 </ItemGroup> 20 </ItemGroup>
19 21
20 <ItemGroup> 22 <ItemGroup>
diff --git a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index c0c5d336..2e3a0382 100644
--- a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -6,8 +6,10 @@
6 <TargetFrameworks>net461</TargetFrameworks> 6 <TargetFrameworks>net461</TargetFrameworks>
7 <IsTool>true</IsTool> 7 <IsTool>true</IsTool>
8 <IncludeBuildOutput>false</IncludeBuildOutput> 8 <IncludeBuildOutput>false</IncludeBuildOutput>
9 <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
9 <DebugType>embedded</DebugType> 10 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl> 11 <PublishRepositoryUrl>true</PublishRepositoryUrl>
12 <NoWarn>CS0618</NoWarn>
11 </PropertyGroup> 13 </PropertyGroup>
12 14
13 <ItemGroup> 15 <ItemGroup>