From c983bb86ddf46916206efc7cd5bc942ec8b834cb Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Thu, 27 Apr 2017 10:46:47 -0700 Subject: [WIP] Enable binding to CoreLib as NI image (#11040) Enable binding to CoreLib as NI image --- src/tools/crossgen/crossgen.cpp | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) (limited to 'src/tools') diff --git a/src/tools/crossgen/crossgen.cpp b/src/tools/crossgen/crossgen.cpp index 43e667bd25..954f4a46a8 100644 --- a/src/tools/crossgen/crossgen.cpp +++ b/src/tools/crossgen/crossgen.cpp @@ -311,35 +311,16 @@ void PopulateTPAList(SString path, LPCWSTR pwszMask, SString &refTPAList, bool f bool fAddDelimiter = (refTPAList.GetCount() > 0)?true:false; bool fAddFileToTPAList = true; LPCWSTR pwszFilename = folderEnumerator.GetFileName(); - if (fCompilingMscorlib) + + // No NIs are supported when creating NI images (other than NI of System.Private.CoreLib.dll). + if (!fCreatePDB) { - // When compiling CoreLib, no ".ni.dll" should be on the TPAList. + // Only CoreLib's ni.dll should be in the TPAList for the compilation of non-mscorlib assemblies. if (StringEndsWith((LPWSTR)pwszFilename, W(".ni.dll"))) { fAddFileToTPAList = false; } } - else - { - // When creating PDBs, we must ensure that .ni.dlls are in the TPAList - if (!fCreatePDB) - { - // Only CoreLib's ni.dll should be in the TPAList for the compilation of non-mscorlib assemblies. - if (StringEndsWith((LPWSTR)pwszFilename, W(".ni.dll"))) - { - if (!StringEndsWith((LPWSTR)pwszFilename, CoreLibName_NI_W)) - { - fAddFileToTPAList = false; - } - } - } - - // Ensure that CoreLib's IL version is also not on the TPAlist for this case. - if (StringEndsWith((LPWSTR)pwszFilename, CoreLibName_IL_W)) - { - fAddFileToTPAList = false; - } - } if (fAddFileToTPAList) { -- cgit v1.2.3