Update sample to use aspnetcore.dll and aspnetcorerh.dll (#512)

samples/NativeIISSample/NativeIISSample.csproj

@@ -1,11 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
+    <RuntimeIdentifiers>win-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.AspNetCore.Server.IISIntegration\Microsoft.AspNetCore.Server.IISIntegration.csproj" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+    <!-- x86 -->
+    <None Include="..\..\src\RequestHandler\bin\$(Configuration)\Win32\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" Link="x86\aspnetcorerh.dll" />
+    <None Include="..\..\src\AspNetCore\bin\$(Configuration)\Win32\aspnetcore.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" Link="x86\aspnetcore.dll" />
+    <!-- x64 -->
+    <None Include="..\..\src\RequestHandler\bin\$(Configuration)\x64\aspnetcorerh.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" Link="x64\aspnetcorerh.dll" />
+    <None Include="..\..\src\AspNetCore\bin\$(Configuration)\x64\aspnetcore.dll" CopyToOutputDirectory="PreserveNewest" Visible="false" Link="x64\aspnetcore.dll" />
+  </ItemGroup>
+  
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(MicrosoftAspNetCoreHostingPackageVersion)" />
   </ItemGroup>
+
 </Project>

samples/NativeIISSample/Properties/launchSettings.json

@@ -21,7 +21,7 @@
       "commandLineArgs": "/config:\"$(MSBuildThisFileDirectory)applicationhost.config\" /site:\"$(ProjectName)\" /apppool:\"Clr4IntegratedAppPool\"",
       "environmentVariables": {
         "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
-        "ANCM_PATH": "$(ProgramW6432)\\IIS Express",
+        "ANCM_PATH": "$(MSBuildThisFileDirectory)bin\\$(Configuration)\\$(TargetFramework)\\x64\\aspnetcore.dll",
         "LAUNCHER_ARGS": "$(TargetPath)",
         "ASPNETCORE_ENVIRONMENT": "Development",
         "LAUNCHER_PATH": "dotnet.exe"

samples/NativeIISSample/applicationhost.config

@@ -240,7 +240,7 @@
       <add name="ManagedEngineV4.0_32bit" image="%windir%\Microsoft.NET\Framework\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness32" />
       <add name="ManagedEngineV4.0_64bit" image="%windir%\Microsoft.NET\Framework64\v4.0.30319\webengine4.dll" preCondition="integratedMode,runtimeVersionv4.0,bitness64" />
       <add name="ApplicationInitializationModule" image="%IIS_BIN%\warmup.dll" />
-      <add name="AspNetCoreModule" image="%ANCM_PATH%\aspnetcore.dll" />
+      <add name="AspNetCoreModule" image="%ANCM_PATH%" />
     </globalModules>
     <httpCompression directory="%TEMP%\iisexpress\IIS Temporary Compressed Files">
       <scheme name="gzip" dll="%IIS_BIN%\gzip.dll" />

src/CommonLib/CommonLib.vcxproj

@@ -172,6 +172,7 @@
     <ClInclude Include="application.h" />
     <ClInclude Include="aspnetcoreconfig.h" />
     <ClInclude Include="debugutil.h" />
+    <ClInclude Include="disconnectcontext.h" />
     <ClInclude Include="environmentvariablehash.h" />
     <ClInclude Include="fx_ver.h" />
     <ClInclude Include="hostfxr_utility.h" />

src/RequestHandler/RequestHandler.vcxproj

@@ -202,7 +202,6 @@
   <ItemGroup>
     <ClInclude Include="aspnetcore_event.h" />
     <ClInclude Include="aspnetcore_msg.h" />
-    <ClInclude Include="disconnectcontext.h" />
     <ClInclude Include="sttimer.h" />
     <ClInclude Include="outofprocess\forwarderconnection.h" />
     <ClInclude Include="outofprocess\processmanager.h" />

src/RequestHandler/RequestHandler.vcxproj.filters

@@ -78,7 +78,6 @@
     <ClInclude Include="outofprocess\winhttphelper.h">
       <Filter>OutOfProcess</Filter>
     </ClInclude>
-    <ClInclude Include="disconnectcontext.h" />
     <ClInclude Include="aspnetcore_event.h" />
     <ClInclude Include="sttimer.h" />
     <ClInclude Include="aspnetcore_msg.h" />