From 0d17711f36915c5d6b0401221bb706db0c10a70c Mon Sep 17 00:00:00 2001
From: Toni Solarin-Sodara <toni.edward@outlook.com>
Date: Wed, 20 Dec 2017 08:11:08 -0700
Subject: [PATCH] add automatic location of auto-generated definition file to
 build scripts (#4986)

---
 src/BuildIntegration/Microsoft.NETCore.Native.Windows.props | 1 -
 src/BuildIntegration/Microsoft.NETCore.Native.targets       | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
index 2214b342372..9949a24ec02 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.Windows.props
@@ -61,7 +61,6 @@ See the LICENSE file in the project root for more information.
     
     <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" />
diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
index 03b5366cb00..c64c33a924f 100644
--- a/src/BuildIntegration/Microsoft.NETCore.Native.targets
+++ b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -31,6 +31,7 @@ See the LICENSE file in the project root for more information.
     <NativeObjectExt Condition="'$(TargetOS)' == 'Windows_NT'">.obj</NativeObjectExt>
     <NativeObjectExt Condition="'$(TargetOS)' != 'Windows_NT'">.o</NativeObjectExt>
     <NativeObjectExt Condition="'$(NativeCodeGen)' == 'wasm'">.bc</NativeObjectExt>
+
     <LibFileExt Condition="'$(TargetOS)' == 'Windows_NT'">.lib</LibFileExt>
     <LibFileExt Condition="'$(TargetOS)' != 'Windows_NT'">.a</LibFileExt>
 
@@ -48,7 +49,10 @@ See the LICENSE file in the project root for more information.
     <NativeBinaryExt Condition="'$(OutputType)' !=  'Exe' and '$(TargetOS)' != 'Windows_NT' and $(NativeLib) == 'Static'">.a</NativeBinaryExt>
     <NativeBinaryExt Condition="'$(NativeCodeGen)' == 'wasm'">.html</NativeBinaryExt>
 
+    <NativeExportExt Condition="'$(OutputType)' !=  'Exe' and '$(TargetOS)' == 'Windows_NT' and '$(NativeLib)' == 'Shared'">.def</NativeExportExt>
+
     <NativeObject>$(NativeIntermediateOutputPath)$(TargetName)$(NativeObjectExt)</NativeObject>
+    <NativeExport>$(NativeIntermediateOutputPath)$(TargetName)$(NativeExportExt)</NativeExport>
     <NativeBinary>$(NativeOutputPath)$(TargetName)$(NativeBinaryExt)</NativeBinary>
 
     <IlcCompileOutput Condition="$(NativeCodeGen) == ''">$(NativeObject)</IlcCompileOutput>
@@ -193,6 +197,7 @@ See the LICENSE file in the project root for more information.
       <CustomLinkerArg Include="$(NativeObject)" />
       <CustomLinkerArg Include="-o $(NativeBinary)" Condition="'$(OS)' != 'Windows_NT'" />
       <CustomLinkerArg Include="/OUT:$(NativeBinary)" Condition="'$(OS)' == 'Windows_NT'" />
+      <CustomLinkerArg Include="/DEF:$(NativeExport)" Condition="'$(OS)' == 'Windows_NT' and '$(NativeLib)' == 'Shared'" />
       <CustomLinkerArg Include="@(LinkerArg)" />
     </ItemGroup>