Merge pull request #3831 from dotnet-bot/from-tfs

Merge changes from TFS

Author: sergiy-k

src/tools/crossgen/crossgen.cpp

@@ -850,6 +850,14 @@ int _cdecl wmain(int argc, __in_ecount(argc) WCHAR **argv)
 
 #ifdef FEATURE_CORECLR
     SString ssTPAList;  
+
+    if (fCreatePDB)
+    {
+        // While creating PDB, assembly binder gives preference to files in TPA.
+        // This can create difficulties if the input file is not in TPA.
+        // To avoid this issue, put the input file as the first item in TPA.
+        ssTPAList.Append(pwzFilename);
+    }
 
     // Are we compiling mscorlib.dll? 
     bool fCompilingMscorlib = StringEndsWith((LPWSTR)pwzFilename, W("mscorlib.dll"));

src/vm/compile.cpp

@@ -4812,8 +4812,10 @@ HRESULT __stdcall CreatePdb(CORINFO_ASSEMBLY_HANDLE hAssembly, BSTR pNativeImage
     if (!fAtLeastOneNativeModuleFound)
     {
         GetSvcLogger()->Printf(
+            W("Loaded image '%s' (for input file '%s') is not a native image.\n"),
+            pAssembly->GetManifestFile()->GetPath().GetUnicode(),
             pNativeImagePath);
-        return E_FAIL;
+        return CORDBG_E_NO_IMAGE_AVAILABLE;
     }
 
     GetSvcLogger()->Printf(