Consolidate error pages used by ANCM and improve link (#43170)

Author: adityamandaleeka

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj

@@ -85,10 +85,7 @@
     <ResourceCompile Include="HtmlResponses.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="InProcessShimStaticHtml.htm">
-      <DeploymentContent>true</DeploymentContent>
-    </None>
-    <None Include="OutOfProcessShimStaticHtml.htm">
+    <None Include="ancm_error_page.htm">
       <DeploymentContent>true</DeploymentContent>
     </None>
   </ItemGroup>

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/HtmlResponses.rc

@@ -65,16 +65,15 @@ <h1> HTTP Error %d.%d - %s </h1>
         %s
 
         <h2> Troubleshooting steps: </h2>
-
         <ul>
             <li> Check the system event log for error messages </li>
             <li> Enable logging the application process' stdout messages </li>
             <li> Attach a debugger to the application process and inspect </li>
         </ul>
 
         <h2>
-            For more information visit:
-            %s <a href="https://go.microsoft.com/fwlink/?LinkID=2028526"> <cite> https://go.microsoft.com/fwlink/?LinkID=2028526 </cite> </a>
+            For more guidance on diagnosing and handling these errors, visit
+            %s <a href="https://go.microsoft.com/fwlink/?LinkID=2028526"> <cite>Troubleshoot ASP.NET Core on Azure App Service and IIS</cite></a>.
         </h2>
     </body>
 </html>

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/OutOfProcessShimStaticHtml.htm

@@ -113,7 +113,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
                 pHttpApplication.GetApplicationId(),
                 hr);
 
-            auto page = options.QueryHostingModel() == HOSTING_IN_PROCESS ? IN_PROCESS_SHIM_STATIC_HTML : OUT_OF_PROCESS_SHIM_STATIC_HTML;
+            auto page = ANCM_ERROR_PAGE;
             std::string responseContent;
             if (options.QueryShowDetailedErrors())
             {
@@ -253,22 +253,22 @@ APPLICATION_INFO::ShutDownApplication(const bool fServerInitiated)
 
 /* Overview of shadow copy logic when enabled. See https://github.com/dotnet/aspnetcore/pull/28357 for more context
 
- * On first request, ANCM goes through its startup sequence, starting dotnet and sending the request into managed code. During this sequence, 
+ * On first request, ANCM goes through its startup sequence, starting dotnet and sending the request into managed code. During this sequence,
  * ANCM will copy the contents of the app directory to another directory which is user specified. The path to this directory can be absolute or relative.
 
- * Logs and log files will be written to the app directory rather than the shadow copy directory. app_offline will also only be watched in the app directory. 
+ * Logs and log files will be written to the app directory rather than the shadow copy directory. app_offline will also only be watched in the app directory.
  * The current directory will be set to the app directory as well as the AppContext.BaseDirectory.
 
- * On publish of new content to the app directory, ANCM will start debouncing file change notifications for dlls, waiting for a steady state. 
- * This is done by resetting a timer each time a dll is changed, eventually triggering the timer once there are no dll changes. Afterwards, shutdown is started, 
+ * On publish of new content to the app directory, ANCM will start debouncing file change notifications for dlls, waiting for a steady state.
+ * This is done by resetting a timer each time a dll is changed, eventually triggering the timer once there are no dll changes. Afterwards, shutdown is started,
  * causing the process to recycle.
 
- * Subfolders are created under the user specified shadowCopyDirectory, where the highest int value directory name will be used each time. 
- * It will start at subdirectory with name '0' and increment from there. On shutdown, because dlls are still locked by the running process, 
- * we need to copy dlls to a different directory than what is currently running in the app. So in the case where the directory name is '0', 
+ * Subfolders are created under the user specified shadowCopyDirectory, where the highest int value directory name will be used each time.
+ * It will start at subdirectory with name '0' and increment from there. On shutdown, because dlls are still locked by the running process,
+ * we need to copy dlls to a different directory than what is currently running in the app. So in the case where the directory name is '0',
  * we will create a directory name '1' and write the contents there. Then on app start, it will pick the directory name '1' as it's the highest value.
 
- * Other directories in the shadow copy directory will be cleaned up as well. Following the example, after '1' has been selected as the directory to use, 
+ * Other directories in the shadow copy directory will be cleaned up as well. Following the example, after '1' has been selected as the directory to use,
  * we will start a thread that deletes all other folders in that directory.
  */
 std::filesystem::path

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/InProcessShimStaticHtml.htm renamed to src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/ancm_error_page.htm

@@ -2,13 +2,11 @@
 // Microsoft Visual C++ generated include file.
 // Used by HtmlResponses.rc
 //
-#define IN_PROCESS_SHIM_STATIC_HTML     101
-#define OUT_OF_PROCESS_SHIM_STATIC_HTML 102
-#define UNKNOWN_HOSTING_STATIC_HTML     103
+#define ANCM_ERROR_PAGE 101
 
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        104

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp

@@ -28,19 +28,19 @@ class FILE_UTILITY
 
     static
     std::string
-    GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& speicificReasonPhrase, const std::string& solution);
+    GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& specificReasonPhrase, const std::string& solution);
 
     static
     std::string
-    GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& speicificReasonPhrase, const std::string& solution, const std::string& error);
+    GetHtml(HMODULE module, int page, USHORT statusCode, USHORT subStatusCode, const std::string& specificReasonPhrase, const std::string& solution, const std::string& error);
 
 private:
+
     static
     HRESULT
     IsPathUnc(
         __in  LPCWSTR       pszPath,
         __out BOOL *        pfIsUnc
     );
-
 };
 

src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/resource.h

@@ -24,18 +24,18 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE 
+1 TEXTINCLUDE
 BEGIN
     "resource.h\0"
 END
 
-2 TEXTINCLUDE 
+2 TEXTINCLUDE
 BEGIN
     "#include ""winres.h""\r\n"
     "\0"
 END
 
-3 TEXTINCLUDE 
+3 TEXTINCLUDE
 BEGIN
     "\r\n"
     "\0"
@@ -49,7 +49,7 @@ END
 // HTML
 //
 
-IN_PROCESS_RH_STATIC_HTML               HTML                    "InProcessRhStaticHtml.htm"
+ANCM_ERROR_PAGE               HTML                     "..\\..\\AspNetCoreModuleV2\\AspNetCore\\ancm_error_page.htm"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////

src/Servers/IIS/AspNetCoreModuleV2/CommonLib/file_utility.h

@@ -59,7 +59,7 @@
     <ResourceCompile Include="inprocessrequesthandler.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="InProcessRhStaticHtml.htm">
+    <None Include="..\..\AspNetCore\ancm_error_page.htm">
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="Source.def" />

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/HtmlResponses.rc

@@ -140,12 +140,11 @@ CreateApplication(
             auto content = !g_errorPageContent.empty() ?
                 g_errorPageContent :
                 FILE_UTILITY::GetHtml(g_hServerModule,
-                    IN_PROCESS_RH_STATIC_HTML,
+                    ANCM_ERROR_PAGE,
                     errorContext.statusCode,
                     errorContext.subStatusCode,
                     errorContext.generalErrorType,
-                    errorContext.errorReason,
-                    "");
+                    errorContext.errorReason);
 
             auto pErrorApplication = std::make_unique<StartupExceptionApplication>(*pServer,
                 *pHttpApplication,

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj

@@ -2,10 +2,10 @@
 // Microsoft Visual C++ generated include file.
 // Used by HtmlResponses.rc
 //
-#define IN_PROCESS_RH_STATIC_HTML                       101
+#define ANCM_ERROR_PAGE                 101
 
 // Next default values for new objects
-// 
+//
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        102

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRhStaticHtml.htm

@@ -49,7 +49,7 @@ END
 // HTML
 //
 
-OUT_OF_PROCESS_RH_STATIC_HTML               HTML                    "OutOfProcessRhStaticHtml.htm"
+ANCM_ERROR_PAGE               HTML                    "..\\..\\AspNetCoreModuleV2\\AspNetCore\\ancm_error_page.htm"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////

src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp

@@ -68,7 +68,7 @@
     <ResourceCompile Include="outofprocessrequesthandler.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="OutOfProcessRhStaticHtml.htm">
+    <None Include="..\..\AspNetCore\ancm_error_page.htm">
       <DeploymentContent>true</DeploymentContent>
     </None>
     <None Include="Source.def" />