@joebigelow / wix / commits / 6bc16431

Enable XML doc and run tests in appveyor.cmd.

Sean Hall committed Dec 19, 2020 at 00:04 UTC 6bc164316666addde26feeec2d521b797de50dbb
12 files changed +34 -16
appveyor.cmd
+3 -3
@@ -2,11 +2,11 @@
2 @pushd %~dp0
3 @set _P=%~dp0build\Release\publish
4
5 +dotnet test -c Release src\test\WixToolsetTest.Converters || exit /b
6 +dotnet test -c Release src\test\WixToolsetTest.Converters.Symbolizer || exit /b
7 +
8 dotnet pack -c Release src\WixToolset.Converters || exit /b
9 dotnet pack -c Release src\WixToolset.Converters.Symbolizer || exit /b
10
8 -dotnet build -c Release src\test\WixToolsetTest.Converters || exit /b
9 -dotnet build -c Release src\test\WixToolsetTest.Converters.Symbolizer || exit /b
10 -
11 @popd
12 @endlocal
appveyor.yml
+2
@@ -21,6 +21,8 @@ environment:
21 build_script:
22 - appveyor.cmd
23
24 +test: off
25 +
26 pull_requests:
27 do_not_increment_build_number: true
28
nuget.config
+1
@@ -2,6 +2,7 @@
2 <configuration>
3 <packageSources>
4 <clear />
5 + <add key="wixtoolset-burn" value="https://ci.appveyor.com/nuget/wixtoolset-burn" />
6 <add key="wixtoolset-core" value="https://ci.appveyor.com/nuget/wixtoolset-core" />
7 <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
8 <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
src/CSharp.Build.props
+2
@@ -5,7 +5,9 @@
5 -->
6 <Project>
7 <PropertyGroup>
8 + <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
9 <SignAssembly>true</SignAssembly>
10 <AssemblyOriginatorKeyFile>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk))</AssemblyOriginatorKeyFile>
11 + <NBGV_EmitThisAssemblyClass>false</NBGV_EmitThisAssemblyClass>
12 </PropertyGroup>
13 </Project>
src/Directory.Build.targets
+8
@@ -9,6 +9,11 @@
9 See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10 -->
11 <Project>
12 + <PropertyGroup>
13 + <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 + <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 + </PropertyGroup>
16 +
17 <PropertyGroup>
18 <ReplacePackageReferences>true</ReplacePackageReferences>
19 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,4 +50,7 @@
50
51 </When>
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') " />
56 </Project>
src/WixToolset.Converters.Symbolizer/ConvertSymbols.cs
+2
@@ -10,6 +10,7 @@ namespace WixToolset.Converters.Symbolizer
10 using WixToolset.Data.WindowsInstaller;
11 using Wix3 = Microsoft.Tools.WindowsInstallerXml;
12
13 +#pragma warning disable 1591 // TODO: add documentation
14 public static class ConvertSymbols
15 {
16 public static Intermediate ConvertFile(string path)
@@ -19,6 +20,7 @@ namespace WixToolset.Converters.Symbolizer
20 }
21
22 public static Intermediate ConvertOutput(Wix3.Output output)
23 +#pragma warning restore 1591
24 {
25 var section = new IntermediateSection(String.Empty, OutputType3ToSectionType4(output.Type), output.Codepage);
26
src/WixToolset.Converters.Symbolizer/WixToolset.Converters.Symbolizer.csproj
+1 -4
@@ -10,10 +10,7 @@
10 <Title>WiX Toolset Converters Tuplizer</Title>
11 <DebugType>embedded</DebugType>
12 <PublishRepositoryUrl>true</PublishRepositoryUrl>
13 - </PropertyGroup>
14 -
15 - <PropertyGroup>
16 - <NoWarn>NU1701</NoWarn>
13 + <CreateDocumentationFile>true</CreateDocumentationFile>
14 </PropertyGroup>
15
16 <ItemGroup>
src/WixToolset.Converters/FixupCommandBase.cs
+2
@@ -150,7 +150,9 @@ namespace WixToolset.Converters
150 /// <summary>
151 /// Inspect sub-directories.
152 /// </summary>
153 + /// <param name="inspector"></param>
154 /// <param name="directory">The directory whose sub-directories will be inspected.</param>
155 + /// <param name="cancellationToken"></param>
156 /// <returns>The number of errors that were found.</returns>
157 private int InspectSubDirectories(Func<string, bool, int> inspector, string directory, CancellationToken cancellationToken)
158 {
src/WixToolset.Converters/WixConverter.cs
+2 -1
@@ -17,7 +17,7 @@ namespace WixToolset.Converters
17 /// <summary>
18 /// WiX source code converter.
19 /// </summary>
20 - public class WixConverter
20 + public sealed class WixConverter
21 {
22 private enum ConvertOperation
23 {
@@ -134,6 +134,7 @@ namespace WixToolset.Converters
134 /// <summary>
135 /// Instantiate a new Converter class.
136 /// </summary>
137 + /// <param name="messaging"></param>
138 /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
139 /// <param name="errorsAsWarnings">Test errors to display as warnings.</param>
140 /// <param name="ignoreErrors">Test errors to ignore.</param>
src/WixToolset.Converters/WixToolset.Converters.csproj
+1 -4
@@ -10,10 +10,7 @@
10 <Title>WiX Toolset Converters</Title>
11 <DebugType>embedded</DebugType>
12 <PublishRepositoryUrl>true</PublishRepositoryUrl>
13 - </PropertyGroup>
14 -
15 - <PropertyGroup>
16 - <NoWarn>NU1701</NoWarn>
13 + <CreateDocumentationFile>true</CreateDocumentationFile>
14 </PropertyGroup>
15
16 <ItemGroup>
src/WixToolset.Converters/WixToolsetCoreServiceProviderExtensions.cs
+8
@@ -4,8 +4,16 @@ namespace WixToolset.Converters
4 {
5 using WixToolset.Extensibility.Services;
6
7 + /// <summary>
8 + /// Extension methods for adding Converters services.
9 + /// </summary>
10 public static class WixToolsetCoreServiceProviderExtensions
11 {
12 + /// <summary>
13 + /// Adds Converters services.
14 + /// </summary>
15 + /// <param name="coreProvider"></param>
16 + /// <returns></returns>
17 public static IWixToolsetCoreServiceProvider AddConverter(this IWixToolsetCoreServiceProvider coreProvider)
18 {
19 var extensionManager = coreProvider.GetService<IExtensionManager>();
src/test/WixToolsetTest.Converters/WixToolsetTest.Converters.csproj
+2 -4
@@ -7,10 +7,6 @@
7 <IsPackable>false</IsPackable>
8 </PropertyGroup>
9
10 - <PropertyGroup>
11 - <NoWarn>NU1701</NoWarn>
12 - </PropertyGroup>
13 -
10 <ItemGroup>
11 <Content Include="TestData\PermissionEx\v3.wxs" CopyToOutputDirectory="PreserveNewest" />
12 <Content Include="TestData\PermissionEx\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" />
@@ -34,7 +30,9 @@
30 <ItemGroup>
31 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" />
32 <PackageReference Include="WixToolset.Core" Version="4.0.*" />
33 + <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
34 <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
35 + <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
36 </ItemGroup>
37
38 <ItemGroup>