diff --git a/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs b/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs index 162e7ccb610..122b4643cd7 100644 --- a/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs +++ b/src/dotnet-svcutil/lib/src/Bootstrapper/SvcutilBootstrapper.cs @@ -123,16 +123,20 @@ internal async Task GenerateProjectAsync(bool keepBootstrapperDir, ILogger logge this.MSBuildProj = await MSBuildProj.DotNetNewAsync(projectFullPath, logger, cancellationToken).ConfigureAwait(false); this.MSBuildProj.AddDependency(svcutilPkgRef); + // Comment out code below for reasons: 1. it never used for .net core later than V2.1 since when the approach is always use TF from the generated project. + // 2. with below code applied when target framework is netstandard2.0 client machine require netcoreapp2.0 (obsolete) for bootstrapper to work + // 3. keep it here for future reference in case when we need definite bootstrapper TF version + // NOTE: If post v2.0 NetStandard ships a different version from NetCore the table below needs to be updated! - var targetFramework = frameworkInfo.FullName; - if (isSupportedTFM && frameworkInfo.IsKnownDnx) - { - if (frameworkInfo.Name == FrameworkInfo.Netstandard) - { - targetFramework = FrameworkInfo.Netcoreapp + TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version]; - } - this.MSBuildProj.TargetFramework = targetFramework; - } + //var targetFramework = frameworkInfo.FullName; + //if (isSupportedTFM && frameworkInfo.IsKnownDnx) + //{ + // if (frameworkInfo.Name == FrameworkInfo.Netstandard) + // { + // targetFramework = FrameworkInfo.Netcoreapp + TargetFrameworkHelper.NetStandardToNetCoreVersionMap[frameworkInfo.Version]; + // } + // this.MSBuildProj.TargetFramework = targetFramework; + //} // else // The TFM is unknown: either, it was not provided or it is a version not yet known to the tool, // we will use the default TF from the generated project. diff --git a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs index f674c700a7a..0181a28dc99 100644 --- a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs +++ b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs @@ -63,6 +63,14 @@ internal class TargetFrameworkHelper ProjectDependency.FromPackage("System.ServiceModel.Http", "4.8.*" ), ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.8.*" ), ProjectDependency.FromPackage("System.ServiceModel.Security", "4.8.*"), + ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.8.*") + } }, + {new Version("6.0"), new List { + ProjectDependency.FromPackage("System.ServiceModel.Duplex", "4.9.*" ), + ProjectDependency.FromPackage("System.ServiceModel.Http", "4.9.*" ), + ProjectDependency.FromPackage("System.ServiceModel.NetTcp", "4.9.*" ), + ProjectDependency.FromPackage("System.ServiceModel.Security", "4.9.*"), + ProjectDependency.FromPackage("System.ServiceModel.Federation", "4.9.*") } } }; @@ -81,6 +89,7 @@ internal class TargetFrameworkHelper ProjectDependency.FromPackage("System.Private.ServiceModel", "*"), ProjectDependency.FromPackage("System.ServiceModel.Security", "*"), ProjectDependency.FromPackage("System.Xml.XmlSerializer", "*"), + ProjectDependency.FromPackage("System.ServiceModel.Federation", "*") }; public static Version MinSupportedNetFxVersion { get; } = new Version("4.5"); diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/array/array.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/arrayList/arrayList.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/collection/collection.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/dictionary/dictionary.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hashTable/hashTable.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/hybridDictionary/hybridDictionary.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/linkedList/linkedList.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/list/list.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/listDictionary/listDictionary.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/observableCollection/observableCollection.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/orderedDictionary/orderedDictionary.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedDictionary/sortedDictionary.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedList/sortedList.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/Collections/sortedListNonGeneric/sortedListNonGeneric.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/mexParam/mexParam.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/noQuery/noQuery.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/singleWsdlQuery/singleWsdlQuery.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/MetadataQuery/wsdlQuery/wsdlQuery.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj index 8bee087cea0..5a8cf333d18 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj @@ -5,9 +5,10 @@ N.N - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj index 6790e9f70bb..fb142659118 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj @@ -5,9 +5,9 @@ N.N - - - - + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/net90/net90.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm100/tfm100.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm20/tfm20.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfm45/tfm45.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFM/tfmDefault/tfmDefault.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfm100/tfm100.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfm100/tfm100.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfm100/tfm100.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfm100/tfm100.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/tfmDefault.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/Reference.cs new file mode 100644 index 00000000000..88ed2ea7101 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/Reference.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace tfmNet50_NS +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="BinLibrary", Namespace="http://schemas.datacontract.org/2004/07/BinLib")] + public partial class BinLibrary : object + { + + private string ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="TypeReuseCompositeType", Namespace="http://schemas.datacontract.org/2004/07/TypesLib")] + public partial class TypeReuseCompositeType : object + { + + private bool BoolValueField; + + private string StringValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool BoolValue + { + get + { + return this.BoolValueField; + } + set + { + this.BoolValueField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string StringValue + { + get + { + return this.StringValueField; + } + set + { + this.StringValueField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="tfmNet50_NS.ITypeReuseSvc")] + public interface ITypeReuseSvc + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")] + System.Threading.Tasks.Task GetDataAsync(int value); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")] + System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNet50_NS.TypeReuseCompositeType composite); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + public interface ITypeReuseSvcChannel : tfmNet50_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, tfmNet50_NS.ITypeReuseSvc + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public TypeReuseSvcClient() : + base(TypeReuseSvcClient.GetDefaultBinding(), TypeReuseSvcClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), TypeReuseSvcClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetDataAsync(int value) + { + return base.Channel.GetDataAsync(value); + } + + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNet50_NS.TypeReuseCompositeType composite) + { + return base.Channel.GetDataUsingDataContractAsync(composite); + } + + 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.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.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc)) + { + 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_ITypeReuseSvc)) + { + return new System.ServiceModel.EndpointAddress("http://localhost:51074/TypeReuseSvc.svc"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return TypeReuseSvcClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return TypeReuseSvcClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_ITypeReuseSvc, + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..6fd729bc84f --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,26 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$testCasesPath$/wsdl/Simple.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TFMBootstrap/tfmNet50", + "namespaceMappings": [ + "*, tfmNet50_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TFMBootstrap/tfmNet50/../tfmNet50", + "outputFile": "$resultPath$/TestResults/TFMBootstrap/tfmNet50/Reference.cs", + "projectFile": "$resultPath$/TestResults/TFMBootstrap/tfmNet50/tfmNet50.csproj", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "toolContext": "Bootstrapper", + "typeReuseMode": "Specified", + "verbosity": "Minimal" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/Program.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/Program.cs similarity index 100% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/Program.cs rename to src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/Program.cs diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..23f71bd0d34 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,14 @@ + + + + Exe + N.N + + + + + $resultPath$/TestResults/TFMBootstrap/tfmNet50/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/dotnet-svcutil.params.json new file mode 100644 index 00000000000..af3849cb989 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/dotnet-svcutil.params.json @@ -0,0 +1,18 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" + ], + "namespaceMappings": [ + "*, tfmNet50_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "typeReuseMode": "Specified" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/global.json similarity index 100% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/global.json rename to src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/global.json diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/nuget.config b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/nuget.config similarity index 100% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/nuget.config rename to src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/nuget.config diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.cs new file mode 100644 index 00000000000..609e06f1fdf --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.cs @@ -0,0 +1,18 @@ +using System; +using Microsoft.Tools.ServiceModel.Svcutil; +using System.Linq; +using System.Text.RegularExpressions; + +namespace tfmNet50 +{ + class Program + { + static int Main(string[] args) + { + var re = new Regex(@"'[^\""]*'|[^\""^\s]+|""[^\""]*"""); + string optstring = @"""$testCasesPath$/wsdl/Simple.wsdl"" -tf net5.0 -r ""{Newtonsoft.Json,*}"" -bd $resultPath$/TestResults/TFMBootstrap/tfmNet50 -nl -tc global -v minimal -d ../tfmNet50 -n ""*,tfmNet50_NS"""; + string[] opts = re.Matches(optstring).Cast().Select(m => m.Value).ToArray(); + return Tool.Main(opts); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.csproj new file mode 100644 index 00000000000..1acf18bf1bd --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet50/tfmNet50.csproj @@ -0,0 +1,17 @@ + + + + Exe + N.N + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/Reference.cs new file mode 100644 index 00000000000..1223d2a3671 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/Reference.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace tfmNet60_NS +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="BinLibrary", Namespace="http://schemas.datacontract.org/2004/07/BinLib")] + public partial class BinLibrary : object + { + + private string ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="TypeReuseCompositeType", Namespace="http://schemas.datacontract.org/2004/07/TypesLib")] + public partial class TypeReuseCompositeType : object + { + + private bool BoolValueField; + + private string StringValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool BoolValue + { + get + { + return this.BoolValueField; + } + set + { + this.BoolValueField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string StringValue + { + get + { + return this.StringValueField; + } + set + { + this.StringValueField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="tfmNet60_NS.ITypeReuseSvc")] + public interface ITypeReuseSvc + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")] + System.Threading.Tasks.Task GetDataAsync(int value); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")] + System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNet60_NS.TypeReuseCompositeType composite); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + public interface ITypeReuseSvcChannel : tfmNet60_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, tfmNet60_NS.ITypeReuseSvc + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public TypeReuseSvcClient() : + base(TypeReuseSvcClient.GetDefaultBinding(), TypeReuseSvcClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), TypeReuseSvcClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetDataAsync(int value) + { + return base.Channel.GetDataAsync(value); + } + + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNet60_NS.TypeReuseCompositeType composite) + { + return base.Channel.GetDataUsingDataContractAsync(composite); + } + + 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.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.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc)) + { + 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_ITypeReuseSvc)) + { + return new System.ServiceModel.EndpointAddress("http://localhost:51074/TypeReuseSvc.svc"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return TypeReuseSvcClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return TypeReuseSvcClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_ITypeReuseSvc, + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..563ca524c23 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,26 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$testCasesPath$/wsdl/Simple.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TFMBootstrap/tfmNet60", + "namespaceMappings": [ + "*, tfmNet60_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TFMBootstrap/tfmNet60/../tfmNet60", + "outputFile": "$resultPath$/TestResults/TFMBootstrap/tfmNet60/Reference.cs", + "projectFile": "$resultPath$/TestResults/TFMBootstrap/tfmNet60/tfmNet60.csproj", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "toolContext": "Bootstrapper", + "typeReuseMode": "Specified", + "verbosity": "Minimal" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Program.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Program.cs new file mode 100644 index 00000000000..188ef615cd1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/Program.cs @@ -0,0 +1,8 @@ +using System; +namespace SvcutilBootstrap { + public class Program { + public static int Main(string[] args) { + return Microsoft.Tools.ServiceModel.Svcutil.Tool.Main(args); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..db2bb4e528f --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,14 @@ + + + + Exe + N.N + + + + + $resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/dotnet-svcutil.params.json new file mode 100644 index 00000000000..6116a002266 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/dotnet-svcutil.params.json @@ -0,0 +1,18 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" + ], + "namespaceMappings": [ + "*, tfmNet60_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "typeReuseMode": "Specified" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/global.json new file mode 100644 index 00000000000..7a7ec0adddb --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/global.json @@ -0,0 +1 @@ +{ "sdk": { "version": "99.99.99" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/nuget.config b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/nuget.config new file mode 100644 index 00000000000..c2e7a5b0ff0 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.cs new file mode 100644 index 00000000000..1340f7a085b --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.cs @@ -0,0 +1,18 @@ +using System; +using Microsoft.Tools.ServiceModel.Svcutil; +using System.Linq; +using System.Text.RegularExpressions; + +namespace tfmNet60 +{ + class Program + { + static int Main(string[] args) + { + var re = new Regex(@"'[^\""]*'|[^\""^\s]+|""[^\""]*"""); + string optstring = @"""$testCasesPath$/wsdl/Simple.wsdl"" -tf net6.0 -r ""{Newtonsoft.Json,*}"" -bd $resultPath$/TestResults/TFMBootstrap/tfmNet60 -nl -tc global -v minimal -d ../tfmNet60 -n ""*,tfmNet60_NS"""; + string[] opts = re.Matches(optstring).Cast().Select(m => m.Value).ToArray(); + return Tool.Main(opts); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj new file mode 100644 index 00000000000..1acf18bf1bd --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/tfmNet60.csproj @@ -0,0 +1,17 @@ + + + + Exe + N.N + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/Reference.cs new file mode 100644 index 00000000000..0b277c8038f --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/Reference.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace tfmNetCoreapp31_NS +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="BinLibrary", Namespace="http://schemas.datacontract.org/2004/07/BinLib")] + public partial class BinLibrary : object + { + + private string ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="TypeReuseCompositeType", Namespace="http://schemas.datacontract.org/2004/07/TypesLib")] + public partial class TypeReuseCompositeType : object + { + + private bool BoolValueField; + + private string StringValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool BoolValue + { + get + { + return this.BoolValueField; + } + set + { + this.BoolValueField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string StringValue + { + get + { + return this.StringValueField; + } + set + { + this.StringValueField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="tfmNetCoreapp31_NS.ITypeReuseSvc")] + public interface ITypeReuseSvc + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")] + System.Threading.Tasks.Task GetDataAsync(int value); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")] + System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNetCoreapp31_NS.TypeReuseCompositeType composite); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + public interface ITypeReuseSvcChannel : tfmNetCoreapp31_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, tfmNetCoreapp31_NS.ITypeReuseSvc + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public TypeReuseSvcClient() : + base(TypeReuseSvcClient.GetDefaultBinding(), TypeReuseSvcClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), TypeReuseSvcClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetDataAsync(int value) + { + return base.Channel.GetDataAsync(value); + } + + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNetCoreapp31_NS.TypeReuseCompositeType composite) + { + return base.Channel.GetDataUsingDataContractAsync(composite); + } + + 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.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.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc)) + { + 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_ITypeReuseSvc)) + { + return new System.ServiceModel.EndpointAddress("http://localhost:51074/TypeReuseSvc.svc"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return TypeReuseSvcClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return TypeReuseSvcClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_ITypeReuseSvc, + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..9365e348ea8 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,26 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$testCasesPath$/wsdl/Simple.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31", + "namespaceMappings": [ + "*, tfmNetCoreapp31_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31/../tfmNetCoreapp31", + "outputFile": "$resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31/Reference.cs", + "projectFile": "$resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.csproj", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "toolContext": "Bootstrapper", + "typeReuseMode": "Specified", + "verbosity": "Minimal" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Program.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Program.cs new file mode 100644 index 00000000000..188ef615cd1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/Program.cs @@ -0,0 +1,8 @@ +using System; +namespace SvcutilBootstrap { + public class Program { + public static int Main(string[] args) { + return Microsoft.Tools.ServiceModel.Svcutil.Tool.Main(args); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..95e0b4d78c1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,14 @@ + + + + Exe + N.N + + + + + $resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/dotnet-svcutil.params.json new file mode 100644 index 00000000000..46379056b4d --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/dotnet-svcutil.params.json @@ -0,0 +1,18 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" + ], + "namespaceMappings": [ + "*, tfmNetCoreapp31_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "N.N", + "typeReuseMode": "Specified" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/global.json new file mode 100644 index 00000000000..7a7ec0adddb --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/global.json @@ -0,0 +1 @@ +{ "sdk": { "version": "99.99.99" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/nuget.config b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/nuget.config new file mode 100644 index 00000000000..c2e7a5b0ff0 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.cs new file mode 100644 index 00000000000..37d8415e669 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.cs @@ -0,0 +1,18 @@ +using System; +using Microsoft.Tools.ServiceModel.Svcutil; +using System.Linq; +using System.Text.RegularExpressions; + +namespace tfmNetCoreapp31 +{ + class Program + { + static int Main(string[] args) + { + var re = new Regex(@"'[^\""]*'|[^\""^\s]+|""[^\""]*"""); + string optstring = @"""$testCasesPath$/wsdl/Simple.wsdl"" -tf netcoreapp3.1 -r ""{Newtonsoft.Json,*}"" -bd $resultPath$/TestResults/TFMBootstrap/tfmNetCoreapp31 -nl -tc global -v minimal -d ../tfmNetCoreapp31 -n ""*,tfmNetCoreapp31_NS"""; + string[] opts = re.Matches(optstring).Cast().Select(m => m.Value).ToArray(); + return Tool.Main(opts); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.csproj new file mode 100644 index 00000000000..1acf18bf1bd --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetCoreapp31/tfmNetCoreapp31.csproj @@ -0,0 +1,17 @@ + + + + Exe + N.N + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/tfmNetstd20.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/Reference.cs new file mode 100644 index 00000000000..298fa984d94 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/Reference.cs @@ -0,0 +1,195 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace tfmNetstd21_NS +{ + using System.Runtime.Serialization; + + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="BinLibrary", Namespace="http://schemas.datacontract.org/2004/07/BinLib")] + public partial class BinLibrary : object + { + + private string ValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public string Value + { + get + { + return this.ValueField; + } + set + { + this.ValueField = value; + } + } + } + + [System.Diagnostics.DebuggerStepThroughAttribute()] + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.Runtime.Serialization.DataContractAttribute(Name="TypeReuseCompositeType", Namespace="http://schemas.datacontract.org/2004/07/TypesLib")] + public partial class TypeReuseCompositeType : object + { + + private bool BoolValueField; + + private string StringValueField; + + [System.Runtime.Serialization.DataMemberAttribute()] + public bool BoolValue + { + get + { + return this.BoolValueField; + } + set + { + this.BoolValueField = value; + } + } + + [System.Runtime.Serialization.DataMemberAttribute()] + public string StringValue + { + get + { + return this.StringValueField; + } + set + { + this.StringValueField = value; + } + } + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="tfmNetstd21_NS.ITypeReuseSvc")] + public interface ITypeReuseSvc + { + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")] + System.Threading.Tasks.Task GetDataAsync(int value); + + [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")] + System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNetstd21_NS.TypeReuseCompositeType composite); + } + + [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] + public interface ITypeReuseSvcChannel : tfmNetstd21_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, tfmNetstd21_NS.ITypeReuseSvc + { + + /// + /// Implement this partial method to configure the service endpoint. + /// + /// The endpoint to configure + /// The client credentials + static partial void ConfigureEndpoint(System.ServiceModel.Description.ServiceEndpoint serviceEndpoint, System.ServiceModel.Description.ClientCredentials clientCredentials); + + public TypeReuseSvcClient() : + base(TypeReuseSvcClient.GetDefaultBinding(), TypeReuseSvcClient.GetDefaultEndpointAddress()) + { + this.Endpoint.Name = EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), TypeReuseSvcClient.GetEndpointAddress(endpointConfiguration)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, string remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), new System.ServiceModel.EndpointAddress(remoteAddress)) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(EndpointConfiguration endpointConfiguration, System.ServiceModel.EndpointAddress remoteAddress) : + base(TypeReuseSvcClient.GetBindingForEndpoint(endpointConfiguration), remoteAddress) + { + this.Endpoint.Name = endpointConfiguration.ToString(); + ConfigureEndpoint(this.Endpoint, this.ClientCredentials); + } + + public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) : + base(binding, remoteAddress) + { + } + + public System.Threading.Tasks.Task GetDataAsync(int value) + { + return base.Channel.GetDataAsync(value); + } + + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(tfmNetstd21_NS.TypeReuseCompositeType composite) + { + return base.Channel.GetDataUsingDataContractAsync(composite); + } + + 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.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.ServiceModel.ICommunicationObject)(this)).EndClose)); + } + + private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) + { + if ((endpointConfiguration == EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc)) + { + 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_ITypeReuseSvc)) + { + return new System.ServiceModel.EndpointAddress("http://localhost:51074/TypeReuseSvc.svc"); + } + throw new System.InvalidOperationException(string.Format("Could not find endpoint with name \'{0}\'.", endpointConfiguration)); + } + + private static System.ServiceModel.Channels.Binding GetDefaultBinding() + { + return TypeReuseSvcClient.GetBindingForEndpoint(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + private static System.ServiceModel.EndpointAddress GetDefaultEndpointAddress() + { + return TypeReuseSvcClient.GetEndpointAddress(EndpointConfiguration.BasicHttpBinding_ITypeReuseSvc); + } + + public enum EndpointConfiguration + { + + BasicHttpBinding_ITypeReuseSvc, + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..2e0beef4b73 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,26 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$testCasesPath$/wsdl/Simple.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TFMBootstrap/tfmNetstd21", + "namespaceMappings": [ + "*, tfmNetstd21_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/../tfmNetstd21", + "outputFile": "$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/Reference.cs", + "projectFile": "$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "netstandard2.1", + "toolContext": "Bootstrapper", + "typeReuseMode": "Specified", + "verbosity": "Minimal" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Program.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Program.cs new file mode 100644 index 00000000000..188ef615cd1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/Program.cs @@ -0,0 +1,8 @@ +using System; +namespace SvcutilBootstrap { + public class Program { + public static int Main(string[] args) { + return Microsoft.Tools.ServiceModel.Svcutil.Tool.Main(args); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..726c406c2de --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,14 @@ + + + + Exe + N.N + + + + + $resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/dotnet-svcutil.params.json new file mode 100644 index 00000000000..da6a2780ff1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/dotnet-svcutil.params.json @@ -0,0 +1,18 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" + ], + "namespaceMappings": [ + "*, tfmNetstd21_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "Newtonsoft.Json, {Newtonsoft.Json, *}" + ], + "targetFramework": "netstandard2.1", + "typeReuseMode": "Specified" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/global.json new file mode 100644 index 00000000000..7a7ec0adddb --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/global.json @@ -0,0 +1 @@ +{ "sdk": { "version": "99.99.99" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/nuget.config b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/nuget.config new file mode 100644 index 00000000000..c2e7a5b0ff0 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.cs b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.cs new file mode 100644 index 00000000000..5d4eab9af33 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.cs @@ -0,0 +1,18 @@ +using System; +using Microsoft.Tools.ServiceModel.Svcutil; +using System.Linq; +using System.Text.RegularExpressions; + +namespace tfmNetstd21 +{ + class Program + { + static int Main(string[] args) + { + var re = new Regex(@"'[^\""]*'|[^\""^\s]+|""[^\""]*"""); + string optstring = @"""$testCasesPath$/wsdl/Simple.wsdl"" -tf netstandard2.1 -r ""{Newtonsoft.Json,*}"" -bd $resultPath$/TestResults/TFMBootstrap/tfmNetstd21 -nl -tc global -v minimal -d ../tfmNetstd21 -n ""*,tfmNetstd21_NS"""; + string[] opts = re.Matches(optstring).Cast().Select(m => m.Value).ToArray(); + return Tool.Main(opts); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj new file mode 100644 index 00000000000..1acf18bf1bd --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/tfmNetstd21.csproj @@ -0,0 +1,17 @@ + + + + Exe + N.N + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobal100/tfmGlobal100.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobal100/tfmGlobal100.csproj index 8bee087cea0..5a8cf333d18 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobal100/tfmGlobal100.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobal100/tfmGlobal100.csproj @@ -5,9 +5,10 @@ N.N - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalCoreapp20/tfmGlobalCoreapp20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalCoreapp20/tfmGlobalCoreapp20.csproj index 8bee087cea0..5a8cf333d18 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalCoreapp20/tfmGlobalCoreapp20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalCoreapp20/tfmGlobalCoreapp20.csproj @@ -5,9 +5,10 @@ N.N - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj index 8bee087cea0..5a8cf333d18 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/tfmGlobalDefault.csproj @@ -5,9 +5,10 @@ N.N - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj index 8bee087cea0..5a8cf333d18 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/tfmGlobalNetstd20.csproj @@ -5,9 +5,10 @@ N.N - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/dotnet-svcutil.params.json deleted file mode 100644 index cd838e50b71..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/dotnet-svcutil.params.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "providerId": "Microsoft.Tools.ServiceModel.Svcutil", - "version": "99.99.99", - "options": { - "inputs": [ - "../../TypeReuseSvc.wsdl" - ], - "namespaceMappings": [ - "*, TypeReuse20_NS" - ], - "outputFile": "Reference.cs", - "references": [ - "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "$resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/BinLib.dll", - "$resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/TypesLib.dll", - "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}", - "Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}", - "Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}", - "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}", - "NuGet.Common, {NuGet.Common, 99.99.99}", - "NuGet.Configuration, {NuGet.Configuration, 99.99.99}", - "NuGet.DependencyResolver.Core, {NuGet.DependencyResolver.Core, 99.99.99}", - "NuGet.Frameworks, {NuGet.Frameworks, 99.99.99}", - "NuGet.LibraryModel, {NuGet.LibraryModel, 99.99.99}", - "NuGet.Packaging, {NuGet.Packaging, 99.99.99}", - "NuGet.ProjectModel, {NuGet.ProjectModel, 99.99.99}", - "NuGet.Protocol, {NuGet.Protocol, 99.99.99}", - "NuGet.Versioning, {NuGet.Versioning, 99.99.99}", - "System.Security.Cryptography.Cng, {System.Security.Cryptography.Cng, 99.99.99}", - "System.Security.Cryptography.Pkcs, {System.Security.Cryptography.Pkcs, 99.99.99}", - "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}" - ], - "targetFramework": "N.N", - "typeReuseMode": "All" - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json deleted file mode 100644 index 877f1a9c44c..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", - "version": "99.99.99", - "options": { - "inputs": [ - "$resultPath$/TestResults/TypeReuse/TypeReuseSvc.wsdl" - ], - "bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse20", - "namespaceMappings": [ - "*, TypeReuse20_NS" - ], - "noBootstrapping": true, - "noLogo": true, - "noProjectUpdates": true, - "outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse20/ServiceReference", - "outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse20/ServiceReference/Reference.cs", - "projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse20/TypeReuse20.csproj", - "references": [ - "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "$resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/BinLib.dll", - "$resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/TypesLib.dll", - "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}", - "Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}", - "Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}", - "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}", - "NuGet.Common, {NuGet.Common, 99.99.99}", - "NuGet.Configuration, {NuGet.Configuration, 99.99.99}", - "NuGet.DependencyResolver.Core, {NuGet.DependencyResolver.Core, 99.99.99}", - "NuGet.Frameworks, {NuGet.Frameworks, 99.99.99}", - "NuGet.LibraryModel, {NuGet.LibraryModel, 99.99.99}", - "NuGet.Packaging, {NuGet.Packaging, 99.99.99}", - "NuGet.ProjectModel, {NuGet.ProjectModel, 99.99.99}", - "NuGet.Protocol, {NuGet.Protocol, 99.99.99}", - "NuGet.Versioning, {NuGet.Versioning, 99.99.99}", - "System.Security.Cryptography.Cng, {System.Security.Cryptography.Cng, 99.99.99}", - "System.Security.Cryptography.Pkcs, {System.Security.Cryptography.Pkcs, 99.99.99}", - "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}" - ], - "targetFramework": "N.N", - "toolContext": "Bootstrapper", - "typeReuseMode": "All", - "verbosity": "Minimal" - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/SvcutilBootstrapper.csproj deleted file mode 100644 index 196b4584ed5..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - Exe - N.N - - - - - $repositoryRoot$/.packages/dotnet-svcutil-lib/99.99.99/lib/netstandard2.0/dotnet-svcutil-lib.dll - - - $resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/BinLib.dll - - - $resultPath$/TestResults/TypeReuse/TypeReuse20/bin/Debug/netcoreapp2.0/TypesLib.dll - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs similarity index 97% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs index bc4f3946473..724d1384018 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/ServiceReference/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs @@ -7,12 +7,12 @@ // //------------------------------------------------------------------------------ -namespace TypeReuse20_NS +namespace TypeReuse60_NS { [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse20_NS.ITypeReuseSvc")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse60_NS.ITypeReuseSvc")] public interface ITypeReuseSvc { @@ -24,13 +24,13 @@ public interface ITypeReuseSvc } [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - public interface ITypeReuseSvcChannel : TypeReuse20_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel + public interface ITypeReuseSvcChannel : TypeReuse60_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, TypeReuse20_NS.ITypeReuseSvc + public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, TypeReuse60_NS.ITypeReuseSvc { /// diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/dotnet-svcutil.params.json new file mode 100644 index 00000000000..2595387fb6e --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/dotnet-svcutil.params.json @@ -0,0 +1,85 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../TypeReuseSvc.wsdl" + ], + "namespaceMappings": [ + "*, TypeReuse60_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", + "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//TypesLib.dll", + "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}", + "Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}", + "Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}", + "Microsoft.Win32.Primitives, {Microsoft.Win32.Primitives, 99.99.99}", + "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}", + "NuGet.Common, {NuGet.Common, 99.99.99}", + "NuGet.Configuration, {NuGet.Configuration, 99.99.99}", + "NuGet.DependencyResolver.Core, {NuGet.DependencyResolver.Core, 99.99.99}", + "NuGet.Frameworks, {NuGet.Frameworks, 99.99.99}", + "NuGet.LibraryModel, {NuGet.LibraryModel, 99.99.99}", + "NuGet.Packaging, {NuGet.Packaging, 99.99.99}", + "NuGet.ProjectModel, {NuGet.ProjectModel, 99.99.99}", + "NuGet.Protocol, {NuGet.Protocol, 99.99.99}", + "NuGet.Versioning, {NuGet.Versioning, 99.99.99}", + "System.AppContext, {System.AppContext, 99.99.99}", + "System.Collections, {System.Collections, 99.99.99}", + "System.Collections.Concurrent, {System.Collections.Concurrent, 99.99.99}", + "System.Console, {System.Console, 99.99.99}", + "System.Diagnostics.Debug, {System.Diagnostics.Debug, 99.99.99}", + "System.Diagnostics.Tools, {System.Diagnostics.Tools, 99.99.99}", + "System.Diagnostics.Tracing, {System.Diagnostics.Tracing, 99.99.99}", + "System.Dynamic.Runtime, {System.Dynamic.Runtime, 99.99.99}", + "System.Globalization, {System.Globalization, 99.99.99}", + "System.Globalization.Calendars, {System.Globalization.Calendars, 99.99.99}", + "System.IO, {System.IO, 99.99.99}", + "System.IO.Compression, {System.IO.Compression, 99.99.99}", + "System.IO.Compression.ZipFile, {System.IO.Compression.ZipFile, 99.99.99}", + "System.IO.FileSystem, {System.IO.FileSystem, 99.99.99}", + "System.IO.FileSystem.Primitives, {System.IO.FileSystem.Primitives, 99.99.99}", + "System.Linq, {System.Linq, 99.99.99}", + "System.Linq.Expressions, {System.Linq.Expressions, 99.99.99}", + "System.Net.Http, {System.Net.Http, 99.99.99}", + "System.Net.Primitives, {System.Net.Primitives, 99.99.99}", + "System.Net.Sockets, {System.Net.Sockets, 99.99.99}", + "System.ObjectModel, {System.ObjectModel, 99.99.99}", + "System.Reflection, {System.Reflection, 99.99.99}", + "System.Reflection.Emit, {System.Reflection.Emit, 99.99.99}", + "System.Reflection.Emit.ILGeneration, {System.Reflection.Emit.ILGeneration, 99.99.99}", + "System.Reflection.Extensions, {System.Reflection.Extensions, 99.99.99}", + "System.Reflection.Primitives, {System.Reflection.Primitives, 99.99.99}", + "System.Reflection.TypeExtensions, {System.Reflection.TypeExtensions, 99.99.99}", + "System.Resources.ResourceManager, {System.Resources.ResourceManager, 99.99.99}", + "System.Runtime, {System.Runtime, 99.99.99}", + "System.Runtime.Extensions, {System.Runtime.Extensions, 99.99.99}", + "System.Runtime.Handles, {System.Runtime.Handles, 99.99.99}", + "System.Runtime.InteropServices, {System.Runtime.InteropServices, 99.99.99}", + "System.Runtime.InteropServices.RuntimeInformation, {System.Runtime.InteropServices.RuntimeInformation, 99.99.99}", + "System.Runtime.Loader, {System.Runtime.Loader, 99.99.99}", + "System.Runtime.Numerics, {System.Runtime.Numerics, 99.99.99}", + "System.Runtime.Serialization.Primitives, {System.Runtime.Serialization.Primitives, 99.99.99}", + "System.Security.Cryptography.Algorithms, {System.Security.Cryptography.Algorithms, 99.99.99}", + "System.Security.Cryptography.Cng, {System.Security.Cryptography.Cng, 99.99.99}", + "System.Security.Cryptography.Encoding, {System.Security.Cryptography.Encoding, 99.99.99}", + "System.Security.Cryptography.Pkcs, {System.Security.Cryptography.Pkcs, 99.99.99}", + "System.Security.Cryptography.Primitives, {System.Security.Cryptography.Primitives, 99.99.99}", + "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}", + "System.Security.Cryptography.X509Certificates, {System.Security.Cryptography.X509Certificates, 99.99.99}", + "System.Text.Encoding, {System.Text.Encoding, 99.99.99}", + "System.Text.Encoding.Extensions, {System.Text.Encoding.Extensions, 99.99.99}", + "System.Text.RegularExpressions, {System.Text.RegularExpressions, 99.99.99}", + "System.Threading, {System.Threading, 99.99.99}", + "System.Threading.Tasks, {System.Threading.Tasks, 99.99.99}", + "System.Threading.Timer, {System.Threading.Timer, 99.99.99}", + "System.Xml.ReaderWriter, {System.Xml.ReaderWriter, 99.99.99}", + "System.Xml.XDocument, {System.Xml.XDocument, 99.99.99}" + ], + "targetFramework": "N.N", + "typeReuseMode": "All" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..d9800a24fa5 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,93 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$resultPath$/TestResults/TypeReuse/TypeReuseSvc.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse60", + "namespaceMappings": [ + "*, TypeReuse60_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse60/ServiceReference", + "outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse60/ServiceReference/Reference.cs", + "projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse60/TypeReuse60.csproj", + "references": [ + "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", + "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//TypesLib.dll", + "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}", + "Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}", + "Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}", + "Microsoft.Win32.Primitives, {Microsoft.Win32.Primitives, 99.99.99}", + "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}", + "NuGet.Common, {NuGet.Common, 99.99.99}", + "NuGet.Configuration, {NuGet.Configuration, 99.99.99}", + "NuGet.DependencyResolver.Core, {NuGet.DependencyResolver.Core, 99.99.99}", + "NuGet.Frameworks, {NuGet.Frameworks, 99.99.99}", + "NuGet.LibraryModel, {NuGet.LibraryModel, 99.99.99}", + "NuGet.Packaging, {NuGet.Packaging, 99.99.99}", + "NuGet.ProjectModel, {NuGet.ProjectModel, 99.99.99}", + "NuGet.Protocol, {NuGet.Protocol, 99.99.99}", + "NuGet.Versioning, {NuGet.Versioning, 99.99.99}", + "System.AppContext, {System.AppContext, 99.99.99}", + "System.Collections, {System.Collections, 99.99.99}", + "System.Collections.Concurrent, {System.Collections.Concurrent, 99.99.99}", + "System.Console, {System.Console, 99.99.99}", + "System.Diagnostics.Debug, {System.Diagnostics.Debug, 99.99.99}", + "System.Diagnostics.Tools, {System.Diagnostics.Tools, 99.99.99}", + "System.Diagnostics.Tracing, {System.Diagnostics.Tracing, 99.99.99}", + "System.Dynamic.Runtime, {System.Dynamic.Runtime, 99.99.99}", + "System.Globalization, {System.Globalization, 99.99.99}", + "System.Globalization.Calendars, {System.Globalization.Calendars, 99.99.99}", + "System.IO, {System.IO, 99.99.99}", + "System.IO.Compression, {System.IO.Compression, 99.99.99}", + "System.IO.Compression.ZipFile, {System.IO.Compression.ZipFile, 99.99.99}", + "System.IO.FileSystem, {System.IO.FileSystem, 99.99.99}", + "System.IO.FileSystem.Primitives, {System.IO.FileSystem.Primitives, 99.99.99}", + "System.Linq, {System.Linq, 99.99.99}", + "System.Linq.Expressions, {System.Linq.Expressions, 99.99.99}", + "System.Net.Http, {System.Net.Http, 99.99.99}", + "System.Net.Primitives, {System.Net.Primitives, 99.99.99}", + "System.Net.Sockets, {System.Net.Sockets, 99.99.99}", + "System.ObjectModel, {System.ObjectModel, 99.99.99}", + "System.Reflection, {System.Reflection, 99.99.99}", + "System.Reflection.Emit, {System.Reflection.Emit, 99.99.99}", + "System.Reflection.Emit.ILGeneration, {System.Reflection.Emit.ILGeneration, 99.99.99}", + "System.Reflection.Extensions, {System.Reflection.Extensions, 99.99.99}", + "System.Reflection.Primitives, {System.Reflection.Primitives, 99.99.99}", + "System.Reflection.TypeExtensions, {System.Reflection.TypeExtensions, 99.99.99}", + "System.Resources.ResourceManager, {System.Resources.ResourceManager, 99.99.99}", + "System.Runtime, {System.Runtime, 99.99.99}", + "System.Runtime.Extensions, {System.Runtime.Extensions, 99.99.99}", + "System.Runtime.Handles, {System.Runtime.Handles, 99.99.99}", + "System.Runtime.InteropServices, {System.Runtime.InteropServices, 99.99.99}", + "System.Runtime.InteropServices.RuntimeInformation, {System.Runtime.InteropServices.RuntimeInformation, 99.99.99}", + "System.Runtime.Loader, {System.Runtime.Loader, 99.99.99}", + "System.Runtime.Numerics, {System.Runtime.Numerics, 99.99.99}", + "System.Runtime.Serialization.Primitives, {System.Runtime.Serialization.Primitives, 99.99.99}", + "System.Security.Cryptography.Algorithms, {System.Security.Cryptography.Algorithms, 99.99.99}", + "System.Security.Cryptography.Cng, {System.Security.Cryptography.Cng, 99.99.99}", + "System.Security.Cryptography.Encoding, {System.Security.Cryptography.Encoding, 99.99.99}", + "System.Security.Cryptography.Pkcs, {System.Security.Cryptography.Pkcs, 99.99.99}", + "System.Security.Cryptography.Primitives, {System.Security.Cryptography.Primitives, 99.99.99}", + "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}", + "System.Security.Cryptography.X509Certificates, {System.Security.Cryptography.X509Certificates, 99.99.99}", + "System.Text.Encoding, {System.Text.Encoding, 99.99.99}", + "System.Text.Encoding.Extensions, {System.Text.Encoding.Extensions, 99.99.99}", + "System.Text.RegularExpressions, {System.Text.RegularExpressions, 99.99.99}", + "System.Threading, {System.Threading, 99.99.99}", + "System.Threading.Tasks, {System.Threading.Tasks, 99.99.99}", + "System.Threading.Timer, {System.Threading.Timer, 99.99.99}", + "System.Xml.ReaderWriter, {System.Xml.ReaderWriter, 99.99.99}", + "System.Xml.XDocument, {System.Xml.XDocument, 99.99.99}" + ], + "targetFramework": "N.N", + "toolContext": "Bootstrapper", + "typeReuseMode": "All", + "verbosity": "Minimal" + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Program.cs b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Program.cs new file mode 100644 index 00000000000..188ef615cd1 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Program.cs @@ -0,0 +1,8 @@ +using System; +namespace SvcutilBootstrap { + public class Program { + public static int Main(string[] args) { + return Microsoft.Tools.ServiceModel.Svcutil.Tool.Main(args); + } + } +} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..38210e130ef --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,85 @@ + + + + Exe + N.N + + + + + $resultPath$/TestResults/TypeReuse/TypeReuse60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + $resultPath$/TestResults/TypeReuse/TypeReuse60/bin/Debug/net6.0/BinLib.dll + + + $resultPath$/TestResults/TypeReuse/TypeReuse60/bin/Debug/net6.0/TypesLib.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.cs b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.cs similarity index 73% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.cs rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.cs index b52d578b0cc..d2d3627bf81 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.cs @@ -3,14 +3,14 @@ using System.Linq; using System.Text.RegularExpressions; -namespace TypeReuse20 +namespace TypeReuse60 { class Program { static int Main(string[] args) { var re = new Regex(@"'[^\""]*'|[^\""^\s]+|""[^\""]*"""); - string optstring = @"../TypeReuseSvc.wsdl -nl -v minimal -d $resultPath$/TestResults/TypeReuse/TypeReuse20/ServiceReference -n ""*,TypeReuse20_NS"" -bd $resultPath$/TestResults/TypeReuse/TypeReuse20"; + string optstring = @"../TypeReuseSvc.wsdl -nl -v minimal -d $resultPath$/TestResults/TypeReuse/TypeReuse60/ServiceReference -n ""*,TypeReuse60_NS"" -bd $resultPath$/TestResults/TypeReuse/TypeReuse60"; string[] opts = re.Matches(optstring).Cast().Select(m => m.Value).ToArray(); return Tool.Main(opts); } diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj similarity index 62% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj index 755db6d618c..0da8c3433c5 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse20/TypeReuse20.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj @@ -14,9 +14,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/global.json new file mode 100644 index 00000000000..7a7ec0adddb --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/global.json @@ -0,0 +1 @@ +{ "sdk": { "version": "99.99.99" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/nuget.config b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/nuget.config new file mode 100644 index 00000000000..c2e7a5b0ff0 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/nuget.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefBootstrapping/UpdateServiceRefBootstrapping.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefBasic/UpdateServiceRefDefault/UpdateServiceRefDefault.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevels/UpdateRefLevels.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateRefLevelsFull/UpdateRefLevelsFull.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsDefault/UpdateServiceRefOptionsDefault.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptions/UpdateServiceRefOptionsExtraOptions.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsExtraOptionsWarn/UpdateServiceRefOptionsExtraOptionsWarn.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFilePath/UpdateServiceRefOptionsFilePath.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsFullPath/UpdateServiceRefOptionsFullPath.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef/UpdateServiceRefOptionsRef.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptionsRef2/UpdateServiceRefOptionsRef2.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces/UpdateServiceRefOptions_Folder_With_Spaces.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefOptions/UpdateServiceRefOptions_Folder_With_Spaces_Full/UpdateServiceRefOptions_Folder_With_Spaces_Full.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReference/CSServiceReference.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj index 29e2c966c8b..1acf18bf1bd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/UpdateServiceRefWCFCS/CSServiceReferenceRoundtrip/CSServiceReferenceRoundtrip.csproj @@ -8,9 +8,10 @@ - - - - + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/TestCases/updateServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/TestCases/updateServiceReference/dotnet-svcutil.params.json index 73fe0bd14a4..a2987a9b37a 100644 --- a/src/dotnet-svcutil/lib/tests/TestCases/updateServiceReference/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/TestCases/updateServiceReference/dotnet-svcutil.params.json @@ -13,6 +13,6 @@ "System.Array, System.Private.CoreLib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", "System.DateTime" ], - "targetFramework": "netcoreapp2.0" + "targetFramework": "net5.0" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/src/E2ETests.cs b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs index fd6a6bc716b..e98a95ed29d 100644 --- a/src/dotnet-svcutil/lib/tests/src/E2ETests.cs +++ b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs @@ -76,8 +76,11 @@ public void Help(string verbosity) [Trait("Category", "Test")] [Theory] [InlineData("tfmDefault", null)] - [InlineData("tfmCoreapp20", "netcoreapp2.0")] + [InlineData("tfmNetCoreapp31", "netcoreapp3.1")] + [InlineData("tfmNet50", "net5.0")] + [InlineData("tfmNet60", "net6.0")] [InlineData("tfmNetstd20", "netstandard2.0")] + [InlineData("tfmNetstd21", "netstandard2.1")] [InlineData("tfm100", "netcoreapp100.0")] public void TFMBootstrap(string testCaseName, string targetFramework) { @@ -201,7 +204,7 @@ public void NamespaceParam(string testCaseName, string options, bool expectSucce [Trait("Category", "BVT")] [Theory] - [InlineData("TypeReuse20", "netcoreapp2.0")] + [InlineData("TypeReuse60", "net6.0")] public void TypeReuse(string testCaseName, string targetFramework) { this_TestCaseName = "TypeReuse"; diff --git a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs index fc232547f76..3bcbcb8c88f 100644 --- a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs +++ b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs @@ -48,7 +48,7 @@ public void Init(string resultsPath, string testCasesPath, string projectPath, s new ReplaceInfo(@"netcoreapp\d+\.\d+", "N.N") { UseRegex = true }, //new new ReplaceInfo(@"""targetFramework"": ""net\d+\.\d+""", "\"targetFramework\": \"N.N\"") { UseRegex = true }, //new new ReplaceInfo(@"net\d+\.\d+", "N.N") { UseRegex = true }, //new - new ReplaceInfo(@"Version=""4.7.*""", @"Version=""4.4.*""") { UseRegex = true } //new + new ReplaceInfo(@"", @"") { UseRegex = true } //new }; // The result path passed in includes the directory name. Instead replace the parent. diff --git a/src/dotnet-svcutil/lib/tests/src/dotnet-svcutil-lib.Tests.csproj b/src/dotnet-svcutil/lib/tests/src/dotnet-svcutil-lib.Tests.csproj index 7cc3119bff5..e25ab03ebb6 100644 --- a/src/dotnet-svcutil/lib/tests/src/dotnet-svcutil-lib.Tests.csproj +++ b/src/dotnet-svcutil/lib/tests/src/dotnet-svcutil-lib.Tests.csproj @@ -4,7 +4,7 @@ $(IntermediateOutputPath)\$(TargetFramework)\$(MSBuildProjectName).$(TargetFramework).version.cs - netcoreapp2.1 + netcoreapp3.1 $(NoWarn)NETSDK1023 false true diff --git a/src/dotnet-svcutil/src/dotnet-svcutil.csproj b/src/dotnet-svcutil/src/dotnet-svcutil.csproj index c2a25af937d..2a35111937d 100644 --- a/src/dotnet-svcutil/src/dotnet-svcutil.csproj +++ b/src/dotnet-svcutil/src/dotnet-svcutil.csproj @@ -19,7 +19,7 @@ Exe - netcoreapp2.1;netcoreapp3.1;net5.0 + netcoreapp3.1;net5.0;net6.0 Microsoft.Tools.ServiceModel.Svcutil true