Revert "Remove ANCM shim and outofprocess handler from Runtime SiteEx… (

#31042) * Revert "Remove ANCM shim and outofprocess handler from Runtime SiteExtension (#24884)" This reverts commit 7f7528f. * Enable site extension build temporarily * Enable build native * Fixing site extension build * No need to set * Fixing up build * Update .azure/pipelines/ci.yml * Update ci.yml * retry * Update .azure/pipelines/ci.yml
dotnet · Mar 20, 2021 · cb32de3 · cb32de3
1 parent 9f1012b
commit cb32de3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props
@@ -125,6 +125,7 @@
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           OutDirName="OutOfProcessRequestHandler"
+          TempSubfolder="2.0.0/"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
           ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
@@ -139,6 +140,7 @@
           ProjectName="OutOfProcessRequestHandler.vcxproj"
           PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
           OutDirName="OutOfProcessRequestHandler"
+          TempSubfolder="2.0.0/"
           PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
           ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
           Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"

diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -16,6 +16,8 @@
     <NoSemVer20>true</NoSemVer20>
   </PropertyGroup>
 
+  <Import Project="..\..\..\src\Servers\IIS\build\assets.props" />
+
   <ItemGroup>
     <Content Include="applicationHost.xdt" />
     <Content Include="scmApplicationHost.xdt" />
@@ -33,11 +35,18 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
+
+    <NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(TargetArchitecture)" />
+    <NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="$(TargetArchitecture)" />
   </ItemGroup>
 
   <Target Name="ResolveReferenceItemsForPackage" DependsOnTargets="ResolveReferences" BeforeTargets="_GetPackageFiles">
     <ItemGroup>
       <Content Include="$(DotNetUnpackFolder)\**\*.*" Exclude="$(DotNetUnpackFolder)\**\.*" Condition="$(DotNetAssetRootUrl) != ''" PackagePath="content\%(RecursiveDir)" />
+      <Content Include="%(ShimComponents.DllLocation)"
+            Pack="true"
+            Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'"
+            PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" />
     </ItemGroup>
   </Target>
 

diff --git a/src/SiteExtensions/Runtime/applicationHost.xdt b/src/SiteExtensions/Runtime/applicationHost.xdt
@@ -12,6 +12,10 @@
           <add name="DOTNET_ROOT" value="%XDT_EXTENSIONPATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing"  />
         </environmentVariables>
       </runtime>
+
+      <globalModules>
+        <add name="AspNetCoreModuleV2" image="%XDT_EXTENSIONPATH%\ancm\aspnetcorev2.dll" xdt:Locator="Match(name)" xdt:Transform="Replace" />
+      </globalModules>
     </system.webServer>
 
     <location>