Enable XML doc and run tests in appveyor.cmd.

This commit is contained in:
Sean Hall 2020-12-19 00:04:24 -06:00
Родитель 7378de4301
Коммит 6bc1643166
12 изменённых файлов: 34 добавлений и 16 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -21,6 +21,8 @@ environment:
build_script:
- appveyor.cmd
test: off
pull_requests:
do_not_increment_build_number: true

Просмотреть файл

@ -2,6 +2,7 @@
<configuration>
<packageSources>
<clear />
<add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
<add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
<add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
<add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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);

Просмотреть файл

@ -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>

Просмотреть файл

@ -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)
{

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>

Просмотреть файл

@ -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>();

Просмотреть файл

@ -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>