Add net6.0 support for dotnet-svcutil and update tests. (dotnet#4772)

* Add net6.0 support for dotnet-svcutil and update tests. * Remove support of netcoreapp2.1 from dotnet-svcutil.
imcarolwang · Jan 28, 2022 · cf32e7d · cf32e7d
1 parent 41d8d34
commit cf32e7d
Showing 102 changed files with 1,759 additions and 329 deletions.
diff --git a/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs b/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs
@@ -123,16 +123,20 @@ internal async Task GenerateProjectAsync(bool keepBootstrapperDir, ILogger logge
                 this.MSBuildProj = await MSBuildProj.DotNetNewAsync(projectFullPath, logger, cancellationToken).ConfigureAwait(false);
                 this.MSBuildProj.AddDependency(svcutilPkgRef);
 
+                // Comment out code below for reasons: 1. it never used for .net core later than V2.1 since when the approach is always use TF from the generated project.
+                // 2. with below code applied when target framework is netstandard2.0 client machine require netcoreapp2.0 (obsolete) for bootstrapper to work
+                // 3. keep it here for future reference in case when we need definite bootstrapper TF version
+
                 // NOTE: If post v2.0 NetStandard ships a different version from NetCore the table below needs to be updated!
-                var targetFramework = frameworkInfo.FullName;
-                if (isSupportedTFM && frameworkInfo.IsKnownDnx)
-                {
-                    if (frameworkInfo.Name == FrameworkInfo.Netstandard)
-                    {
-                        targetFramework = FrameworkInfo.Netcoreapp + TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version];
-                    }
-                    this.MSBuildProj.TargetFramework = targetFramework;
-                }
+                //var targetFramework = frameworkInfo.FullName;
+                //if (isSupportedTFM && frameworkInfo.IsKnownDnx)
+                //{
+                //    if (frameworkInfo.Name == FrameworkInfo.Netstandard)
+                //    {
+                //        targetFramework = FrameworkInfo.Netcoreapp + TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version];
+                //    }
+                //    this.MSBuildProj.TargetFramework = targetFramework;
+                //}
                 // else
                 // The TFM is unknown: either, it was not provided or it is a version not yet known to the tool,
                 // we will use the default TF from the generated project.

diff --git a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs
@@ -63,6 +63,14 @@ internal class TargetFrameworkHelper
                 ProjectDependency.FromPackage("System.ServiceModel.Http", "4.8.*"    ),
                 ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.8.*"  ),
                 ProjectDependency.FromPackage("System.ServiceModel.Security", "4.8.*"),
+                ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.8.*")
+            } },
+            {new Version("6.0"), new List<ProjectDependency> {
+                ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.9.*"  ),
+                ProjectDependency.FromPackage("System.ServiceModel.Http", "4.9.*"    ),
+                ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.9.*"  ),
+                ProjectDependency.FromPackage("System.ServiceModel.Security", "4.9.*"),
+                ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.9.*")
             } }
         };
 
@@ -81,6 +89,7 @@ internal class TargetFrameworkHelper
             ProjectDependency.FromPackage("System.Private.ServiceModel", "*"),
             ProjectDependency.FromPackage("System.ServiceModel.Security", "*"),
             ProjectDependency.FromPackage("System.Xml.XmlSerializer", "*"),
+            ProjectDependency.FromPackage("System.ServiceModel.Federation", "*")
         };
 
         public static Version MinSupportedNetFxVersion { get; } = new Version("4.5");

diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/...-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj b/...-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/...dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj b/...dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/...-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj b/...-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj
@@ -8,9 +8,10 @@
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj
@@ -5,9 +5,10 @@
     <TargetFramework>N.N</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Http" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.NetTcp" Version="4.8.*" />
-    <PackageReference Include="System.ServiceModel.Security" Version="4.8.*" />
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
+    <PackageReference Include="System.ServiceModel.*", Version="N.N.N">
   </ItemGroup>
 </Project>