From 8296f237c69743d3e6cbdc58fc07e8470562b92e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 18 Dec 2020 18:12:45 -0600 Subject: Enable XML doc. --- src/CSharp.Build.props | 1 + src/Directory.Build.targets | 8 ++++++++ src/WixToolset.Core.Native/CabInterop.cs | 4 +++- src/WixToolset.Core.Native/Cabinet.cs | 10 ++++++++-- src/WixToolset.Core.Native/MSIFILEHASHINFO.cs | 15 +++++++++++++++ src/WixToolset.Core.Native/MsmInterop.cs | 3 +++ src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 6 +++++- src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 1 + src/winterop/packages.config | 4 ++-- src/winterop/winterop.vcxproj | 8 ++++---- src/wixnative/packages.config | 4 ++-- src/wixnative/wixnative.vcxproj | 8 ++++---- 12 files changed, 56 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props index bcd47a0c..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/CSharp.Build.props @@ -8,5 +8,6 @@ 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.Core.Native/CabInterop.cs b/src/WixToolset.Core.Native/CabInterop.cs index 4c1eb93d..69781047 100644 --- a/src/WixToolset.Core.Native/CabInterop.cs +++ b/src/WixToolset.Core.Native/CabInterop.cs @@ -29,6 +29,7 @@ namespace WixToolset.Core.Native /// /// Full path to file to add to cabinet. /// Name of file in cabinet. + /// /// Handle to open cabinet. [DllImport("winterop.dll", EntryPoint = "CreateCabAddFile", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] public static extern void CreateCabAddFile(string file, string token, MSIFILEHASHINFO fileHash, IntPtr contextHandle); @@ -101,7 +102,8 @@ namespace WixToolset.Core.Native /// to be exposed by .NET Frameowkr. /// /// Pointer to a CERT_CONTEXT struct with public key information to hash. - /// Number of file paths in array. + /// + /// [DllImport("winterop.dll", EntryPoint = "HashPublicKeyInfo", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] public static extern void HashPublicKeyInfo(IntPtr certContext, byte[] publicKeyInfoHashed, ref uint sizePublicKeyInfoHashed); diff --git a/src/WixToolset.Core.Native/Cabinet.cs b/src/WixToolset.Core.Native/Cabinet.cs index 2d624658..7e04cbc5 100644 --- a/src/WixToolset.Core.Native/Cabinet.cs +++ b/src/WixToolset.Core.Native/Cabinet.cs @@ -15,19 +15,25 @@ namespace WixToolset.Core.Native private const string CompressionLevelVariable = "WIX_COMPRESSION_LEVEL"; private static readonly char[] TextLineSplitter = new[] { '\t' }; + /// + /// + /// + /// Path of cabinet public Cabinet(string path) { this.Path = path; } + /// + /// Cabinet path. + /// public string Path { get; } /// /// Creates a cabinet. /// - /// Path of cabinet to create. + /// Files to compress. /// Level of compression to apply. - /// Maximum number of files that will be added to cabinet. /// Maximum size of cabinet. /// Maximum threshold for each cabinet. public void Compress(IEnumerable files, CompressionLevel compressionLevel, int maxSize = 0, int maxThresh = 0) diff --git a/src/WixToolset.Core.Native/MSIFILEHASHINFO.cs b/src/WixToolset.Core.Native/MSIFILEHASHINFO.cs index c11b44ea..d5ac1bc0 100644 --- a/src/WixToolset.Core.Native/MSIFILEHASHINFO.cs +++ b/src/WixToolset.Core.Native/MSIFILEHASHINFO.cs @@ -10,10 +10,25 @@ namespace WixToolset.Core.Native [StructLayout(LayoutKind.Explicit)] public class MSIFILEHASHINFO { + /// + /// + /// [FieldOffset(0)] public uint FileHashInfoSize; + /// + /// + /// [FieldOffset(4)] public int Data0; + /// + /// + /// [FieldOffset(8)] public int Data1; + /// + /// + /// [FieldOffset(12)] public int Data2; + /// + /// + /// [FieldOffset(16)] public int Data3; } } diff --git a/src/WixToolset.Core.Native/MsmInterop.cs b/src/WixToolset.Core.Native/MsmInterop.cs index 6b1ad141..87ed6f02 100644 --- a/src/WixToolset.Core.Native/MsmInterop.cs +++ b/src/WixToolset.Core.Native/MsmInterop.cs @@ -481,6 +481,9 @@ namespace WixToolset.Core.Native [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] public interface IClassFactory { + /// + /// + /// [return: MarshalAs(UnmanagedType.IUnknown)] object CreateInstance(IntPtr unkOuter, [MarshalAs(UnmanagedType.LPStruct)] Guid iid); } diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj index f12d674c..2c118d51 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj @@ -1,3 +1,6 @@ + + + @@ -6,6 +9,7 @@ Core Native embedded true + true @@ -29,7 +33,7 @@ - + diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec index 0ec4747d..33b19bc1 100644 --- a/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec +++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec @@ -18,6 +18,7 @@ + diff --git a/src/winterop/packages.config b/src/winterop/packages.config index 321d628a..eb65b3b3 100644 --- a/src/winterop/packages.config +++ b/src/winterop/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/winterop/winterop.vcxproj b/src/winterop/winterop.vcxproj index 28393dba..ae844fdf 100644 --- a/src/winterop/winterop.vcxproj +++ b/src/winterop/winterop.vcxproj @@ -5,7 +5,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -87,8 +87,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - + + diff --git a/src/wixnative/packages.config b/src/wixnative/packages.config index 321d628a..eb65b3b3 100644 --- a/src/wixnative/packages.config +++ b/src/wixnative/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/wixnative/wixnative.vcxproj b/src/wixnative/wixnative.vcxproj index 0d79b80c..681b2e1e 100644 --- a/src/wixnative/wixnative.vcxproj +++ b/src/wixnative/wixnative.vcxproj @@ -5,7 +5,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -87,8 +87,8 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - + + -- cgit v1.2.3-55-g6feb