From dd38848702a4d5b9aed45f4b6ff77b16141a764e Mon Sep 17 00:00:00 2001 From: Yongseop Kim Date: Tue, 5 Sep 2017 18:00:39 +0900 Subject: [PATCH 21/29] Revert "Enable loading directly ni file for dotnet-launcher" This reverts commit 3ead73093ab67643a6f313f2148812c3ad668d7c. --- src/vm/appdomain.cpp | 3 +-- src/vm/coreassemblyspec.cpp | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/vm/appdomain.cpp b/src/vm/appdomain.cpp index 2b1ae1a..bd05991 100644 --- a/src/vm/appdomain.cpp +++ b/src/vm/appdomain.cpp @@ -7180,8 +7180,7 @@ EndTry2:; // Use CoreClr's fusion alternative CoreBindResult bindResult; - BOOL fExplicitBindToNativeImage = (g_fAllowNativeImages) ? TRUE: FALSE; - pSpec->Bind(this, fThrowOnFileNotFound, &bindResult, FALSE /* fNgenExplicitBind */, fExplicitBindToNativeImage, pCallerStackMark); + pSpec->Bind(this, fThrowOnFileNotFound, &bindResult, FALSE /* fNgenExplicitBind */, FALSE /* fExplicitBindToNativeImage */, pCallerStackMark); hrBindResult = bindResult.GetHRBindResult(); if (bindResult.Found()) diff --git a/src/vm/coreassemblyspec.cpp b/src/vm/coreassemblyspec.cpp index 2c3fba5..1d3567e 100644 --- a/src/vm/coreassemblyspec.cpp +++ b/src/vm/coreassemblyspec.cpp @@ -163,7 +163,7 @@ VOID AssemblySpec::Bind(AppDomain *pAppDomain, else if(m_wszCodeBase==NULL) { // For name based binding these arguments shouldnt have been changed from default - //_ASSERTE(!fNgenExplicitBind && !fExplicitBindToNativeImage); + _ASSERTE(!fNgenExplicitBind && !fExplicitBindToNativeImage); SafeComHolder pName; hr = CreateAssemblyNameObject(&pName, assemblyDisplayName, CANOF_PARSE_DISPLAY_NAME, NULL); if (SUCCEEDED(hr)) -- 2.7.4