Add pSpec parameter to CreateVersionConflictException for future version info enhancement

Copilot · agocke · Copilot · commit 1596431265e2 · 2026-02-04T07:37:51.000Z
Co-authored-by: agocke &lt;515774+agocke@users.noreply.github.com&gt;
diff --git a/src/coreclr/vm/clrex.cpp b/src/coreclr/vm/clrex.cpp
@@ -1669,21 +1669,21 @@ BOOL EEFileLoadException::CheckType(Exception* ex)
 
 // Helper method to create a FileLoadException with custom message for version conflicts
 /* static */
-EEFileLoadException* EEFileLoadException::CreateVersionConflictException(const SString &name, Exception *pInnerException)
+EEFileLoadException* EEFileLoadException::CreateVersionConflictException(const SString &name, Exception *pInnerException, AssemblySpec *pSpec)
 {
     // Create exception with FUSION_E_REF_DEF_MISMATCH to maintain backward compatibility
     // (existing code checks for this HRESULT, e.g., Marshal.cs)
     EEFileLoadException *pException = new EEFileLoadException(name, FUSION_E_REF_DEF_MISMATCH, pInnerException);
     
-    // Use FUSION_E_APP_DOMAIN_LOCKED's message which specifically describes version conflicts:
-    // "The requested assembly version conflicts with what is already bound..."
-    // This provides a clearer error than FUSION_E_REF_DEF_MISMATCH's generic message.
+    // Build custom message with version conflict details
+    // The name parameter already includes the full requested assembly identity with version
     StackSString formatString;
     formatString.LoadResource(IDS_EE_FILELOAD_ERROR_GENERIC);
     StackSString versionMessage;
     GetHRMsg(FUSION_E_APP_DOMAIN_LOCKED, versionMessage);
     StackSString customMessage;
     customMessage.FormatMessage(FORMAT_MESSAGE_FROM_STRING, formatString.GetUnicode(), 0, 0, name, versionMessage);
+    
     pException->m_customMessage.Set(customMessage);
     
     return pException;
@@ -1718,7 +1718,7 @@ void DECLSPEC_NORETURN EEFileLoadException::Throw(AssemblySpec  *pSpec, HRESULT
     // message to provide clearer information about version conflicts.
     if (hr == FUSION_E_APP_DOMAIN_LOCKED)
     {
-        EEFileLoadException *pException = CreateVersionConflictException(name, pInnerException);
+        EEFileLoadException *pException = CreateVersionConflictException(name, pInnerException, pSpec);
         PAL_CPP_THROW(EEFileLoadException *, pException);
     }
 
diff --git a/src/coreclr/vm/clrex.h b/src/coreclr/vm/clrex.h
@@ -694,7 +694,7 @@ class EEFileLoadException : public EEException
     }
 
     // Helper method to create exception with custom message for version conflicts
-    static EEFileLoadException* CreateVersionConflictException(const SString &name, Exception *pInnerException);
+    static EEFileLoadException* CreateVersionConflictException(const SString &name, Exception *pInnerException, AssemblySpec *pSpec = NULL);
 
  private:
 #ifdef _DEBUG

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ class EEFileLoadException : public EEException`
`694`	`694`	`}`
`695`	`695`
`696`	`696`	`// Helper method to create exception with custom message for version conflicts`
`697`		`- static EEFileLoadException* CreateVersionConflictException(const SString &name, Exception *pInnerException);`
	`697`	`+ static EEFileLoadException* CreateVersionConflictException(const SString &name, Exception pInnerException, AssemblySpec pSpec = NULL);`
`698`	`698`
`699`	`699`	`private:`
`700`	`700`	`#ifdef _DEBUG`