@@ -53,36 +53,34 @@ private static bool ShouldWarnIfNotToBeAbleToResolve(AssemblyName name, Dependen
5353 var isTargetNetCore = depContext . Target . Framework . StartsWith ( ".NETCoreApp," , StringComparison . Ordinal ) ;
5454
5555 if ( isTargetNetStandard || isTargetNetCore ) {
56- if (
57- string . Equals ( name . Name , "netstandard" , StringComparison . Ordinal ) &&
58- string . Equals ( publicKeyTokenString , PublicKeyTokenDotnetOpenSource , StringComparison . OrdinalIgnoreCase )
59- ) {
60- return shouldNotWarn ;
61- }
6256 }
6357
64- var isNameStartsWithOrEqualToSystem =
65- string . Equals ( name . Name , "System" , StringComparison . Ordinal ) ||
66- name . Name . StartsWith ( "System." , StringComparison . Ordinal ) ;
58+ if ( isTargetNetStandard || isTargetNetCore ) {
59+ var isNetStandardAssembly =
60+ string . Equals ( name . Name , "netstandard" , StringComparison . Ordinal ) &&
61+ string . Equals ( publicKeyTokenString , PublicKeyTokenDotnetOpenSource , StringComparison . OrdinalIgnoreCase ) ;
6762
68- if ( isNameStartsWithOrEqualToSystem ) {
69- if ( isTargetNetCore ) {
70- if (
71- string . Equals ( publicKeyTokenString , PublicKeyTokenDotnetOpenSource , StringComparison . OrdinalIgnoreCase ) ||
72- string . Equals ( publicKeyTokenString , PublicKeyTokenMicrosoft , StringComparison . OrdinalIgnoreCase )
73- ) {
74- return shouldNotWarn ;
75- }
76- }
63+ if ( isNetStandardAssembly )
64+ return shouldNotWarn ;
7765
78- if ( isTargetNetStandard ) {
79- if (
66+ var isNameSystemAssembly =
67+ string . Equals ( name . Name , "System" , StringComparison . Ordinal ) ||
68+ name . Name . StartsWith ( "System." , StringComparison . Ordinal ) ;
69+ var isSystemAssembly =
70+ isNameSystemAssembly && (
8071 string . Equals ( publicKeyTokenString , PublicKeyTokenDotnetOpenSource , StringComparison . OrdinalIgnoreCase ) ||
8172 string . Equals ( publicKeyTokenString , PublicKeyTokenMicrosoft , StringComparison . OrdinalIgnoreCase )
82- ) {
83- return shouldNotWarn ;
84- }
85- }
73+ ) ;
74+
75+ if ( isSystemAssembly )
76+ return shouldNotWarn ;
77+
78+ var isCoreLibAssembly =
79+ string . Equals ( name . Name , "mscorlib" , StringComparison . Ordinal ) &&
80+ string . Equals ( publicKeyTokenString , "7cec85d7bea7798e" /* CoreLib? */ , StringComparison . OrdinalIgnoreCase ) ;
81+
82+ if ( isCoreLibAssembly )
83+ return shouldNotWarn ;
8684 }
8785
8886 return shouldWarn ;
0 commit comments