Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
10 commits merged into from
Mar 20, 2021
Merged

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

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f40bd2c
Revert "Remove ANCM shim and outofprocess handler from Runtime SiteEx…
jkotalik Mar 18, 2021
8343ff5
Enable site extension build temporarily
jkotalik Mar 18, 2021
502227f
Enable build native
jkotalik Mar 19, 2021
e953a62
Fixing site extension build
jkotalik Mar 19, 2021
1f5eeda
No need to set
jkotalik Mar 19, 2021
371b566
Fixing up build
jkotalik Mar 19, 2021
c183606
Update .azure/pipelines/ci.yml
jkotalik Mar 19, 2021
989620b
Update ci.yml
jkotalik Mar 19, 2021
543e27b
retry
jkotalik Mar 19, 2021
3483405
Update .azure/pipelines/ci.yml
jkotalik Mar 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .azure/pipelines/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ stages:
-noBuildNative
$(_BuildArgs)
$(_InternalRuntimeDownloadArgs)
condition: ne(variables['Build.Reason'], 'PullRequest')
# condition: ne(variables['Build.Reason'], 'PullRequest')
displayName: Build SiteExtension

# This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If
Expand Down
2 changes: 2 additions & 0 deletions src/Servers/IIS/build/assets.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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>

Expand Down
4 changes: 4 additions & 0 deletions src/SiteExtensions/Runtime/applicationHost.xdt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down