diff --git a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs index 994961301cf..d01297a8971 100644 --- a/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs +++ b/src/dotnet-svcutil/lib/src/Shared/TargetFrameworkHelper.cs @@ -13,7 +13,7 @@ namespace Microsoft.Tools.ServiceModel.Svcutil { internal class TargetFrameworkHelper { - internal static readonly List s_currentSupportedVersions = new List() { "8.0", "9.0" }; + internal static readonly List s_currentSupportedVersions = new List() { "8.0", "9.0", "10.0" }; public static Version MinSupportedNetFxVersionForDotNet { get; } = new Version("4.5"); public static Version MinSupportedNetStandardVersion { get; } = new Version("1.3"); public static Version MinSupportedNetCoreAppVersion { get; } = new Version("1.0"); diff --git a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json index db493e18ee4..456cf54d31d 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/MultiTargetTypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json @@ -10,7 +10,7 @@ ], "outputFile": "Reference.cs", "references": [ - "$TEMP$MultiTargetTypeReuse//TypeReuseClient//bin//Debug//net6.0//BinLib.dll" + "$TEMP$MultiTargetTypeReuse//TypeReuseClient//bin//Debug//DOTNET_VERSION//BinLib.dll" ], "targetFramework": "N.N", "typeReuseMode": "All" diff --git a/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/urlNamespace/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/urlNamespace/dotnet-svcutil.params.json index 869ac08855d..5e7f70fb146 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/urlNamespace/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/urlNamespace/dotnet-svcutil.params.json @@ -12,7 +12,6 @@ "references": [ "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", "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}", @@ -24,33 +23,8 @@ "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.Diagnostics.Debug, {System.Diagnostics.Debug, 99.99.99}", - "System.Diagnostics.DiagnosticSource, {System.Diagnostics.DiagnosticSource, 99.99.99}", - "System.Dynamic.Runtime, {System.Dynamic.Runtime, 99.99.99}", - "System.IO, {System.IO, 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.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.Primitives, {System.Reflection.Primitives, 99.99.99}", - "System.Reflection.TypeExtensions, {System.Reflection.TypeExtensions, 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.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}", - "System.Text.Encoding, {System.Text.Encoding, 99.99.99}", - "System.Threading.Tasks, {System.Threading.Tasks, 99.99.99}" + "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}" ], "targetFramework": "N.N", "typeReuseMode": "All" diff --git a/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/wildcardNamespace/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/wildcardNamespace/dotnet-svcutil.params.json index 31cfcaa4477..258f7d394cf 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/wildcardNamespace/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/NamespaceParam/wildcardNamespace/dotnet-svcutil.params.json @@ -12,7 +12,6 @@ "references": [ "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", "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}", @@ -24,33 +23,8 @@ "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.Diagnostics.Debug, {System.Diagnostics.Debug, 99.99.99}", - "System.Diagnostics.DiagnosticSource, {System.Diagnostics.DiagnosticSource, 99.99.99}", - "System.Dynamic.Runtime, {System.Dynamic.Runtime, 99.99.99}", - "System.IO, {System.IO, 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.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.Primitives, {System.Reflection.Primitives, 99.99.99}", - "System.Reflection.TypeExtensions, {System.Reflection.TypeExtensions, 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.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}", - "System.Text.Encoding, {System.Text.Encoding, 99.99.99}", - "System.Threading.Tasks, {System.Threading.Tasks, 99.99.99}" + "System.Security.Cryptography.ProtectedData, {System.Security.Cryptography.ProtectedData, 99.99.99}" ], "targetFramework": "N.N", "typeReuseMode": "All" diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/Reference.cs similarity index 79% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/Reference.cs index 4b6e2d99351..ca4e96dc987 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/Reference.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace TFnetcoreapp3_1_NS +namespace ServiceReference { using System.Runtime.Serialization; @@ -34,63 +34,26 @@ public string 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="TFnetcoreapp3_1_NS.ITypeReuseSvc")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="ServiceReference.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.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(TFnetcoreapp3_1_NS.TypeReuseCompositeType composite); + System.Threading.Tasks.Task GetDataUsingDataContractAsync(TypesLib.TypeReuseCompositeType composite); } [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - public interface ITypeReuseSvcChannel : TFnetcoreapp3_1_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel + public interface ITypeReuseSvcChannel : ServiceReference.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, TFnetcoreapp3_1_NS.ITypeReuseSvc + public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, ServiceReference.ITypeReuseSvc { /// @@ -133,12 +96,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S { } - public System.Threading.Tasks.Task GetDataAsync(int value) + public System.Threading.Tasks.Task GetDataAsync(int value) { return base.Channel.GetDataAsync(value); } - public System.Threading.Tasks.Task GetDataUsingDataContractAsync(TFnetcoreapp3_1_NS.TypeReuseCompositeType composite) + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(TypesLib.TypeReuseCompositeType composite) { return base.Channel.GetDataUsingDataContractAsync(composite); } @@ -148,10 +111,12 @@ 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)); } + #if !NET6_0_OR_GREATER public virtual System.Threading.Tasks.Task CloseAsync() { return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); } + #endif private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) { diff --git a/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json new file mode 100644 index 00000000000..1376fb154f3 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/ServiceReference/dotnet-svcutil.params.json @@ -0,0 +1,20 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "$testCasesPath$/wsdl/TypeReuseSvc.wsdl" + ], + "namespaceMappings": [ + "*, ServiceReference" + ], + "outputFile": "Reference.cs", + "references": [ + "$TEMP$NetStandard20TypeReuse//TypeReuseClient//bin//Debug//netstandard2.0//TypesLib.dll", + "System.Runtime, {System.Runtime, 99.99.99}", + "System.Runtime.Serialization.Primitives, {System.Runtime.Serialization.Primitives, 99.99.99}" + ], + "targetFramework": "netstandard2.0", + "typeReuseMode": "All" + } +} \ 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/NetStandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj similarity index 77% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj index 9c06387c92c..73e32fd3907 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/NetStandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj @@ -1,10 +1,11 @@ - Exe - N.N - latest + netstandard2.0 + + + diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs similarity index 91% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs index 405cf1ae720..7b8b6b7357f 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace TFnet5_0_NS +namespace elm_NS { using System.Runtime.Serialization; @@ -72,25 +72,25 @@ public string StringValue } [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet5_0_NS.ITypeReuseSvc")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="elm_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.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(TFnet5_0_NS.TypeReuseCompositeType composite); + System.Threading.Tasks.Task GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite); } [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - public interface ITypeReuseSvcChannel : TFnet5_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel + public interface ITypeReuseSvcChannel : elm_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel { } [System.Diagnostics.DebuggerStepThroughAttribute()] [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, TFnet5_0_NS.ITypeReuseSvc + public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, elm_NS.ITypeReuseSvc { /// @@ -133,12 +133,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S { } - public System.Threading.Tasks.Task GetDataAsync(int value) + public System.Threading.Tasks.Task GetDataAsync(int value) { return base.Channel.GetDataAsync(value); } - public System.Threading.Tasks.Task GetDataUsingDataContractAsync(TFnet5_0_NS.TypeReuseCompositeType composite) + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite) { return base.Channel.GetDataUsingDataContractAsync(composite); } @@ -148,10 +148,12 @@ 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)); } + #if !NET6_0_OR_GREATER public virtual System.Threading.Tasks.Task CloseAsync() { return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); } + #endif private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) { diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/dotnet-svcutil.params.json similarity index 94% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/dotnet-svcutil.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/dotnet-svcutil.params.json index 4abe1c0d8d8..cbb25078fbc 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/dotnet-svcutil.params.json @@ -6,7 +6,7 @@ "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" ], "namespaceMappings": [ - "*, TFnet5_0_NS" + "*, elm_NS" ], "outputFile": "Reference.cs", "references": [ 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/elm/elm.csproj similarity index 80% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj index 31492323aec..c2d91e178fd 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj @@ -3,12 +3,12 @@ Exe N.N - latest + enable + enable - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.params.json b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json similarity index 52% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json index 042a5820af3..f8a25c78287 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json @@ -1,18 +1,18 @@ { - "providerId": "TFnet5_0", + "providerId": "elm", "version": "99.99.99", "options": { "inputs": [ "$testCasesPath$/wsdl/Simple.wsdl" ], - "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet5_0", + "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles/elm", "namespaceMappings": [ - "*, TFnet5_0_NS" + "*, elm_NS" ], "noLogo": true, "noTelemetry": true, - "outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0", - "projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.csproj", + "outputDir": "$resultPath$/TestResults/ParamsFiles/elm", + "projectFile": "$resultPath$/TestResults/ParamsFiles/elm/elm.csproj", "references": [ "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}" ], diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs deleted file mode 100644 index 5f31844e1b7..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/TFnet5_0.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace TFnet5_0 -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs deleted file mode 100644 index c49aca35a83..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; - -namespace TFnetcoreapp3_1 -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("Hello World!"); - } - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json deleted file mode 100644 index 0446395bb15..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.params.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "providerId": "TFnetcoreapp3_1", - "version": "99.99.99", - "options": { - "inputs": [ - "$testCasesPath$/wsdl/Simple.wsdl" - ], - "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnetcoreapp3_1", - "namespaceMappings": [ - "*, TFnetcoreapp3_1_NS" - ], - "noLogo": true, - "noTelemetry": true, - "outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnetcoreapp3_1", - "projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/TFnetcoreapp3_1.csproj", - "references": [ - "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}" - ], - "toolContext": "Global", - "verbosity": "Minimal" - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json deleted file mode 100644 index 8d60ea96930..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/dotnet-svcutil.params.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "providerId": "Microsoft.Tools.ServiceModel.Svcutil", - "version": "99.99.99", - "options": { - "inputs": [ - "../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl" - ], - "namespaceMappings": [ - "*, TFnetcoreapp3_1_NS" - ], - "outputFile": "Reference.cs", - "references": [ - "Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}" - ], - "targetFramework": "N.N", - "typeReuseMode": "Specified" - } -} \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/global.json b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/global.json deleted file mode 100644 index 7a7ec0adddb..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnetcoreapp3_1/global.json +++ /dev/null @@ -1 +0,0 @@ -{ "sdk": { "version": "99.99.99" } } \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs similarity index 96% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs index 724d1384018..1e90de02521 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs @@ -7,12 +7,12 @@ // //------------------------------------------------------------------------------ -namespace TypeReuse60_NS +namespace TypeReuse_NS { [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse60_NS.ITypeReuseSvc")] + [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse_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 : TypeReuse60_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel + public interface ITypeReuseSvcChannel : TypeReuse_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, TypeReuse60_NS.ITypeReuseSvc + public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, TypeReuse_NS.ITypeReuseSvc { /// @@ -88,10 +88,12 @@ 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)); } + #if !NET6_0_OR_GREATER public virtual System.Threading.Tasks.Task CloseAsync() { return System.Threading.Tasks.Task.Factory.FromAsync(((System.ServiceModel.ICommunicationObject)(this)).BeginClose(null, null), new System.Action(((System.ServiceModel.ICommunicationObject)(this)).EndClose)); } + #endif private static System.ServiceModel.Channels.Binding GetBindingForEndpoint(EndpointConfiguration endpointConfiguration) { diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json new file mode 100644 index 00000000000..8e84660483c --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json @@ -0,0 +1,34 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil", + "version": "99.99.99", + "options": { + "inputs": [ + "../../TypeReuseSvc.wsdl" + ], + "namespaceMappings": [ + "*, TypeReuse_NS" + ], + "outputFile": "Reference.cs", + "references": [ + "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//TypesLib.dll", + "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 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.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/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json new file mode 100644 index 00000000000..f69a26852ac --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json @@ -0,0 +1,42 @@ +{ + "providerId": "Microsoft.Tools.ServiceModel.Svcutil-bootstrap", + "version": "99.99.99", + "options": { + "inputs": [ + "$resultPath$/TestResults/TypeReuse/TypeReuseSvc.wsdl" + ], + "bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse", + "namespaceMappings": [ + "*, TypeReuse_NS" + ], + "noBootstrapping": true, + "noLogo": true, + "noProjectUpdates": true, + "outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse/ServiceReference", + "outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/ServiceReference/Reference.cs", + "projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/TypeReuse.csproj", + "references": [ + "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//TypesLib.dll", + "Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 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.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/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj new file mode 100644 index 00000000000..d4e11106769 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -0,0 +1,41 @@ + + + + Exe + N.N + enable + enable + + + + + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + + + + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/BinLib.dll + + + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/TypesLib.dll + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj similarity index 57% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj index 7c7ea09ff23..cebb0fdf595 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj @@ -3,10 +3,16 @@ Exe N.N - latest + enable + enable + + + + + $resultPath$/TestResults/TypeReuse/BinLib/bin/Debug/netstandard1.3/BinLib.dll @@ -18,7 +24,5 @@ - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/global.json similarity index 100% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet5_0/global.json rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/global.json 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 deleted file mode 100644 index f391638139b..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/ServiceReference/dotnet-svcutil.params.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "providerId": "Microsoft.Tools.ServiceModel.Svcutil", - "version": "99.99.99", - "options": { - "inputs": [ - "../../TypeReuseSvc.wsdl" - ], - "namespaceMappings": [ - "*, TypeReuse60_NS" - ], - "outputFile": "Reference.cs", - "references": [ - "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//TypesLib.dll", - "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "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.DiagnosticSource, {System.Diagnostics.DiagnosticSource, 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 deleted file mode 100644 index bf51bd9320e..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "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": [ - "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse60//bin//Debug//net6.0//TypesLib.dll", - "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "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.DiagnosticSource, {System.Diagnostics.DiagnosticSource, 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 deleted file mode 100644 index 188ef615cd1..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/Program.cs +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index ec9e15fbc00..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - Exe - N.N - enable - enable - - - - - $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/TypeReuse60/TypeReuse60.cs b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.cs deleted file mode 100644 index d2d3627bf81..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/TypeReuse60.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; -using Microsoft.Tools.ServiceModel.Svcutil; -using System.Linq; -using System.Text.RegularExpressions; - -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/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); - } - } -} \ 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 deleted file mode 100644 index 7a7ec0adddb..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/global.json +++ /dev/null @@ -1 +0,0 @@ -{ "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 deleted file mode 100644 index 0a62331d0a1..00000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse60/nuget.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/Class1.cs b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/Class1.cs new file mode 100644 index 00000000000..64e61aba5b4 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/Class1.cs @@ -0,0 +1,9 @@ +using System; + +namespace TypeReuseClient +{ + public class Class1 + { + + } +} diff --git a/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj new file mode 100644 index 00000000000..2a5c5cc5ab0 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypeReuseClient/TypeReuseClient.csproj @@ -0,0 +1,9 @@ + + + + netstandard2.0 + + + + + diff --git a/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/CommonTypes.cs b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/CommonTypes.cs new file mode 100644 index 00000000000..2cc1fe630c3 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/CommonTypes.cs @@ -0,0 +1,15 @@ +using System; +using System.Runtime.Serialization; + +namespace TypesLib +{ + [DataContract] + public class TypeReuseCompositeType + { + [DataMember] + public bool BoolValue { get; set; } = true; + + [DataMember] + public string StringValue { get; set; } = "Hello "; + } +} diff --git a/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/TypesLib.csproj b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/TypesLib.csproj new file mode 100644 index 00000000000..ac819923af6 --- /dev/null +++ b/src/dotnet-svcutil/lib/tests/TestCases/Netstandard20TypeReuse/TypesLib/TypesLib.csproj @@ -0,0 +1,11 @@ + + + + netstandard2.0 + + + + + + + diff --git a/src/dotnet-svcutil/lib/tests/src/E2ETests.cs b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs index 57be8d0d5c7..3b15a808896 100644 --- a/src/dotnet-svcutil/lib/tests/src/E2ETests.cs +++ b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs @@ -55,7 +55,7 @@ private void TestSvcutil(string options, bool expectSuccess = true) ValidateTest(options, this_TestCaseProject.DirectoryPath, processResult.ExitCode, processResult.OutputText, expectSuccess); } - + [Theory] [Trait("Category", "BVT")] [InlineData("silent")] @@ -196,19 +196,19 @@ public void NamespaceParam(string testCaseName, string options, bool expectSucce InitializeE2E(testCaseName); var url = $"{Path.Combine(g_TestCasesDir, "wsdl", "WcfProjectNService", "tempuri.org.wsdl")}"; - var dir = $"-d ../{ testCaseName}"; + var dir = $"-d ../{testCaseName}"; TestSvcutil(dir + " " + url + " " + options, expectSuccess); } [Trait("Category", "BVT")] [Theory] - [InlineData("TypeReuse60", "net6.0")] - public void TypeReuse(string testCaseName, string targetFramework) + [InlineData("TypeReuse")] + public void TypeReuse(string testCaseName) { this_TestCaseName = "TypeReuse"; TestFixture(); - InitializeE2E(testCaseName, createUniqueProject: true, targetFramework: targetFramework, sdkVersion: g_SdkVersion); + InitializeE2E(testCaseName, createUniqueProject: true); var uri = SetupProjectDependencies(); var outDir = Path.Combine(this_TestCaseOutputDir, "ServiceReference"); @@ -530,7 +530,7 @@ private void WcfRuntimeSvcs(string serviceName, bool expectSuccess) // need to find a way to keep this test running reliably. [Trait("Category", "Test")] [Fact] - + public void CheckBaslines() { this_TestCaseName = nameof(CheckBaslines); diff --git a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs index c22e4c4aef3..b528dbd3a65 100644 --- a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs +++ b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs @@ -88,6 +88,16 @@ public void Init(string resultsPath, string testCasesPath, string projectPath, s _replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+\\dotnet-svcutil-lib.dll", "DOTNET_VERSION\\dotnet-svcutil-lib.dll") { UseRegex = true }); //for windows _replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+/any/dotnet-svcutil-lib.dll", "DOTNET_VERSION/any/dotnet-svcutil-lib.dll") { UseRegex = true }); //for linux _replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+\\any\\dotnet-svcutil-lib.dll", "DOTNET_VERSION\\any\\dotnet-svcutil-lib.dll") { UseRegex = true }); //for windows + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+/net", "DOTNET_VERSION/net") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\net", "DOTNET_VERSION\\net") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+//BinLib.dll", "DOTNET_VERSION//BinLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+//TypesLib.dll", "DOTNET_VERSION//TypesLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\\\BinLib.dll", "DOTNET_VERSION\\\\BinLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\\\TypesLib.dll", "DOTNET_VERSION\\\\TypesLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+/BinLib.dll", "DOTNET_VERSION/BinLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+/TypesLib.dll", "DOTNET_VERSION/TypesLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\BinLib.dll", "DOTNET_VERSION\\BinLib.dll") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\TypesLib.dll", "DOTNET_VERSION\\TypesLib.dll") { UseRegex = true }); _replacements.Add(new ReplaceInfo(@"Release\Shipping", @"RelType/ShipType")); _replacements.Add(new ReplaceInfo(@"Release\NonShipping", @"RelType/ShipType")); _replacements.Add(new ReplaceInfo(@"Debug\Shipping", @"RelType/ShipType")); diff --git a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs index be683bb7a8a..0b3fee48f78 100644 --- a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs +++ b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs @@ -102,7 +102,7 @@ public void FullFramework(string testCaseName) var uri = Path.Combine(g_TestCasesDir, "wsdl", "WcfProjectNService", "tempuri.org.wsdl"); var outDir = Path.Combine(this_TestCaseOutputDir, "ServiceReference"); var options = $"{uri} -nl -d {outDir} -tf netcoreapp1.0"; - + TestGlobalSvcutil(options, expectSuccess: true); } @@ -122,12 +122,12 @@ public async Task MultiTargetCloseAsyncGeneration(string testCaseName) this_TestGroupOutputDir = Path.Combine(Path.GetTempPath(), this_TestCaseName); this_TestCaseLogFile = Path.Combine(this_TestGroupOutputDir, $"{testCaseName}.log"); this_TestCaseOutputDir = Path.Combine(this_TestGroupOutputDir, testCaseName); - FileUtil.TryDeleteDirectory(this_TestCaseOutputDir); + FileUtil.TryDeleteDirectory(this_TestCaseOutputDir); Directory.CreateDirectory(this_TestCaseOutputDir); File.Copy(Path.Combine(g_TestCasesDir, this_TestCaseName, testCaseName, "Program.cs"), Path.Combine(this_TestCaseOutputDir, "Program.cs"), true); File.Copy(Path.Combine(g_TestCasesDir, this_TestCaseName, testCaseName, $"{testCaseName}.csproj"), Path.Combine(this_TestCaseOutputDir, $"{testCaseName}.csproj"), true); this_TestCaseProject = await MSBuildProj.FromPathAsync(Path.Combine(this_TestCaseOutputDir, $"{testCaseName}.csproj"), null, CancellationToken.None); - + this_FixupUtil = new FixupUtil(); this_FixupUtil.Init(g_TestResultsDir, g_TestCasesDir, this_TestCaseOutputDir, g_ServiceUrl, g_ServiceId, g_RepositoryRoot); @@ -167,27 +167,55 @@ public async Task MultiTargetTypeReuse() TestGlobalSvcutil(options, expectSuccess: true); } + [Trait("Category", "BVT")] + [Fact] + public async Task NetStandard20TypeReuse() + { + this_TestCaseName = "NetStandard20TypeReuse"; + TestFixture(); + string testClientFolder = "TypeReuseClient"; + this_TestCaseBaselinesDir = Path.Combine(this_TestGroupBaselinesDir, testClientFolder); + Directory.CreateDirectory(this_TestCaseBaselinesDir); + + this_TestGroupOutputDir = Path.Combine(Path.GetTempPath(), this_TestCaseName); + this_TestCaseLogFile = Path.Combine(this_TestGroupOutputDir, $"{this_TestCaseName}.log"); + this_TestCaseOutputDir = Path.Combine(this_TestGroupOutputDir, testClientFolder); + FileUtil.TryDeleteDirectory(this_TestCaseOutputDir); + Directory.CreateDirectory(this_TestCaseOutputDir); + FileUtil.CopyDirectory(Path.Combine(g_TestCasesDir, this_TestCaseName), this_TestGroupOutputDir, true); + this_TestCaseProject = await MSBuildProj.FromPathAsync(Path.Combine(this_TestCaseOutputDir, $"{testClientFolder}.csproj"), null, CancellationToken.None); + ProcessRunner.ProcessResult ret = await this_TestCaseProject.BuildAsync(true, this_TestCaseLogger, CancellationToken.None); + Assert.True(ret.ExitCode == 0, ret.OutputText); + + this_FixupUtil = new FixupUtil(); + this_FixupUtil.Init(g_TestResultsDir, g_TestCasesDir, this_TestCaseOutputDir, g_ServiceUrl, g_ServiceId, g_RepositoryRoot); + + var uri = Path.Combine(g_TestCasesDir, "wsdl", "TypeReuseSvc.wsdl"); + var outDir = Path.Combine(this_TestCaseOutputDir, "ServiceReference"); + var options = $"{uri} -nl --outputDir {outDir}"; + + TestGlobalSvcutil(options, expectSuccess: true); + } [Trait("Category", "BVT")] [Theory] - [InlineData("net6.0", "-elm")] - public async Task ParamsFiles_SDK_TFM(string targetFramework, string extraOptions) + [InlineData("-elm")] + public async Task ParamsFiles(string extraOptions) { - this_TestCaseName = "ParamsFiles_SDK_TFM"; + this_TestCaseName = "ParamsFiles"; TestFixture(); - var testCaseName = $"TF{targetFramework}".Replace(".", "_"); - InitializeGlobal(testCaseName, targetFramework: "net6.0", g_SdkVersion); - this_TestCaseProject.TargetFramework = targetFramework; + var testCaseName = extraOptions.Substring(1); + InitializeGlobal(testCaseName); await this_TestCaseProject.SaveAsync(this_TestCaseLogger, System.Threading.CancellationToken.None); var url = $"{Path.Combine(g_TestCasesDir, "wsdl", "Simple.wsdl")}"; - var ns = testCaseName.Replace(".", "_") + "_NS"; + var ns = testCaseName + "_NS"; // generate params file from options var paramsFilePath = Path.Combine(this_TestCaseOutputDir, $"{testCaseName}.params.json"); var options = new Microsoft.Tools.ServiceModel.Svcutil.SvcutilOptions(); options.Inputs.Add(new Uri(url)); - options.References.Add(Microsoft.Tools.ServiceModel.Svcutil.ProjectDependency.FromPackage("Newtonsoft.Json", "13.0.1")); + options.References.Add(Microsoft.Tools.ServiceModel.Svcutil.ProjectDependency.FromPackage("Newtonsoft.Json", "13.0.2")); options.OutputDir = new DirectoryInfo(this_TestCaseOutputDir); options.BootstrapPath = new DirectoryInfo(this_TestCaseBootstrapDir); options.NamespaceMappings.Add(new System.Collections.Generic.KeyValuePair("*", ns));