Feedback

Author: jkotalik

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

@@ -3,8 +3,6 @@
 
 #include "applicationinfo.h"
 
-#include "rpcdce.h"
-#include "Rpc.h"
 #include "proxymodule.h"
 #include "HostFxrResolver.h"
 #include "debugutil.h"
@@ -93,7 +91,7 @@ APPLICATION_INFO::CreateApplication(IHttpContext& pHttpContext)
             m_pApplication = make_application<ServerErrorApplication>(
                 pHttpApplication,
                 E_FAIL,
-                false /* disableStartupPage */,
+                options.QueryDisableStartupPage() /* disableStartupPage */,
                 "" /* responseContent */,
                 503i16 /* statusCode */,
                 0i16 /* subStatusCode */,
@@ -192,7 +190,7 @@ APPLICATION_INFO::TryCreateApplication(IHttpContext& pHttpContext, const ShimOpt
         }
     }
 
-    std::filesystem::path shadowCopyPath = HandleShadowCopy(options, pHttpContext);
+    auto shadowCopyPath = HandleShadowCopy(options, pHttpContext);
 
     RETURN_IF_FAILED(m_handlerResolver.GetApplicationFactory(*pHttpContext.GetApplication(), shadowCopyPath, m_pApplicationFactory, options, error));
     LOG_INFO(L"Creating handler application");
@@ -253,7 +251,7 @@ APPLICATION_INFO::ShutDownApplication(const bool fServerInitiated)
     m_pApplicationFactory = nullptr;
 }
 
-std::wstring
+std::filesystem::path
 APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHttpContext)
 {
     std::filesystem::path shadowCopyPath;
@@ -289,11 +287,12 @@ APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHt
             {
                 try
                 {
-                    int intFileName = std::stoi(entry.path().filename().string());
+                    auto tempDirName = entry.path().filename().string();
+                    int intFileName = std::stoi(tempDirName);
                     if (intFileName > directoryName)
                     {
                         directoryName = intFileName;
-                        directoryNameStr = entry.path().filename().string();
+                        directoryNameStr = tempDirName;
                     }
                 }
                 catch (...)

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

@@ -79,7 +79,7 @@ class APPLICATION_INFO: NonCopyable
     HRESULT
     TryCreateApplication(IHttpContext& pHttpContext, const ShimOptions& options, ErrorContext& error);
 
-    std::wstring
+    std::filesystem::path
     HandleShadowCopy(const ShimOptions& options, IHttpContext& pHttpContext);
 
     IHttpServer            &m_pServer;

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

@@ -81,6 +81,7 @@ IN_PROCESS_APPLICATION::StopClr()
 
     const auto waitResult = WaitForMultipleObjects(2, waitHandles, FALSE, m_pConfig->QueryShutdownTimeLimitInMS());
 
+    // If waitResults != WAIT_OBJECT_0 + 1, it means main hasn't returned, so okay to call into it.
     if (!m_blockManagedCallbacks && waitResult != WAIT_OBJECT_0 + 1)
     {
         // We cannot call into managed if the dll is detaching from the process.

src/Servers/IIS/IIS/perf/Microbenchmarks/Properties/launchSettings.json

@@ -0,0 +1,40 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": true,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:5762/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "ANCM IIS Express": {
+      "commandName": "Executable",
+      "executablePath": "$(IISExpressPath)",
+      "commandLineArgs": "$(IISExpressArguments)",
+      "environmentVariables": {
+        "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+        "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
+        "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
+        "LAUNCHER_ARGS": "$(TargetPath)",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "LAUNCHER_PATH": "$(DotNetPath)",
+        "ASPNETCORE_MODULE_DEBUG": "console"
+      }
+    },
+    "ANCM IIS": {
+      "commandName": "Executable",
+      "executablePath": "$(IISPath)",
+      "commandLineArgs": "$(IISArguments)",
+      "environmentVariables": {
+        "IIS_SITE_PATH": "$(MSBuildThisFileDirectory)",
+        "ANCMV2_PATH": "$(AspNetCoreModuleV2ShimDll)",
+        "ASPNETCORE_MODULE_OUTOFPROCESS_HANDLER": "$(AspNetCoreModuleV2OutOfProcessHandlerDll)",
+        "LAUNCHER_ARGS": "$(TargetPath)",
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "LAUNCHER_PATH": "$(DotNetPath)",
+        "ASPNETCORE_MODULE_DEBUG": "console"
+      }
+    }
+  }
+}