Fix regression on desktop introduce by #2164

[tfs-changeset: 1553409]

diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp
index a868babc40b8a1e6615ee2170db77cc047a1c8bd..d89146dbfa5576c1f9af271086746a824898b148 100644 (file)
--- a/src/vm/appdomain.cpp
+++ b/src/vm/appdomain.cpp
@@ -3693,7 +3693,7 @@ void SystemDomain::ExecuteMainMethod(HMODULE hMod, __in_opt LPWSTR path /*=NULL*
         pDomain->GetMulticoreJitManager().AutoStartProfile(pDomain);
 #endif
 
-        pDomain->m_pRootAssembly->ExecuteMainMethod(NULL, FALSE /* waitForOtherThreads */);
+        pDomain->m_pRootAssembly->ExecuteMainMethod(NULL, TRUE /* waitForOtherThreads */);
     }
 
     pThread->ReturnToContext(&frame);

diff --git a/src/vm/appdomainnative.cpp b/src/vm/appdomainnative.cpp
index ebc7d3339df0548468e388356cc84e6153ac84f6..1091e6b91ff008827d5816a7cdc5b95b6717e210 100644 (file)
--- a/src/vm/appdomainnative.cpp
+++ b/src/vm/appdomainnative.cpp
@@ -538,7 +538,7 @@ INT32 AppDomainNative::ExecuteAssemblyHelper(Assembly* pAssembly,
 
     EE_TRY_FOR_FINALLY(Param *, pParam, &param)
     {
-        pParam->iRetVal = pParam->pAssembly->ExecuteMainMethod(pParam->pStringArgs, TRUE /* waitForOtherThreads */);
+        pParam->iRetVal = pParam->pAssembly->ExecuteMainMethod(pParam->pStringArgs, FALSE /* waitForOtherThreads */);
     }
     EE_FINALLY 
     {

diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp
index bb6404cb38beec0ccc1344f70c4fe2a152dd6a8b..0944a78768be6946a7e9cc1a01a6abb51d0b0f26 100644 (file)
--- a/src/vm/corhost.cpp
+++ b/src/vm/corhost.cpp
@@ -2555,7 +2555,7 @@ VOID CorHost2::ExecuteMainInner(Assembly* pRootAssembly)
                // since this is the thread 0 entry point for AppX apps we use
                // the EntryPointFilter so that an unhandled exception here will
                // trigger the same behavior as in classic apps.
-        pParam->pRootAssembly->ExecuteMainMethod(NULL, FALSE /* waitForOtherThreads */);
+        pParam->pRootAssembly->ExecuteMainMethod(NULL, TRUE /* waitForOtherThreads */);
     }
     PAL_EXCEPT_FILTER(EntryPointFilter)
     {