From e014dd02588b7116ffab3e4ac6acc756f5f816d5 Mon Sep 17 00:00:00 2001
From: Kirill Osenkov <github@osenkov.com>
Date: Wed, 26 Sep 2018 15:23:05 -0700
Subject: Simplify AssemblySearchPaths to what's really needed.

This disables searching in registry, AssemblyFoldersEx, etc.
---
 main/Directory.Build.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'main/Directory.Build.targets')

diff --git a/main/Directory.Build.targets b/main/Directory.Build.targets
index 49f79e2d29..00df0c9454 100644
--- a/main/Directory.Build.targets
+++ b/main/Directory.Build.targets
@@ -5,4 +5,13 @@
       <Output TaskParameter="Value" PropertyName="AssemblySearchPaths" />
     </CreateProperty>
   </Target>
+
+  <PropertyGroup>
+    <RARResolveFromGAC Condition="$(RARResolveFromGAC) == ''">true</RARResolveFromGAC>
+    <RARCandidateAssemblyFiles Condition="$(RARResolveFromCandidateAssemblyFiles) == 'true'">{CandidateAssemblyFiles};</RARCandidateAssemblyFiles>
+    <RAROutputDirectory Condition="$(RARResolveFromOutputDirectory) == 'true'">$(OutDir)</RAROutputDirectory>
+    <RARGAC Condition="$(RARResolveFromGAC) == 'true'">{GAC}</RARGAC>
+    <AssemblySearchPaths>{RawFileName};{HintPathFromItem};{TargetFrameworkDirectory};$(RARGAC);$(RAROutputDirectory);$(RARCandidateAssemblyFiles)</AssemblySearchPaths>
+  </PropertyGroup>
+
 </Project>
-- 
cgit v1.2.3