dotnet-svcutil test: fix ParamsFiles and typereuse cases

dotnet · Apr 23, 2023 · aec76d9 · aec76d9
1 parent bac8d09
commit aec76d9
Show file tree

Hide file tree

Showing 23 changed files with 39 additions and 352 deletions.
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs
diff --git a/...ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs → ...ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs b/...ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs → ...ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TFnet5_0_NS
+namespace TFnet8_0_NS
 {
     using System.Runtime.Serialization;
 
@@ -72,25 +72,25 @@ public string StringValue
     }
 
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
-    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet5_0_NS.ITypeReuseSvc")]
+    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet8_0_NS.ITypeReuseSvc")]
     public interface ITypeReuseSvc
     {
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")]
-        System.Threading.Tasks.Task<TFnet5_0_NS.BinLibrary> GetDataAsync(int value);
+        System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")]
-        System.Threading.Tasks.Task<TFnet5_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet5_0_NS.TypeReuseCompositeType composite);
+        System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite);
     }
 
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
-    public interface ITypeReuseSvcChannel : TFnet5_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
+    public interface ITypeReuseSvcChannel : TFnet8_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
     {
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
     [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
-    public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TFnet5_0_NS.ITypeReuseSvc>, TFnet5_0_NS.ITypeReuseSvc
+    public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TFnet8_0_NS.ITypeReuseSvc>, TFnet8_0_NS.ITypeReuseSvc
     {
 
         /// <summary>
@@ -133,12 +133,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S
         {
         }
 
-        public System.Threading.Tasks.Task<TFnet5_0_NS.BinLibrary> GetDataAsync(int value)
+        public System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value)
         {
             return base.Channel.GetDataAsync(value);
         }
 
-        public System.Threading.Tasks.Task<TFnet5_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet5_0_NS.TypeReuseCompositeType composite)
+        public System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite)
         {
             return base.Channel.GetDataUsingDataContractAsync(composite);
         }
@@ -148,11 +148,6 @@ public virtual System.Threading.Tasks.Task OpenAsync()
             return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginOpen(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndOpen));
         }
 
-        public virtual System.Threading.Tasks.Task CloseAsync()
-        {
-            return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action<System.IAsyncResult>(((System.ServiceModel.ICommunicationObject)(this)).EndClose));
-        }
-
         private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
         {
             if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc))

diff --git a/...amsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj → ...amsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj b/...amsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj → ...amsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj
@@ -4,6 +4,8 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
     <LangVersion>latest</LangVersion>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.ServiceModel.*", Version="N.N.N">

diff --git a/...les_SDK_TFM/TFnet5_0/TFnet5_0.params.json → ...les_SDK_TFM/TFnet8_0/TFnet8_0.params.json b/...les_SDK_TFM/TFnet5_0/TFnet5_0.params.json → ...les_SDK_TFM/TFnet8_0/TFnet8_0.params.json
@@ -1,18 +1,18 @@
 {
-  "providerId": "TFnet5_0",
+  "providerId": "TFnet8_0",
   "version": "99.99.99",
   "options": {
     "inputs": [
       "$testCasesPath$/wsdl/Simple.wsdl"
     ],
-    "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet5_0",
+    "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet8_0",
     "namespaceMappings": [
-      "*, TFnet5_0_NS"
+      "*, TFnet8_0_NS"
     ],
     "noLogo": true,
     "noTelemetry": true,
-    "outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0",
-    "projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj",
+    "outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0",
+    "projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj",
     "references": [
       "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}"
     ],

diff --git a/...K_TFM/TFnet5_0/dotnet-svcutil.params.json → ...K_TFM/TFnet8_0/dotnet-svcutil.params.json b/...K_TFM/TFnet5_0/dotnet-svcutil.params.json → ...K_TFM/TFnet8_0/dotnet-svcutil.params.json
@@ -6,7 +6,7 @@
       "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl"
     ],
     "namespaceMappings": [
-      "*, TFnet5_0_NS"
+      "*, TFnet8_0_NS"
     ],
     "outputFile": "Reference.cs",
     "references": [

diff --git a/.../ParamsFiles_SDK_TFM/TFnet5_0/global.json → .../ParamsFiles_SDK_TFM/TFnet8_0/global.json b/.../ParamsFiles_SDK_TFM/TFnet5_0/global.json → .../ParamsFiles_SDK_TFM/TFnet8_0/global.json
diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs
diff --git a/...dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs b/...dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs
diff --git a/...et-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj b/...et-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj
diff --git a/...cutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json b/...cutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json
diff --git a/...vcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json b/...vcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json