Merge pull request #4035 from MDoerner/HotfixForDeployment

Fixed assembly loading on fall back in deployment.
rubberduck-vba · May 24, 2018 · 5db0eab · 5db0eab
2 parents d533a96 + 5a3c564
commit 5db0eab
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Rubberduck.Deployment/BuildRegistryScript.ps1 b/Rubberduck.Deployment/BuildRegistryScript.ps1
@@ -99,10 +99,11 @@ try
 		# For simplicity, the arguments are pass in literally.
 		# & "C:\GitHub\Rubberduck\Rubberduck\Rubberduck.Deployment\echoargs.exe" ""$sourceDll"" /win32 /out:""$sourceTlb"";
 
+		[System.Reflection.Assembly]::LoadFrom($builderAssemblyPath);
+
 		$devPath = Resolve-Path -Path "C:\Program Files*\Microsoft Visual Studio\*\*\Common*\Tools\VsDevCmd.bat";
 		if($devPath)
 		{
-			[System.Reflection.Assembly]::LoadFrom($builderAssemblyPath);
 			$idlGenerator = New-Object Rubberduck.Deployment.IdlGeneration.IdlGenerator;
 
 			$idl = $idlGenerator.GenerateIdl($sourceDll);