diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_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/TFnet8_0/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs index 9bf5899c6a9a..3e3c52671eeb 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs @@ -7,7 +7,7 @@ // //------------------------------------------------------------------------------ -namespace TFnet8_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="TFnet8_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(TFnet8_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 : TFnet8_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, TFnet8_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(TFnet8_0_NS.TypeReuseCompositeType composite) + public System.Threading.Tasks.Task GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite) { return base.Channel.GetDataUsingDataContractAsync(composite); } diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_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/TFnet8_0/dotnet-svcutil.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/dotnet-svcutil.params.json index 119b1b87e108..cbb25078fbc7 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_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": [ - "*, TFnet8_0_NS" + "*, elm_NS" ], "outputFile": "Reference.cs", "references": [ diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj similarity index 94% rename from src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj index b88317b8880f..346742f0a5fc 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj @@ -3,7 +3,6 @@ Exe N.N - latest enable enable diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_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/TFnet8_0/TFnet8_0.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json index 0b404517c96e..f8a25c78287b 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json @@ -1,18 +1,18 @@ { - "providerId": "TFnet8_0", + "providerId": "elm", "version": "99.99.99", "options": { "inputs": [ "$testCasesPath$/wsdl/Simple.wsdl" ], - "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet8_0", + "bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles/elm", "namespaceMappings": [ - "*, TFnet8_0_NS" + "*, elm_NS" ], "noLogo": true, "noTelemetry": true, - "outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0", - "projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_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/TypeReuse/TypeReuse80/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/TypeReuse80/ServiceReference/Reference.cs rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs index 251a39f1e50c..b4c58940cf59 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/Reference.cs +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs @@ -7,12 +7,12 @@ // //------------------------------------------------------------------------------ -namespace TypeReuse80_NS +namespace TypeReuse_NS { [System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")] - [System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse80_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 : TypeReuse80_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, TypeReuse80_NS.ITypeReuseSvc + public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase, TypeReuse_NS.ITypeReuseSvc { /// diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/dotnet-svcutil.params.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json similarity index 96% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/dotnet-svcutil.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json index a2b47bd109d6..f74209cb70ee 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/dotnet-svcutil.params.json +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json @@ -6,13 +6,13 @@ "../../TypeReuseSvc.wsdl" ], "namespaceMappings": [ - "*, TypeReuse80_NS" + "*, TypeReuse_NS" ], "outputFile": "Reference.cs", "references": [ "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//TypesLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.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}", diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/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 similarity index 92% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json index 169510eb1e20..65440663c702 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/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 @@ -5,20 +5,20 @@ "inputs": [ "$resultPath$/TestResults/TypeReuse/TypeReuseSvc.wsdl" ], - "bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse80", + "bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse", "namespaceMappings": [ - "*, TypeReuse80_NS" + "*, TypeReuse_NS" ], "noBootstrapping": true, "noLogo": true, "noProjectUpdates": true, - "outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse80/ServiceReference", - "outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse80/ServiceReference/Reference.cs", - "projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse80/TypeReuse80.csproj", + "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//TypeReuse80//bin//Debug//net8.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//TypesLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll", + "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.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}", diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj similarity index 94% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/SvcutilBootstrapper.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 37759d14e784..b2079980919d 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -9,13 +9,13 @@ - $resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll - $resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/BinLib.dll + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll - $resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/TypesLib.dll + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/TypeReuse80.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj similarity index 96% rename from src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/TypeReuse80.csproj rename to src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj index fc6c0906bf2e..91bdd59170b1 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/TypeReuse80.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj @@ -3,7 +3,6 @@ Exe N.N - latest enable enable diff --git a/src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_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/TFnet8_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/TypeReuse80/global.json b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/global.json deleted file mode 100644 index 7a7ec0adddb3..000000000000 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/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/src/E2ETests.cs b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs index 2692707ddf96..b2837f16b6d2 100644 --- a/src/dotnet-svcutil/lib/tests/src/E2ETests.cs +++ b/src/dotnet-svcutil/lib/tests/src/E2ETests.cs @@ -201,12 +201,12 @@ public void NamespaceParam(string testCaseName, string options, bool expectSucce [Trait("Category", "BVT")] [Theory] - [InlineData("TypeReuse80", "net8.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"); diff --git a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs index 327c8a15ac3b..4b6692037a34 100644 --- a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs +++ b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs @@ -105,18 +105,17 @@ public void FullFramework(string testCaseName) [Trait("Category", "BVT")] [Theory] - [InlineData("net8.0", "-elm")] - public void ParamsFiles_SDK_TFM(string targetFramework, string extraOptions) + [InlineData("-elm")] + public void ParamsFiles(string extraOptions) { - this_TestCaseName = "ParamsFiles_SDK_TFM"; + this_TestCaseName = "ParamsFiles"; TestFixture(); - var testCaseName = $"TF{targetFramework}".Replace(".", "_"); - InitializeGlobal(testCaseName, targetFramework: targetFramework, g_SdkVersion); - this_TestCaseProject.TargetFramework = targetFramework; + var testCaseName = extraOptions.Substring(1); + InitializeGlobal(testCaseName); this_TestCaseProject.SaveAsync(this_TestCaseLogger, System.Threading.CancellationToken.None).Wait(); 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");