[dotnet-svcutil] Expand --collectionType tests to cover issue 5869.

src/dotnet-svcutil/lib/tests/Baselines/CollectionTypeOptionTests/GenericBaseline/GenericBaseline.csproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <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>

src/dotnet-svcutil/lib/tests/Baselines/CollectionTypeOptionTests/GenericBaseline/ServiceReference/Reference.cs

@@ -0,0 +1,235 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GenericBaseline_NS
+{
+    using System.Runtime.Serialization;
+
+
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="CollectionContainer", Namespace="http://schemas.datacontract.org/2004/07/CollectionTestService")]
+    public partial class CollectionContainer : object
+    {
+
+        private System.Collections.Generic.List<string> NamesField;
+
+        private System.Collections.Generic.List<int> NumbersField;
+
+        private System.Collections.Generic.List<double> ValuesField;
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Collections.Generic.List<string> Names
+        {
+            get
+            {
+                return this.NamesField;
+            }
+            set
+            {
+                this.NamesField = value;
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Collections.Generic.List<int> Numbers
+        {
+            get
+            {
+                return this.NumbersField;
+            }
+            set
+            {
+                this.NumbersField = value;
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Collections.Generic.List<double> Values
+        {
+            get
+            {
+                return this.ValuesField;
+            }
+            set
+            {
+                this.ValuesField = value;
+            }
+        }
+    }
+
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
+    [System.Runtime.Serialization.DataContractAttribute(Name="DictionaryContainer", Namespace="http://schemas.datacontract.org/2004/07/CollectionTestService")]
+    public partial class DictionaryContainer : object
+    {
+
+        private System.Collections.Generic.Dictionary<int, string> ReverseLookupField;
+
+        private System.Collections.Generic.Dictionary<string, int> ScoresField;
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Collections.Generic.Dictionary<int, string> ReverseLookup
+        {
+            get
+            {
+                return this.ReverseLookupField;
+            }
+            set
+            {
+                this.ReverseLookupField = value;
+            }
+        }
+
+        [System.Runtime.Serialization.DataMemberAttribute()]
+        public System.Collections.Generic.Dictionary<string, int> Scores
+        {
+            get
+            {
+                return this.ScoresField;
+            }
+            set
+            {
+                this.ScoresField = value;
+            }
+        }
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
+    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="GenericBaseline_NS.IService1")]
+    public interface IService1
+    {
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService1/GetCollections", ReplyAction="http://tempuri.org/IService1/GetCollectionsResponse")]
+        System.Threading.Tasks.Task<GenericBaseline_NS.CollectionContainer> GetCollectionsAsync();
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService1/GetDictionaries", ReplyAction="http://tempuri.org/IService1/GetDictionariesResponse")]
+        System.Threading.Tasks.Task<GenericBaseline_NS.DictionaryContainer> GetDictionariesAsync();
+
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IService1/GetOrderedDictionary", ReplyAction="http://tempuri.org/IService1/GetOrderedDictionaryResponse")]
+        System.Threading.Tasks.Task<System.Collections.Generic.Dictionary<object, object>> GetOrderedDictionaryAsync();
+    }
+
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
+    public interface IService1Channel : GenericBaseline_NS.IService1, System.ServiceModel.IClientChannel
+    {
+    }
+
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
+    public partial class Service1Client : System.ServiceModel.ClientBase<GenericBaseline_NS.IService1>, GenericBaseline_NS.IService1
+    {
+
+        /// <summary>
+        /// Implement this partial method to configure the service endpoint.
+        /// </summary>
+        /// <param name="serviceEndpoint">The endpoint to configure</param>
+        /// <param name="clientCredentials">The client credentials</param>
+        static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials);
+
+        public Service1Client() : 
+                base(Service1Client.GetDefaultBinding(), Service1Client.GetDefaultEndpointAddress())
+        {
+            this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_IService1.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+
+        public Service1Client(EndpointConfiguration endpointConfiguration) : 
+                base(Service1Client.GetBindingForEndpoint(endpointConfiguration), Service1Client.GetEndpointAddress(endpointConfiguration))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+
+        public Service1Client(EndpointConfiguration endpointConfiguration, string remoteAddress) : 
+                base(Service1Client.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress))
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+
+        public Service1Client(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(Service1Client.GetBindingForEndpoint(endpointConfiguration), remoteAddress)
+        {
+            this.Endpoint.Name = endpointConfiguration.ToString();
+            ConfigureEndpoint(this.Endpoint, this.ClientCredentials);
+        }
+
+        public Service1Client(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : 
+                base(binding, remoteAddress)
+        {
+        }
+
+        public System.Threading.Tasks.Task<GenericBaseline_NS.CollectionContainer> GetCollectionsAsync()
+        {
+            return base.Channel.GetCollectionsAsync();
+        }
+
+        public System.Threading.Tasks.Task<GenericBaseline_NS.DictionaryContainer> GetDictionariesAsync()
+        {
+            return base.Channel.GetDictionariesAsync();
+        }
+
+        public System.Threading.Tasks.Task<System.Collections.Generic.Dictionary<object, object>> GetOrderedDictionaryAsync()
+        {
+            return base.Channel.GetOrderedDictionaryAsync();
+        }
+
+        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))
+            {
+                System.ServiceModel.BasicHttpBinding result = new System.ServiceModel.BasicHttpBinding();
+                result.MaxBufferSize = int.MaxValue;
+                result.ReaderQuotas = System.Xml.XmlDictionaryReaderQuotas.Max;
+                result.MaxReceivedMessageSize = int.MaxValue;
+                result.AllowCookies = true;
+                return result;
+            }
+            throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
+        }
+
+        private static System.ServiceModel.EndpointAddress GetEndpointAddress(EndpointConfiguration endpointConfiguration)
+        {
+            if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_IService1))
+            {
+                return new System.ServiceModel.EndpointAddress("http://localhost:49773/Service1.svc");
+            }
+            throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration));
+        }
+
+        private static System.ServiceModel.Channels.Binding GetDefaultBinding()
+        {
+            return Service1Client.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_IService1);
+        }
+
+        private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress()
+        {
+            return Service1Client.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_IService1);
+        }
+
+        public enum EndpointConfiguration
+        {
+
+            BasicHttpBinding_IService1,
+        }
+    }
+}

src/dotnet-svcutil/lib/tests/Baselines/CollectionTypeOptionTests/GenericBaseline/ServiceReference/dotnet-svcutil.params.json

@@ -0,0 +1,19 @@
+{
+  "providerId": "Microsoft.Tools.ServiceModel.Svcutil",
+  "version": "99.99.99",
+  "options": {
+    "inputs": [
+      "../../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/CollectionTypes.wsdl"
+    ],
+    "collectionTypes": [
+      "System.Collections.Generic.Dictionary`2",
+      "System.Collections.Generic.List`1"
+    ],
+    "namespaceMappings": [
+      "*, GenericBaseline_NS"
+    ],
+    "outputFile": "Reference.cs",
+    "targetFramework": "N.N",
+    "typeReuseMode": "All"
+  }
+}

src/dotnet-svcutil/lib/tests/Baselines/CollectionTypeOptionTests/GenericSortedDict/GenericSortedDict.csproj

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <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>