From 6bc164316666addde26feeec2d521b797de50dbb Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Sat, 19 Dec 2020 00:04:24 -0600
Subject: Enable XML doc and run tests in appveyor.cmd.

---
 src/CSharp.Build.props                                            | 2 ++
 src/Directory.Build.targets                                       | 8 ++++++++
 src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs            | 2 ++
 .../WixToolset.Converters.Symbolizer.csproj                       | 5 +----
 src/WixToolset.Converters/FixupCommandBase.cs                     | 2 ++
 src/WixToolset.Converters/WixConverter.cs                         | 3 ++-
 src/WixToolset.Converters/WixToolset.Converters.csproj            | 5 +----
 .../WixToolsetCoreServiceProviderExtensions.cs                    | 8 ++++++++
 .../WixToolsetTest.Converters/WixToolsetTest.Converters.csproj    | 6 ++----
 9 files changed, 28 insertions(+), 13 deletions(-)

(limited to 'src')

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 @@
 -->
 <Project>
   <PropertyGroup>
+    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
+    <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
   </PropertyGroup>
 </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
@@ -9,6 +9,11 @@
   See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
 -->
 <Project>
+  <PropertyGroup>
+    <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
+    <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ReplacePackageReferences>true</ReplacePackageReferences>
     <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
 
     </When>
   </Choose>
+
+  <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
+  <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
 </Project>
diff --git a/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs b/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
index 4fb891f9..92e247e5 100644
--- a/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
+++ b/src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
@@ -10,6 +10,7 @@ namespace WixToolset.Converters.Symbolizer
     using WixToolset.Data.WindowsInstaller;
     using Wix3 = Microsoft.Tools.WindowsInstallerXml;
 
+#pragma warning disable 1591 // TODO: add documentation
     public static class ConvertSymbols
     {
         public static Intermediate ConvertFile(string path)
@@ -19,6 +20,7 @@ namespace WixToolset.Converters.Symbolizer
         }
 
         public static Intermediate ConvertOutput(Wix3.Output output)
+#pragma warning restore 1591
         {
             var section = new IntermediateSection(String.Empty, OutputType3ToSectionType4(output.Type), output.Codepage);
 
diff --git a/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj b/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
index 1d4f09dd..445c3500 100644
--- a/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+++ b/src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
@@ -10,10 +10,7 @@
     <Title>WiX Toolset Converters Tuplizer</Title>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Converters/FixupCommandBase.cs b/src/WixToolset.Converters/FixupCommandBase.cs
index 14edf97b..51256f5c 100644
--- a/src/WixToolset.Converters/FixupCommandBase.cs
+++ b/src/WixToolset.Converters/FixupCommandBase.cs
@@ -150,7 +150,9 @@ namespace WixToolset.Converters
         /// <summary>
         /// Inspect sub-directories.
         /// </summary>
+        /// <param name="inspector"></param>
         /// <param name="directory">The directory whose sub-directories will be inspected.</param>
+        /// <param name="cancellationToken"></param>
         /// <returns>The number of errors that were found.</returns>
         private int InspectSubDirectories(Func<string, bool, int> inspector, string directory, CancellationToken cancellationToken)
         {
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index ecd8b4e8..d0c40050 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -17,7 +17,7 @@ namespace WixToolset.Converters
     /// <summary>
     /// WiX source code converter.
     /// </summary>
-    public class WixConverter
+    public sealed class WixConverter
     {
         private enum ConvertOperation
         {
@@ -134,6 +134,7 @@ namespace WixToolset.Converters
         /// <summary>
         /// Instantiate a new Converter class.
         /// </summary>
+        /// <param name="messaging"></param>
         /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
         /// <param name="errorsAsWarnings">Test errors to display as warnings.</param>
         /// <param name="ignoreErrors">Test errors to ignore.</param>
diff --git a/src/WixToolset.Converters/WixToolset.Converters.csproj b/src/WixToolset.Converters/WixToolset.Converters.csproj
index 46eb54ea..7dddefa5 100644
--- a/src/WixToolset.Converters/WixToolset.Converters.csproj
+++ b/src/WixToolset.Converters/WixToolset.Converters.csproj
@@ -10,10 +10,7 @@
     <Title>WiX Toolset Converters</Title>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
+    <CreateDocumentationFile>true</CreateDocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs b/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
index c5b7a27d..084d3b92 100644
--- a/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
+++ b/src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
@@ -4,8 +4,16 @@ namespace WixToolset.Converters
 {
     using WixToolset.Extensibility.Services;
 
+    /// <summary>
+    /// Extension methods for adding Converters services.
+    /// </summary>
     public static class WixToolsetCoreServiceProviderExtensions
     {
+        /// <summary>
+        /// Adds Converters services.
+        /// </summary>
+        /// <param name="coreProvider"></param>
+        /// <returns></returns>
         public static IWixToolsetCoreServiceProvider AddConverter(this IWixToolsetCoreServiceProvider coreProvider)
         {
             var extensionManager = coreProvider.GetService<IExtensionManager>();
diff --git a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
index b09b5418..1bf44dbc 100644
--- a/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+++ b/src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
@@ -7,10 +7,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <NoWarn>NU1701</NoWarn>
-  </PropertyGroup>
-
   <ItemGroup>
     <Content Include="TestData\PermissionEx\v3.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\PermissionEx\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" />
@@ -34,7 +30,9 @@
   <ItemGroup>
     <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
     <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
+    <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
   </ItemGroup>
 
   <ItemGroup>
-- 
cgit v1.2.3-55-g6feb