@@ -6,7 +6,7 @@ internal class Program
6
6
{
7
7
/// <summary>
8
8
/// This app validates a NuGet package is formed correctly. Currently it only validates that all types in the
9
- /// netstandard2.0 reference assembly are type forwarded for .NET Framework
9
+ /// netstandard2.0 reference assembly are type forwarded for .NET Framework.
10
10
/// </summary>
11
11
/// <param name="package">The NuGet package to validate</param>
12
12
/// <param name="verbose">Turns on verbose output</param>
@@ -34,15 +34,21 @@ private static int Main(FileInfo package, bool verbose)
34
34
var netFxLibEntries = zipArchive . Entries . Where ( e => e . FullName . StartsWith ( "lib/net4" ) ) ;
35
35
if ( ! netFxLibEntries . Any ( ) )
36
36
{
37
- Console . Error . WriteLine ( "Expected assemblies in a lib/net4?? folder, none found" ) ;
37
+ Console . Error . WriteLine ( "No assemblies found in a lib/net4?? folder. No type forwards to check." ) ;
38
+ Console . Error . WriteLine ( "If netfx isn't intended to be supported, this is expected." ) ;
38
39
return 1 ;
39
40
}
40
41
41
42
var netstandardRefEntries = zipArchive . Entries . Where ( e => e . FullName . StartsWith ( "ref/netstandard2.0/" ) ) ;
42
43
if ( ! netstandardRefEntries . Any ( ) )
43
44
{
44
- Console . Error . WriteLine ( "Expected assemblies in the ref/netstandard2.0 folder, none found" ) ;
45
- return 1 ;
45
+ Console . Error . WriteLine ( "No assemblies in the ref/netstandard2.0 folder, checking lib/netstandard2.0" ) ;
46
+ netstandardRefEntries = zipArchive . Entries . Where ( e => e . FullName . StartsWith ( "lib/netstandard2.0/" ) ) ;
47
+ if ( ! netstandardRefEntries . Any ( ) )
48
+ {
49
+ Console . Error . WriteLine ( "No assemblies in the lib/netstandard2.0 folder" ) ;
50
+ return 1 ;
51
+ }
46
52
}
47
53
48
54
var runtimeFolder = @"C:\Windows\Microsoft.NET\Framework64\v4.0.30319\" ;
0 commit comments