Skip to content

Commit 55bc93b

Browse files
author
A9G-Data-Droid
committed
Fix building on FIPS systems
Update WixToolset to v3.14.0.5722 Add `-fips` flag to heat.exe calls Closes #5867
1 parent 0cac5e6 commit 55bc93b

File tree

114 files changed

+3171
-115
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+3171
-115
lines changed

Rubberduck.Deployment.Build/RubberduckPostBuildTask.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,10 +317,10 @@ private void CompileWithTlbExp(DllFileParameters parameters)
317317

318318
private void HarvestMetadataWithWixToFile(DllFileParameters parameters)
319319
{
320-
var command = $"\"{WixToolsDir}heat.exe\" file \"{parameters.SourceDll}\" -out \"{parameters.DllXml}\"";
320+
var command = $"\"{WixToolsDir}heat.exe\" file \"{parameters.SourceDll}\" -fips -out \"{parameters.DllXml}\"";
321321
ExecuteTask(command);
322322

323-
command = $"\"{WixToolsDir}heat.exe\" file \"{parameters.SourceTlb32}\" -out \"{parameters.TlbXml}\"";
323+
command = $"\"{WixToolsDir}heat.exe\" file \"{parameters.SourceTlb32}\" -fips -out \"{parameters.TlbXml}\"";
324324
ExecuteTask(command);
325325
}
326326

0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2.5 KB
Binary file not shown.
24 KB
Binary file not shown.
264 KB
Binary file not shown.

0 commit comments

Comments
 (0)