diff options
Diffstat (limited to 'src')
9 files changed, 28 insertions, 13 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/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 | |||
| 10 | using WixToolset.Data.WindowsInstaller; | 10 | using WixToolset.Data.WindowsInstaller; |
| 11 | using Wix3 = Microsoft.Tools.WindowsInstallerXml; | 11 | using Wix3 = Microsoft.Tools.WindowsInstallerXml; |
| 12 | 12 | ||
| 13 | #pragma warning disable 1591 // TODO: add documentation | ||
| 13 | public static class ConvertSymbols | 14 | public static class ConvertSymbols |
| 14 | { | 15 | { |
| 15 | public static Intermediate ConvertFile(string path) | 16 | public static Intermediate ConvertFile(string path) |
| @@ -19,6 +20,7 @@ namespace WixToolset.Converters.Symbolizer | |||
| 19 | } | 20 | } |
| 20 | 21 | ||
| 21 | public static Intermediate ConvertOutput(Wix3.Output output) | 22 | public static Intermediate ConvertOutput(Wix3.Output output) |
| 23 | #pragma warning restore 1591 | ||
| 22 | { | 24 | { |
| 23 | var section = new IntermediateSection(String.Empty, OutputType3ToSectionType4(output.Type), output.Codepage); | 25 | var section = new IntermediateSection(String.Empty, OutputType3ToSectionType4(output.Type), output.Codepage); |
| 24 | 26 | ||
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 @@ | |||
| 10 | <Title>WiX Toolset Converters Tuplizer</Title> | 10 | <Title>WiX Toolset Converters Tuplizer</Title> |
| 11 | <DebugType>embedded</DebugType> | 11 | <DebugType>embedded</DebugType> |
| 12 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 12 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 13 | </PropertyGroup> | 13 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <NoWarn>NU1701</NoWarn> | ||
| 17 | </PropertyGroup> | 14 | </PropertyGroup> |
| 18 | 15 | ||
| 19 | <ItemGroup> | 16 | <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 | |||
| 150 | /// <summary> | 150 | /// <summary> |
| 151 | /// Inspect sub-directories. | 151 | /// Inspect sub-directories. |
| 152 | /// </summary> | 152 | /// </summary> |
| 153 | /// <param name="inspector"></param> | ||
| 153 | /// <param name="directory">The directory whose sub-directories will be inspected.</param> | 154 | /// <param name="directory">The directory whose sub-directories will be inspected.</param> |
| 155 | /// <param name="cancellationToken"></param> | ||
| 154 | /// <returns>The number of errors that were found.</returns> | 156 | /// <returns>The number of errors that were found.</returns> |
| 155 | private int InspectSubDirectories(Func<string, bool, int> inspector, string directory, CancellationToken cancellationToken) | 157 | private int InspectSubDirectories(Func<string, bool, int> inspector, string directory, CancellationToken cancellationToken) |
| 156 | { | 158 | { |
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 | |||
| 17 | /// <summary> | 17 | /// <summary> |
| 18 | /// WiX source code converter. | 18 | /// WiX source code converter. |
| 19 | /// </summary> | 19 | /// </summary> |
| 20 | public class WixConverter | 20 | public sealed class WixConverter |
| 21 | { | 21 | { |
| 22 | private enum ConvertOperation | 22 | private enum ConvertOperation |
| 23 | { | 23 | { |
| @@ -134,6 +134,7 @@ namespace WixToolset.Converters | |||
| 134 | /// <summary> | 134 | /// <summary> |
| 135 | /// Instantiate a new Converter class. | 135 | /// Instantiate a new Converter class. |
| 136 | /// </summary> | 136 | /// </summary> |
| 137 | /// <param name="messaging"></param> | ||
| 137 | /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param> | 138 | /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param> |
| 138 | /// <param name="errorsAsWarnings">Test errors to display as warnings.</param> | 139 | /// <param name="errorsAsWarnings">Test errors to display as warnings.</param> |
| 139 | /// <param name="ignoreErrors">Test errors to ignore.</param> | 140 | /// <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 @@ | |||
| 10 | <Title>WiX Toolset Converters</Title> | 10 | <Title>WiX Toolset Converters</Title> |
| 11 | <DebugType>embedded</DebugType> | 11 | <DebugType>embedded</DebugType> |
| 12 | <PublishRepositoryUrl>true</PublishRepositoryUrl> | 12 | <PublishRepositoryUrl>true</PublishRepositoryUrl> |
| 13 | </PropertyGroup> | 13 | <CreateDocumentationFile>true</CreateDocumentationFile> |
| 14 | |||
| 15 | <PropertyGroup> | ||
| 16 | <NoWarn>NU1701</NoWarn> | ||
| 17 | </PropertyGroup> | 14 | </PropertyGroup> |
| 18 | 15 | ||
| 19 | <ItemGroup> | 16 | <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 | |||
| 4 | { | 4 | { |
| 5 | using WixToolset.Extensibility.Services; | 5 | using WixToolset.Extensibility.Services; |
| 6 | 6 | ||
| 7 | /// <summary> | ||
| 8 | /// Extension methods for adding Converters services. | ||
| 9 | /// </summary> | ||
| 7 | public static class WixToolsetCoreServiceProviderExtensions | 10 | public static class WixToolsetCoreServiceProviderExtensions |
| 8 | { | 11 | { |
| 12 | /// <summary> | ||
| 13 | /// Adds Converters services. | ||
| 14 | /// </summary> | ||
| 15 | /// <param name="coreProvider"></param> | ||
| 16 | /// <returns></returns> | ||
| 9 | public static IWixToolsetCoreServiceProvider AddConverter(this IWixToolsetCoreServiceProvider coreProvider) | 17 | public static IWixToolsetCoreServiceProvider AddConverter(this IWixToolsetCoreServiceProvider coreProvider) |
| 10 | { | 18 | { |
| 11 | var extensionManager = coreProvider.GetService<IExtensionManager>(); | 19 | 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 @@ | |||
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| 10 | <PropertyGroup> | ||
| 11 | <NoWarn>NU1701</NoWarn> | ||
| 12 | </PropertyGroup> | ||
| 13 | |||
| 14 | <ItemGroup> | 10 | <ItemGroup> |
| 15 | <Content Include="TestData\PermissionEx\v3.wxs" CopyToOutputDirectory="PreserveNewest" /> | 11 | <Content Include="TestData\PermissionEx\v3.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| 16 | <Content Include="TestData\PermissionEx\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" /> | 12 | <Content Include="TestData\PermissionEx\v4_expected.wxs" CopyToOutputDirectory="PreserveNewest" /> |
| @@ -34,7 +30,9 @@ | |||
| 34 | <ItemGroup> | 30 | <ItemGroup> |
| 35 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 31 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> |
| 36 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 32 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 33 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 37 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | 34 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> |
| 35 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 38 | </ItemGroup> | 36 | </ItemGroup> |
| 39 | 37 | ||
| 40 | <ItemGroup> | 38 | <ItemGroup> |
