From f40bd2c4548bf0227b83b5f6ab8e315ab848734d Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 18 Mar 2021 15:00:00 -0700 Subject: [PATCH 01/10] Revert "Remove ANCM shim and outofprocess handler from Runtime SiteExtension (#24884)" This reverts commit 7f7528faae3beeef51cfbe7d8eb76faed67e0c3f. --- .../Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj | 4 ++++ src/SiteExtensions/Runtime/applicationHost.xdt | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 81ebb2c3bc30..0d08bab58ebe 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -33,11 +33,15 @@ false true + + + + diff --git a/src/SiteExtensions/Runtime/applicationHost.xdt b/src/SiteExtensions/Runtime/applicationHost.xdt index 388c6d80a353..3eb172b2fb2f 100644 --- a/src/SiteExtensions/Runtime/applicationHost.xdt +++ b/src/SiteExtensions/Runtime/applicationHost.xdt @@ -12,6 +12,10 @@ + + + + From 8343ff5c05f4efa8da2095d301acc45863bd7ff1 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 18 Mar 2021 16:19:08 -0700 Subject: [PATCH 02/10] Enable site extension build temporarily --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f4cb66affec1..a183514ddbe7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -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 From 502227fc2919e7fbe9465bc07f77bdac921e3c45 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 11:33:00 -0700 Subject: [PATCH 03/10] Enable build native --- .azure/pipelines/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a183514ddbe7..2a4a5c56bbd7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -184,7 +184,6 @@ stages: -noBuildRepoTasks -pack -noBuildDeps - -noBuildNative $(_BuildArgs) $(_InternalRuntimeDownloadArgs) # condition: ne(variables['Build.Reason'], 'PullRequest') From e953a6228bd6396ef994df2c657bb22de7e7523b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 14:01:34 -0700 Subject: [PATCH 04/10] Fixing site extension build --- .../Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj | 6 +++++- src/SiteExtensions/build.cmd | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj index 0d08bab58ebe..50033b8ceac7 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -16,6 +16,8 @@ true + + @@ -41,7 +43,9 @@ - + diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd index fe886e54498a..f37b21d86ed0 100644 --- a/src/SiteExtensions/build.cmd +++ b/src/SiteExtensions/build.cmd @@ -2,14 +2,14 @@ SET RepoRoot=%~dp0..\.. ECHO Building x64 Microsoft.AspNetCore.Runtime.SiteExtension -CALL "%RepoRoot%\eng\build.cmd" -arch x64 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ +CALL "%RepoRoot%\eng\build.cmd" -arch x64 -buildNative true -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ "/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x64.binlog" %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% ) ECHO Building x86 Microsoft.AspNetCore.Runtime.SiteExtension -CALL "%RepoRoot%\eng\build.cmd" -arch x86 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ +CALL "%RepoRoot%\eng\build.cmd" -arch x86 -buildNative true -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ "/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x86.binlog" %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% From 1f5eeda53ac3ed6e8f8b13a47b492f7115719495 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 14:03:32 -0700 Subject: [PATCH 05/10] No need to set --- src/SiteExtensions/build.cmd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SiteExtensions/build.cmd b/src/SiteExtensions/build.cmd index f37b21d86ed0..fe886e54498a 100644 --- a/src/SiteExtensions/build.cmd +++ b/src/SiteExtensions/build.cmd @@ -2,14 +2,14 @@ SET RepoRoot=%~dp0..\.. ECHO Building x64 Microsoft.AspNetCore.Runtime.SiteExtension -CALL "%RepoRoot%\eng\build.cmd" -arch x64 -buildNative true -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ +CALL "%RepoRoot%\eng\build.cmd" -arch x64 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ "/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x64.binlog" %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% ) ECHO Building x86 Microsoft.AspNetCore.Runtime.SiteExtension -CALL "%RepoRoot%\eng\build.cmd" -arch x86 -buildNative true -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ +CALL "%RepoRoot%\eng\build.cmd" -arch x86 -projects "%~dp0Runtime\Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj" ^ "/bl:%RepoRoot%/artifacts/log/SiteExtensions-Runtime-x86.binlog" %* IF %ERRORLEVEL% NEQ 0 ( EXIT /b %ErrorLevel% From 371b566302bf6979e9d6a524fc9597705b5db743 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 14:23:16 -0700 Subject: [PATCH 06/10] Fixing up build --- src/Servers/IIS/build/assets.props | 2 ++ .../Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index e97ecec6a9d2..950a773257e1 100644 --- 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 index 50033b8ceac7..2ec7d6ac1a3a 100644 --- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj +++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj @@ -45,7 +45,8 @@ + Condition="'%(ShimComponents.Platform)' == '$(TargetArchitecture)'" + PackagePath="content\ancm\%(ShimComponents.TempSubfolder)" /> From c183606355f2bde524023eb790327570d9aaa57c Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 15:26:34 -0700 Subject: [PATCH 07/10] Update .azure/pipelines/ci.yml --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 2a4a5c56bbd7..21329dde5ab3 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -186,7 +186,7 @@ stages: -noBuildDeps $(_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 From 989620bc1ccb52c3fa7441c3d5a4c4d1b6238c8f Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 16:21:13 -0700 Subject: [PATCH 08/10] Update ci.yml --- .azure/pipelines/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 21329dde5ab3..f4cb66affec1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -184,6 +184,7 @@ stages: -noBuildRepoTasks -pack -noBuildDeps + -noBuildNative $(_BuildArgs) $(_InternalRuntimeDownloadArgs) condition: ne(variables['Build.Reason'], 'PullRequest') From 543e27b6bfb6af8126288cbe35915da2c997e36e Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 16:22:13 -0700 Subject: [PATCH 09/10] retry --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index f4cb66affec1..a183514ddbe7 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -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 From 3483405aa3de12bc5afb28b3ae3e0f2c30607a78 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 19 Mar 2021 19:40:55 -0700 Subject: [PATCH 10/10] Update .azure/pipelines/ci.yml --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index a183514ddbe7..f4cb66affec1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -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