diff options
author | Bob Arnson <bob@firegiant.com> | 2022-09-09 21:21:55 -0400 |
---|---|---|
committer | Bob Arnson <github@bobs.org> | 2022-09-12 13:33:03 -0400 |
commit | 6a45cb7687de57056532fe897a708435deec2ea3 (patch) | |
tree | a9795ac837d0475ea22d86c0d592fac7b0b6c159 /src/api/burn/WixToolset.Mba.Core | |
parent | a1307cd4e76a89598c53cb68309358a7012db553 (diff) | |
download | wix-6a45cb7687de57056532fe897a708435deec2ea3.tar.gz wix-6a45cb7687de57056532fe897a708435deec2ea3.tar.bz2 wix-6a45cb7687de57056532fe897a708435deec2ea3.zip |
Update hashes are now hex strings.
Fixes https://github.com/wixtoolset/issues/issues/6901.
Diffstat (limited to 'src/api/burn/WixToolset.Mba.Core')
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/Engine.cs | 4 | ||||
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | 8 | ||||
-rw-r--r-- | src/api/burn/WixToolset.Mba.Core/IEngine.cs | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/api/burn/WixToolset.Mba.Core/Engine.cs b/src/api/burn/WixToolset.Mba.Core/Engine.cs index 5ebada36..e7ab533b 100644 --- a/src/api/burn/WixToolset.Mba.Core/Engine.cs +++ b/src/api/burn/WixToolset.Mba.Core/Engine.cs | |||
@@ -240,9 +240,9 @@ namespace WixToolset.Mba.Core | |||
240 | } | 240 | } |
241 | 241 | ||
242 | /// <inheritdoc/> | 242 | /// <inheritdoc/> |
243 | public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash) | 243 | public void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash) |
244 | { | 244 | { |
245 | this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash, null == hash ? 0 : hash.Length); | 245 | this.engine.SetUpdate(localSource, downloadSource, size, hashType, hash); |
246 | } | 246 | } |
247 | 247 | ||
248 | /// <inheritdoc/> | 248 | /// <inheritdoc/> |
diff --git a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs index fdc9c3f6..408c9955 100644 --- a/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IBootstrapperEngine.cs | |||
@@ -123,21 +123,19 @@ namespace WixToolset.Mba.Core | |||
123 | ); | 123 | ); |
124 | 124 | ||
125 | /// <summary> | 125 | /// <summary> |
126 | /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, byte[])"/>. | 126 | /// See <see cref="IEngine.SetUpdate(string, string, long, UpdateHashType, string)"/>. |
127 | /// </summary> | 127 | /// </summary> |
128 | /// <param name="wzLocalSource"></param> | 128 | /// <param name="wzLocalSource"></param> |
129 | /// <param name="wzDownloadSource"></param> | 129 | /// <param name="wzDownloadSource"></param> |
130 | /// <param name="qwValue"></param> | 130 | /// <param name="qwValue"></param> |
131 | /// <param name="hashType"></param> | 131 | /// <param name="hashType"></param> |
132 | /// <param name="rgbHash"></param> | 132 | /// <param name="wzHash"></param> |
133 | /// <param name="cbHash"></param> | ||
134 | void SetUpdate( | 133 | void SetUpdate( |
135 | [MarshalAs(UnmanagedType.LPWStr)] string wzLocalSource, | 134 | [MarshalAs(UnmanagedType.LPWStr)] string wzLocalSource, |
136 | [MarshalAs(UnmanagedType.LPWStr)] string wzDownloadSource, | 135 | [MarshalAs(UnmanagedType.LPWStr)] string wzDownloadSource, |
137 | [MarshalAs(UnmanagedType.U8)] long qwValue, | 136 | [MarshalAs(UnmanagedType.U8)] long qwValue, |
138 | [MarshalAs(UnmanagedType.U4)] UpdateHashType hashType, | 137 | [MarshalAs(UnmanagedType.U4)] UpdateHashType hashType, |
139 | [MarshalAs(UnmanagedType.LPArray, SizeParamIndex=4)] byte[] rgbHash, | 138 | [MarshalAs(UnmanagedType.LPWStr)] string wzHash |
140 | [MarshalAs(UnmanagedType.U4)] int cbHash | ||
141 | ); | 139 | ); |
142 | 140 | ||
143 | /// <summary> | 141 | /// <summary> |
diff --git a/src/api/burn/WixToolset.Mba.Core/IEngine.cs b/src/api/burn/WixToolset.Mba.Core/IEngine.cs index 3e636961..2b9a90e0 100644 --- a/src/api/burn/WixToolset.Mba.Core/IEngine.cs +++ b/src/api/burn/WixToolset.Mba.Core/IEngine.cs | |||
@@ -142,7 +142,7 @@ namespace WixToolset.Mba.Core | |||
142 | /// <param name="size">Size of the expected update.</param> | 142 | /// <param name="size">Size of the expected update.</param> |
143 | /// <param name="hashType">Type of the hash expected on the update.</param> | 143 | /// <param name="hashType">Type of the hash expected on the update.</param> |
144 | /// <param name="hash">Optional hash expected for the update.</param> | 144 | /// <param name="hash">Optional hash expected for the update.</param> |
145 | void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, byte[] hash); | 145 | void SetUpdate(string localSource, string downloadSource, long size, UpdateHashType hashType, string hash); |
146 | 146 | ||
147 | /// <summary> | 147 | /// <summary> |
148 | /// Sets the URL to the update feed. | 148 | /// Sets the URL to the update feed. |