update Windows buildscripts, LoadLibrary successful (dotnet#1285)

tonerdo · Aug 11, 2017 · c240aa6 · c240aa6
1 parent cb99853
commit c240aa6
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -32,7 +32,8 @@ See the LICENSE file in the project root for more information.
   </ItemGroup>
 
   <ItemGroup>
-    <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" />
+    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) == ''" Include="$(IlcPath)\sdk\bootstrapper.lib" />
+    <NativeLibrary Condition="$(NativeCodeGen) == '' and $(NativeLib) != ''" Include="$(IlcPath)\sdk\bootstrapperdll.lib" />
     <NativeLibrary Condition="$(NativeCodeGen) == ''" Include="$(IlcPath)\sdk\Runtime.lib" />
     <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\bootstrappercpp.lib" />
     <NativeLibrary Condition="$(NativeCodeGen) == 'cpp'" Include="$(IlcPath)\sdk\PortableRuntime.lib" />
@@ -55,12 +56,14 @@ See the LICENSE file in the project root for more information.
   </ItemGroup>
 
   <ItemGroup>
+    <LinkerArg Condition="$(NativeLib) == 'Shared'" Include="/DLL" />
+    <LinkerArg Condition="$(DefFile) != ''" Include="/DEF:$(DefFile)" />
     <LinkerArg Include="@(NativeLibrary)" />
     <LinkerArg Include="@(AdditionalNativeLibrary)" />
     <LinkerArg Include="/NOLOGO /DEBUG /MANIFEST:NO" />
     <!-- The runtime is not compatible with jump stubs inserted by incremental linking. -->
     <LinkerArg Include="/INCREMENTAL:NO" />
-  </ItemGroup>
+  </ItemGroup> 
 
   <ItemGroup>
     <!-- TODO <LinkerArg Include="/MACHINE:X64" /> -->