mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.6.0.125

Browse Source 
Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
external/ikvm/reflect/Fusion.cs vendored
View File

@@ -219,15 +219,17 @@ namespace IKVM.Reflection
}
bool fxUnified = false;
bool versionMatch = version1 == version2;
// build and revision numbers are ignored
bool fxVersionMatch = version1.Major == version2.Major && version1.Minor == version2.Minor;
if (IsFrameworkAssembly(name1))
{
fxUnified |= !versionMatch;
fxUnified |= !fxVersionMatch;
version1 = FrameworkVersion;
}
if (IsFrameworkAssembly(name2) && version2 < FrameworkVersionNext)
{
fxUnified |= !versionMatch;
fxUnified |= !fxVersionMatch;
version2 = FrameworkVersion;
}
@@ -274,7 +276,7 @@ namespace IKVM.Reflection
return false;
}
}
else if (!versionMatch || fxUnified)
else if (fxUnified || version1 != version2)
{
result = partial ? AssemblyComparisonResult.EquivalentPartialFXUnified : AssemblyComparisonResult.EquivalentFXUnified;
return true;