Skip to content

Commit aec76d9

Browse files
imcarolwangimcarolwang
committed
dotnet-svcutil test: fix ParamsFiles and typereuse cases
1 parent bac8d09 commit aec76d9

23 files changed

+39
-352
lines changed

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs

-12
This file was deleted.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs

+8-13
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace TFnet5_0_NS
10+
namespace TFnet8_0_NS
1111
{
1212
using System.Runtime.Serialization;
1313

@@ -72,25 +72,25 @@ public string StringValue
7272
}
7373

7474
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
75-
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet5_0_NS.ITypeReuseSvc")]
75+
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet8_0_NS.ITypeReuseSvc")]
7676
public interface ITypeReuseSvc
7777
{
7878

7979
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")]
80-
System.Threading.Tasks.Task<TFnet5_0_NS.BinLibrary> GetDataAsync(int value);
80+
System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value);
8181

8282
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")]
83-
System.Threading.Tasks.Task<TFnet5_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet5_0_NS.TypeReuseCompositeType composite);
83+
System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite);
8484
}
8585

8686
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
87-
public interface ITypeReuseSvcChannel : TFnet5_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
87+
public interface ITypeReuseSvcChannel : TFnet8_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
8888
{
8989
}
9090

9191
[System.Diagnostics.DebuggerStepThroughAttribute()]
9292
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
93-
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TFnet5_0_NS.ITypeReuseSvc>, TFnet5_0_NS.ITypeReuseSvc
93+
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TFnet8_0_NS.ITypeReuseSvc>, TFnet8_0_NS.ITypeReuseSvc
9494
{
9595

9696
/// <summary>
@@ -133,12 +133,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S
133133
{
134134
}
135135

136-
public System.Threading.Tasks.Task<TFnet5_0_NS.BinLibrary> GetDataAsync(int value)
136+
public System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value)
137137
{
138138
return base.Channel.GetDataAsync(value);
139139
}
140140

141-
public System.Threading.Tasks.Task<TFnet5_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet5_0_NS.TypeReuseCompositeType composite)
141+
public System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite)
142142
{
143143
return base.Channel.GetDataUsingDataContractAsync(composite);
144144
}
@@ -148,11 +148,6 @@ public virtual System.Threading.Tasks.Task OpenAsync()
148148
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
149149
}
150150

151-
public virtual System.Threading.Tasks.Task CloseAsync()
152-
{
153-
return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
154-
}
155-
156151
private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
157152
{
158153
if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc))

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
66
<LangVersion>latest</LangVersion>
7+
<ImplicitUsings>enable</ImplicitUsings>
8+
<Nullable>enable</Nullable>
79
</PropertyGroup>
810
<ItemGroup>
911
<PackageReference Include="System.ServiceModel.*", Version="N.N.N">

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.params.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"providerId": "TFnet5_0",
2+
"providerId": "TFnet8_0",
33
"version": "99.99.99",
44
"options": {
55
"inputs": [
66
"$testCasesPath$/wsdl/Simple.wsdl"
77
],
8-
"bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet5_0",
8+
"bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet8_0",
99
"namespaceMappings": [
10-
"*, TFnet5_0_NS"
10+
"*, TFnet8_0_NS"
1111
],
1212
"noLogo": true,
1313
"noTelemetry": true,
14-
"outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0",
15-
"projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj",
14+
"outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0",
15+
"projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj",
1616
"references": [
1717
"Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}"
1818
],

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/dotnet-svcutil.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/dotnet-svcutil.params.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl"
77
],
88
"namespaceMappings": [
9-
"*, TFnet5_0_NS"
9+
"*, TFnet8_0_NS"
1010
],
1111
"outputFile": "Reference.cs",
1212
"references": [

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/global.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/global.json

File renamed without changes.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs

-195
This file was deleted.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs

-12
This file was deleted.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj

-14
This file was deleted.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json

-22
This file was deleted.

Diff for: ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json

-18
This file was deleted.

0 commit comments

Comments
 (0)