From 6bc164316666addde26feeec2d521b797de50dbb Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 19 Dec 2020 00:04:24 -0600 Subject: Enable XML doc and run tests in appveyor.cmd. --- appveyor.cmd | 6 +++--- appveyor.yml | 2 ++ nuget.config | 1 + 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 ++---- 12 files changed, 34 insertions(+), 16 deletions(-) diff --git a/appveyor.cmd b/appveyor.cmd index 1b0040a3..27d5eaec 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -2,11 +2,11 @@ @pushd %~dp0 @set _P=%~dp0build\Release\publish +dotnet test -c Release src\test\WixToolsetTest.Converters || exit /b +dotnet test -c Release src\test\WixToolsetTest.Converters.Symbolizer || exit /b + dotnet pack -c Release src\WixToolset.Converters || exit /b dotnet pack -c Release src\WixToolset.Converters.Symbolizer || exit /b -dotnet build -c Release src\test\WixToolsetTest.Converters || exit /b -dotnet build -c Release src\test\WixToolsetTest.Converters.Symbolizer || exit /b - @popd @endlocal diff --git a/appveyor.yml b/appveyor.yml index 522e5af3..f602d07c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,6 +21,8 @@ environment: build_script: - appveyor.cmd +test: off + pull_requests: do_not_increment_build_number: true diff --git a/nuget.config b/nuget.config index e8a0cc92..31435a21 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,7 @@ + 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 @@ --> + true true $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false 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 --> + + false + $(OutputPath)\$(AssemblyName).xml + + true $(SolutionPath) @@ -45,4 +50,7 @@ + + + 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 @@ WiX Toolset Converters Tuplizer embedded true - - - - NU1701 + true 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 /// /// Inspect sub-directories. /// + /// /// The directory whose sub-directories will be inspected. + /// /// The number of errors that were found. private int InspectSubDirectories(Func 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 /// /// WiX source code converter. /// - public class WixConverter + public sealed class WixConverter { private enum ConvertOperation { @@ -134,6 +134,7 @@ namespace WixToolset.Converters /// /// Instantiate a new Converter class. /// + /// /// Indentation value to use when validating leading whitespace. /// Test errors to display as warnings. /// Test errors to ignore. 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 @@ WiX Toolset Converters embedded true - - - - NU1701 + true 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; + /// + /// Extension methods for adding Converters services. + /// public static class WixToolsetCoreServiceProviderExtensions { + /// + /// Adds Converters services. + /// + /// + /// public static IWixToolsetCoreServiceProvider AddConverter(this IWixToolsetCoreServiceProvider coreProvider) { var extensionManager = coreProvider.GetService(); 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 @@ false - - NU1701 - - @@ -34,7 +30,9 @@ + + -- cgit v1.2.3-55-g6feb