Address conflicts and update test baselines as part of the rebase pro…

…cess.
dotnet · Sep 12, 2024 · fa27350 · fa27350
1 parent 935b81f
commit fa27350
Show file tree

Hide file tree

Showing 11 changed files with 107 additions and 10 deletions.
diff --git a/.../Baselines/ContractTypeNamedReservedKeyword/ContractTypeNamedReservedKeyword/Reference.cs b/.../Baselines/ContractTypeNamedReservedKeyword/ContractTypeNamedReservedKeyword/Reference.cs
@@ -265,6 +265,13 @@ 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));
         }
 
+        #if !NET6_0_OR_GREATER
+        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));
+        }
+        #endif
+
         private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration)
         {
             if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IService1))

diff --git a/...otnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs b/...otnet-svcutil/lib/tests/Baselines/FederationServiceTest/Saml2IssuedToken_mex/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(Saml2IssuedToken_mex_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<Saml2IssuedToken_mex_NS.TestFaultsResponse> TestFaultsAsync(Saml2IssuedToken_mex_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<Saml2IssuedToken_mex_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(Saml2IssuedToken_mex_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2642,6 +2646,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((Saml2IssuedToken_mex_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));

diff --git a/...ntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs b/...ntimeBasicHttpsTransSecMessCredsUserName/BasicHttpsTransSecMessCredsUserName/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttpsTransSecMessCredsUserName_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttpsTransSecMessCredsUserName_NS.TestFaultsResponse> TestFaultsAsync(BasicHttpsTransSecMessCredsUserName_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttpsTransSecMessCredsUserName_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(BasicHttpsTransSecMessCredsUserName_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2642,6 +2646,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((BasicHttpsTransSecMessCredsUserName_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));

diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttp/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttp_NS.TestFaultsResponse> TestFaultsAsync(BasicHttp_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttp_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(BasicHttp_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2642,6 +2646,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((BasicHttp_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));

diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeBasicSvcs/BasicHttps/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BasicHttps_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttps_NS.TestFaultsResponse> TestFaultsAsync(BasicHttps_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<BasicHttps_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(BasicHttps_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2642,6 +2646,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((BasicHttps_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));

diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttp/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttp_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttp_NS.TestFaultsResponse> TestFaultsAsync(NetHttp_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttp_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(NetHttp_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2642,6 +2646,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((NetHttp_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));

diff --git a/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/WcfRuntimeNetHttpSvcs/NetHttpWebSockets/Reference.cs
@@ -616,8 +616,8 @@ public interface IWcfService
         System.Threading.Tasks.Task TestFaultIntAsync(int faultCode);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/TestFaults", ReplyAction="http://tempuri.org/IWcfService/TestFaultsResponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault", Name="FaultDetail", Namespace="http://www.contoso.com/wcfnamespace")]
+        [System.ServiceModel.FaultContractAttribute(typeof(NetHttpWebSockets_NS.FaultDetail), Action="http://tempuri.org/IWcfService/TestFaultFaultDetailFault2", Name="FaultDetail2", Namespace="http://www.contoso.com/wcfnamespace")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttpWebSockets_NS.TestFaultsResponse> TestFaultsAsync(NetHttpWebSockets_NS.TestFaultsRequest request);
 
@@ -752,6 +752,10 @@ public interface IWcfService
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/GetRequestHttpHeaders", ReplyAction="http://tempuri.org/IWcfService/GetRequestHttpHeadersResponse")]
         [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
         System.Threading.Tasks.Task<NetHttpWebSockets_NS.GetRequestHttpHeadersResponse> GetRequestHttpHeadersAsync(NetHttpWebSockets_NS.GetRequestHttpHeadersRequest request);
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IWcfService/EchoReturnTask", ReplyAction="http://tempuri.org/IWcfService/EchoReturnTaskResponse")]
+        [System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
+        System.Threading.Tasks.Task EchoReturnTaskAsync();
     }
 
     [System.Diagnostics.DebuggerStepThroughAttribute()]
@@ -2649,6 +2653,11 @@ public System.Threading.Tasks.Task<bool> IsHttpKeepAliveDisabledAsync()
             return ((NetHttpWebSockets_NS.IWcfService)(this)).GetRequestHttpHeadersAsync(inValue);
         }
 
+        public System.Threading.Tasks.Task EchoReturnTaskAsync()
+        {
+            return base.Channel.EchoReturnTaskAsync();
+        }
+
         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));