Skip to content

Commit cb32de3

Browse files
authored
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
1 parent 9f1012b commit cb32de3

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

src/Servers/IIS/build/assets.props

+2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
ProjectName="OutOfProcessRequestHandler.vcxproj"
126126
PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
127127
OutDirName="OutOfProcessRequestHandler"
128+
TempSubfolder="2.0.0/"
128129
PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
129130
ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
130131
Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"
@@ -139,6 +140,7 @@
139140
ProjectName="OutOfProcessRequestHandler.vcxproj"
140141
PropetyName="AspNetCoreModuleV2OutOfProcessHandler"
141142
OutDirName="OutOfProcessRequestHandler"
143+
TempSubfolder="2.0.0/"
142144
PackageSubPath="$(AspNetCoreModuleOutOfProcessVersion)\"
143145
ProjectDirectory="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler"
144146
Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj"

src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj

+9
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<NoSemVer20>true</NoSemVer20>
1717
</PropertyGroup>
1818

19+
<Import Project="..\..\..\src\Servers\IIS\build\assets.props" />
20+
1921
<ItemGroup>
2022
<Content Include="applicationHost.xdt" />
2123
<Content Include="scmApplicationHost.xdt" />
@@ -33,11 +35,18 @@
3335
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
3436
<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
3537
</ProjectReference>
38+
39+
<NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" Platform="$(TargetArchitecture)" />
40+
<NativeProjectReference Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\OutOfProcessRequestHandler\OutOfProcessRequestHandler.vcxproj" HandlerPath="2.0.0" Platform="$(TargetArchitecture)" />
3641
</ItemGroup>
3742

3843
<Target Name="ResolveReferenceItemsForPackage" DependsOnTargets="ResolveReferences" BeforeTargets="_GetPackageFiles">
3944
<ItemGroup>
4045
<Content Include="$(DotNetUnpackFolder)\**\*.*" Exclude="$(DotNetUnpackFolder)\**\.*" Condition="$(DotNetAssetRootUrl) != ''" PackagePath="content\%(RecursiveDir)" />
46+
<Content Include="%(ShimComponents.DllLocation)"
47+
Pack="true"
48+
Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'"
49+
PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" />
4150
</ItemGroup>
4251
</Target>
4352

src/SiteExtensions/Runtime/applicationHost.xdt

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<add name="DOTNET_ROOT" value="%XDT_EXTENSIONPATH%" xdt:Locator="Match(name)" xdt:Transform="InsertIfMissing" />
1313
</environmentVariables>
1414
</runtime>
15+
16+
<globalModules>
17+
<add name="AspNetCoreModuleV2" image="%XDT_EXTENSIONPATH%\ancm\aspnetcorev2.dll" xdt:Locator="Match(name)" xdt:Transform="Replace" />
18+
</globalModules>
1519
</system.webServer>
1620

1721
<location>

0 commit comments

Comments
 (0)