Merge pull request #4756 from bclothier/DeploymentEnhancement

retailcoder · web-flow · commit 13de1a8bfea5 · 2019-01-29T10:02:01.000-05:00
Prevent overwriting the 64-bit type library
diff --git a/Rubberduck.Deployment.Build/RubberduckPostBuildTask.cs b/Rubberduck.Deployment.Build/RubberduckPostBuildTask.cs
@@ -243,7 +243,7 @@ private void CompileWithMidl(DllFileParameters parameters, string batchPath)
             var targetPath = TargetDir.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
             var command = $"call \"{batchPath}\"{Environment.NewLine}" +
                           $"midl.exe /win32 /tlb \"{parameters.Tlb32File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"{Environment.NewLine}" +
-                          $"midl.exe /amd64 /tlb \"{parameters.Tlb32File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"";
+                          $"midl.exe /amd64 /tlb \"{parameters.Tlb64File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"";
             ExecuteTask(command, SourceDir);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ private void CompileWithMidl(DllFileParameters parameters, string batchPath)`
`243`	`243`	`var targetPath = TargetDir.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);`
`244`	`244`	`var command = $"call \"{batchPath}\"{Environment.NewLine}" +`
`245`	`245`	`$"midl.exe /win32 /tlb \"{parameters.Tlb32File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"{Environment.NewLine}" +`
`246`		`- $"midl.exe /amd64 /tlb \"{parameters.Tlb32File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"";`
	`246`	`+ $"midl.exe /amd64 /tlb \"{parameters.Tlb64File}\" \"{parameters.IdlFile}\" /out \"{targetPath}\"";`
`247`	`247`	`ExecuteTask(command, SourceDir);`
`248`	`248`	`}`
`249`	`249`