diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-18 18:12:45 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-18 23:37:16 -0600 |
| commit | 8296f237c69743d3e6cbdc58fc07e8470562b92e (patch) | |
| tree | ed1379ca6495b177050746c85cbeebe542b4ef2b /src/WixToolset.Core.Native | |
| parent | c88d4e26faa12c2227679a5dc83cd78a1ddd02c0 (diff) | |
| download | wix-8296f237c69743d3e6cbdc58fc07e8470562b92e.tar.gz wix-8296f237c69743d3e6cbdc58fc07e8470562b92e.tar.bz2 wix-8296f237c69743d3e6cbdc58fc07e8470562b92e.zip | |
Enable XML doc.
Diffstat (limited to 'src/WixToolset.Core.Native')
| -rw-r--r-- | src/WixToolset.Core.Native/CabInterop.cs | 4 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/Cabinet.cs | 10 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/MSIFILEHASHINFO.cs | 15 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/MsmInterop.cs | 3 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.csproj | 6 | ||||
| -rw-r--r-- | src/WixToolset.Core.Native/WixToolset.Core.Native.nuspec | 1 |
6 files changed, 35 insertions, 4 deletions
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 | |||
| 29 | /// </summary> | 29 | /// </summary> |
| 30 | /// <param name="file">Full path to file to add to cabinet.</param> | 30 | /// <param name="file">Full path to file to add to cabinet.</param> |
| 31 | /// <param name="token">Name of file in cabinet.</param> | 31 | /// <param name="token">Name of file in cabinet.</param> |
| 32 | /// <param name="fileHash"></param> | ||
| 32 | /// <param name="contextHandle">Handle to open cabinet.</param> | 33 | /// <param name="contextHandle">Handle to open cabinet.</param> |
| 33 | [DllImport("winterop.dll", EntryPoint = "CreateCabAddFile", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] | 34 | [DllImport("winterop.dll", EntryPoint = "CreateCabAddFile", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] |
| 34 | public static extern void CreateCabAddFile(string file, string token, MSIFILEHASHINFO fileHash, IntPtr contextHandle); | 35 | public static extern void CreateCabAddFile(string file, string token, MSIFILEHASHINFO fileHash, IntPtr contextHandle); |
| @@ -101,7 +102,8 @@ namespace WixToolset.Core.Native | |||
| 101 | /// to be exposed by .NET Frameowkr. | 102 | /// to be exposed by .NET Frameowkr. |
| 102 | /// </summary> | 103 | /// </summary> |
| 103 | /// <param name="certContext">Pointer to a CERT_CONTEXT struct with public key information to hash.</param> | 104 | /// <param name="certContext">Pointer to a CERT_CONTEXT struct with public key information to hash.</param> |
| 104 | /// <param name="fileCount">Number of file paths in array.</param> | 105 | /// <param name="publicKeyInfoHashed"></param> |
| 106 | /// <param name="sizePublicKeyInfoHashed"></param> | ||
| 105 | [DllImport("winterop.dll", EntryPoint = "HashPublicKeyInfo", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] | 107 | [DllImport("winterop.dll", EntryPoint = "HashPublicKeyInfo", CharSet = CharSet.Unicode, ExactSpelling = true, PreserveSig = false)] |
| 106 | public static extern void HashPublicKeyInfo(IntPtr certContext, byte[] publicKeyInfoHashed, ref uint sizePublicKeyInfoHashed); | 108 | public static extern void HashPublicKeyInfo(IntPtr certContext, byte[] publicKeyInfoHashed, ref uint sizePublicKeyInfoHashed); |
| 107 | 109 | ||
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 | |||
| 15 | private const string CompressionLevelVariable = "WIX_COMPRESSION_LEVEL"; | 15 | private const string CompressionLevelVariable = "WIX_COMPRESSION_LEVEL"; |
| 16 | private static readonly char[] TextLineSplitter = new[] { '\t' }; | 16 | private static readonly char[] TextLineSplitter = new[] { '\t' }; |
| 17 | 17 | ||
| 18 | /// <summary> | ||
| 19 | /// | ||
| 20 | /// </summary> | ||
| 21 | /// <param name="path">Path of cabinet</param> | ||
| 18 | public Cabinet(string path) | 22 | public Cabinet(string path) |
| 19 | { | 23 | { |
| 20 | this.Path = path; | 24 | this.Path = path; |
| 21 | } | 25 | } |
| 22 | 26 | ||
| 27 | /// <summary> | ||
| 28 | /// Cabinet path. | ||
| 29 | /// </summary> | ||
| 23 | public string Path { get; } | 30 | public string Path { get; } |
| 24 | 31 | ||
| 25 | /// <summary> | 32 | /// <summary> |
| 26 | /// Creates a cabinet. | 33 | /// Creates a cabinet. |
| 27 | /// </summary> | 34 | /// </summary> |
| 28 | /// <param name="cabPath">Path of cabinet to create.</param> | 35 | /// <param name="files">Files to compress.</param> |
| 29 | /// <param name="compressionLevel">Level of compression to apply.</param> | 36 | /// <param name="compressionLevel">Level of compression to apply.</param> |
| 30 | /// <param name="maxFiles">Maximum number of files that will be added to cabinet.</param> | ||
| 31 | /// <param name="maxSize">Maximum size of cabinet.</param> | 37 | /// <param name="maxSize">Maximum size of cabinet.</param> |
| 32 | /// <param name="maxThresh">Maximum threshold for each cabinet.</param> | 38 | /// <param name="maxThresh">Maximum threshold for each cabinet.</param> |
| 33 | public void Compress(IEnumerable<CabinetCompressFile> files, CompressionLevel compressionLevel, int maxSize = 0, int maxThresh = 0) | 39 | public void Compress(IEnumerable<CabinetCompressFile> 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 | |||
| 10 | [StructLayout(LayoutKind.Explicit)] | 10 | [StructLayout(LayoutKind.Explicit)] |
| 11 | public class MSIFILEHASHINFO | 11 | public class MSIFILEHASHINFO |
| 12 | { | 12 | { |
| 13 | /// <summary> | ||
| 14 | /// | ||
| 15 | /// </summary> | ||
| 13 | [FieldOffset(0)] public uint FileHashInfoSize; | 16 | [FieldOffset(0)] public uint FileHashInfoSize; |
| 17 | /// <summary> | ||
| 18 | /// | ||
| 19 | /// </summary> | ||
| 14 | [FieldOffset(4)] public int Data0; | 20 | [FieldOffset(4)] public int Data0; |
| 21 | /// <summary> | ||
| 22 | /// | ||
| 23 | /// </summary> | ||
| 15 | [FieldOffset(8)] public int Data1; | 24 | [FieldOffset(8)] public int Data1; |
| 25 | /// <summary> | ||
| 26 | /// | ||
| 27 | /// </summary> | ||
| 16 | [FieldOffset(12)] public int Data2; | 28 | [FieldOffset(12)] public int Data2; |
| 29 | /// <summary> | ||
| 30 | /// | ||
| 31 | /// </summary> | ||
| 17 | [FieldOffset(16)] public int Data3; | 32 | [FieldOffset(16)] public int Data3; |
| 18 | } | 33 | } |
| 19 | } | 34 | } |
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 | |||
| 481 | [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] | 481 | [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] |
| 482 | public interface IClassFactory | 482 | public interface IClassFactory |
| 483 | { | 483 | { |
| 484 | /// <summary> | ||
| 485 | /// | ||
| 486 | /// </summary> | ||
| 484 | [return: MarshalAs(UnmanagedType.IUnknown)] | 487 | [return: MarshalAs(UnmanagedType.IUnknown)] |
| 485 | object CreateInstance(IntPtr unkOuter, [MarshalAs(UnmanagedType.LPStruct)] Guid iid); | 488 | object CreateInstance(IntPtr unkOuter, [MarshalAs(UnmanagedType.LPStruct)] Guid iid); |
| 486 | } | 489 | } |
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | ||
| 3 | |||
| 1 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 2 | 5 | ||
| 3 | <PropertyGroup> | 6 | <PropertyGroup> |
| @@ -6,6 +9,7 @@ | |||
| 6 | <Description>Core Native</Description> | 9 | <Description>Core Native</Description> |
| 7 | <DebugType>embedded</DebugType> | 10 | <DebugType>embedded</DebugType> |
| 8 | <IncludeSymbols>true</IncludeSymbols> | 11 | <IncludeSymbols>true</IncludeSymbols> |
| 12 | <CreateDocumentationFile>true</CreateDocumentationFile> | ||
| 9 | </PropertyGroup> | 13 | </PropertyGroup> |
| 10 | 14 | ||
| 11 | <ItemGroup> | 15 | <ItemGroup> |
| @@ -29,7 +33,7 @@ | |||
| 29 | 33 | ||
| 30 | <ItemGroup> | 34 | <ItemGroup> |
| 31 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> | 35 | <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> |
| 32 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" /> | 36 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="all" /> |
| 33 | </ItemGroup> | 37 | </ItemGroup> |
| 34 | 38 | ||
| 35 | <PropertyGroup> | 39 | <PropertyGroup> |
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 @@ | |||
| 18 | 18 | ||
| 19 | <files> | 19 | <files> |
| 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> | 20 | <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" /> |
| 21 | <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" /> | ||
| 21 | 22 | ||
| 22 | <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> | 23 | <file src="$mergemoddir$ARM64\mergemod.dll" target="runtimes\win-arm64\native" /> |
| 23 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> | 24 | <file src="ARM64\wixnative.exe" target="runtimes\win-arm64\native" /> |
