From 618d3dabee0830a3fa073cc524be3b867b3ca348 Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Wed, 8 Nov 2017 16:02:52 -0800
Subject: [PATCH] Modifies ANCM DLL location based on folder rather than name.
 (#240)

---
 nuget/AspNetCore.nuspec                           | 4 ++--
 nuget/Microsoft.AspNetCore.AspNetCoreModule.props | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nuget/AspNetCore.nuspec b/nuget/AspNetCore.nuspec
index 77232892b1..9ae12a82a0 100644
--- a/nuget/AspNetCore.nuspec
+++ b/nuget/AspNetCore.nuspec
@@ -15,8 +15,8 @@
     <tags>Microsoft.AspNetCore.AspNetCoreModule</tags>
   </metadata>
   <files>
-    <file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcore.dll" target="runtimes\win7\native\aspnetcore_x86.dll" />
-    <file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll" target="runtimes\win7\native\aspnetcore_x64.dll" />
+    <file src="..\artifacts\build\AspNetCore\bin\Release\Win32\aspnetcore.dll" target="runtimes\win7\native\x86\aspnetcore.dll" />
+    <file src="..\artifacts\build\AspNetCore\bin\Release\x64\aspnetcore.dll" target="runtimes\win7\native\x64\aspnetcore.dll" />
     <file src="..\artifacts\build\AspNetCore\bin\Release\x64\*.xml"/>
     <file src="..\tools\installancm.ps1"/>
     <file src="..\LICENSE.txt"/>
diff --git a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
index 6e7a680584..5e0df1fdab 100644
--- a/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
+++ b/nuget/Microsoft.AspNetCore.AspNetCoreModule.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\runtimes\win7\native\aspnetcore_x64.dll</AspNetCoreModuleX64Location>
-    <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\runtimes\win7\native\aspnetcore_x86.dll</AspNetCoreModuleX86Location>
+    <AspNetCoreModuleX64Location>$(MSBuildThisFileDirectory)..\runtimes\win7\native\x64\aspnetcore.dll</AspNetCoreModuleX64Location>
+    <AspNetCoreModuleX86Location>$(MSBuildThisFileDirectory)..\runtimes\win7\native\x86\aspnetcore.dll</AspNetCoreModuleX86Location>
   </PropertyGroup>
 
 </Project>