Fix System.Web.Services.Description missing NetFx type forwards (#5708)

Improved PackageVerifier to handle more scenarios and have better reporting

Author: mconnew

System.ServiceModel.sln

@@ -109,6 +109,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.Shim",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.ServiceModel.NetFramingBase.Ref", "src\System.ServiceModel.NetFramingBase\ref\System.ServiceModel.NetFramingBase.Ref.csproj", "{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.Services.Description.Ref", "src\System.Web.Services.Description\ref\System.Web.Services.Description.Ref.csproj", "{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -307,6 +309,10 @@ Global
 		{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09D0456B-C1C6-40E4-AE8E-64D60189A7B2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0CF0FD4F-387F-4AF1-8509-80053EBA94CC}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

eng/GenRefAssembly.targets

@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <Target Name="AddReferenceAssemblyToPackage" AfterTargets="AssignTargetPaths">
-    <ItemGroup>
+    <ItemGroup Condition="'$(SuppressRefAssemblyTargetFrameworks)' == '' OR !$(SuppressRefAssemblyTargetFrameworks.Contains('$(TargetFramework)'))">
       <TfmSpecificPackageFile Include="@(ResolvedReferenceAssemblyReference)" PackagePath="ref/$(TargetFramework)" />
     </ItemGroup>
   </Target>

src/System.Private.ServiceModel/tools/PackageChecker/Program.cs

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

src/System.Web.Services.Description/ref/System.Web.Services.Description.Ref.csproj

@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <AssemblyVersion>$(WcfAssemblyVersion)</AssemblyVersion>
+    <StrongNameKeyId>Microsoft</StrongNameKeyId>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <AssemblyName>System.Web.Services.Description</AssemblyName>
+    <RootNamespace>System.ServiceModel</RootNamespace>
+    <CLSCompliant>true</CLSCompliant>
+    <IsShipping>$(Ship_WcfPackages)</IsShipping>
+    <IsShippingPackage>false</IsShippingPackage>
+  </PropertyGroup>
+
+</Project>