Skip to content

Commit 21d9e40

Browse files
imcarolwangimcarolwang
authored
dotnet-svcutil: add reference to wcf package 8.0 for client project (#5443)
* dotnet-svcutil: add reference to wcf package 8.0 for client project, update test baselines
1 parent 0bcbd55 commit 21d9e40

File tree

45 files changed

+177
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+177
-8
lines changed

‎src/dotnet-svcutil/lib/src/CodeDomFixup/CodeDomVisitors/AddAsyncOpenClose.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public AddAsyncOpenClose(CommandProcessorOptions options)
3838
string[] vers = version.Split('.');
3939
if (vers.Length > 1)
4040
{
41-
Version v = new Version(int.Parse(vers[0]), int.Parse(vers[1]));
41+
Version v = new Version(int.Parse(vers[0]), int.TryParse(vers[1], out int minor) ? minor : 0);
4242
// For .NETCore targetframework found in the referenced table, generate CloseAsync() when WCF package version is less than 4.10
4343
if (v.CompareTo(new Version(4, 10)) < 0)
4444
{

‎src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,22 @@ internal class TargetFrameworkHelper
6666
ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.8.*")
6767
} },
6868
{new Version("6.0"), new List<ProjectDependency> {
69-
ProjectDependency.FromPackage("System.ServiceModel.Duplex", "6.0.*" ),
70-
ProjectDependency.FromPackage("System.ServiceModel.Http", "6.0.*" ),
71-
ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "6.0.*" ),
72-
ProjectDependency.FromPackage("System.ServiceModel.Security", "6.0.*"),
73-
ProjectDependency.FromPackage("System.ServiceModel.Federation", "6.0.*"),
74-
ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "6.0.*")
69+
ProjectDependency.FromPackage("System.ServiceModel.Http", "6.2.*"),
70+
ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "6.2.*"),
71+
ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "6.2.*"),
72+
ProjectDependency.FromPackage("System.ServiceModel.Primitives", "6.2.*"),
73+
ProjectDependency.FromPackage("System.ServiceModel.Federation", "6.2.*"),
74+
ProjectDependency.FromPackage("System.ServiceModel.UnixDomainSocket", "6.2.*"),
75+
ProjectDependency.FromPackage("System.Web.Services.Description", "6.2.*")
76+
} },
77+
{new Version("8.0"), new List<ProjectDependency> {
78+
ProjectDependency.FromPackage("System.ServiceModel.Http", "8.*"),
79+
ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "8.*"),
80+
ProjectDependency.FromPackage("System.ServiceModel.NetNamedPipe", "8.*"),
81+
ProjectDependency.FromPackage("System.ServiceModel.Primitives", "8.*"),
82+
ProjectDependency.FromPackage("System.ServiceModel.Federation", "8.*"),
83+
ProjectDependency.FromPackage("System.ServiceModel.UnixDomainSocket", "8.*"),
84+
ProjectDependency.FromPackage("System.Web.Services.Description", "8.*")
7585
} }
7686
};
7787

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,19 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
</PropertyGroup>
79
<ItemGroup>
810
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
912
</ItemGroup>
1013
<ItemGroup>
1114
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1215
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1316
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1417
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
1518
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">
19+
<PackageReference Include="System.Web.Services.Description", Version="N.N.N">
1620
</ItemGroup>
1721
</Project>

0 commit comments

Comments
 (0)