Update test to use default target framework instead of update to use …

…latest for each new release.
dotnet · Jul 4, 2023 · 33cd695 · 33cd695
1 parent b51e8c2
commit 33cd695
Show file tree

Hide file tree

Showing 13 changed files with 40 additions and 44 deletions.
diff --git a/...ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs → ...ts/Baselines/ParamsFiles/elm/Reference.cs b/...ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs → ...ts/Baselines/ParamsFiles/elm/Reference.cs
@@ -7,7 +7,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-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<TFnet8_0_NS.BinLibrary> GetDataAsync(int value);
+        System.Threading.Tasks.Task<elm_NS.BinLibrary> GetDataAsync(int value);
 
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")]
-        System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite);
+        System.Threading.Tasks.Task<elm_NS.TypeReuseCompositeType> 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>, TFnet8_0_NS.ITypeReuseSvc
+    public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<elm_NS.ITypeReuseSvc>, elm_NS.ITypeReuseSvc
     {
 
         /// <summary>
@@ -133,12 +133,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S
         {
         }
 
-        public System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value)
+        public System.Threading.Tasks.Task<elm_NS.BinLibrary> GetDataAsync(int value)
         {
             return base.Channel.GetDataAsync(value);
         }
 
-        public System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite)
+        public System.Threading.Tasks.Task<elm_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite)
         {
             return base.Channel.GetDataUsingDataContractAsync(composite);
         }

diff --git a/...K_TFM/TFnet8_0/dotnet-svcutil.params.json → ...aramsFiles/elm/dotnet-svcutil.params.json b/...K_TFM/TFnet8_0/dotnet-svcutil.params.json → ...aramsFiles/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/...amsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj → ...ests/Baselines/ParamsFiles/elm/elm.csproj b/...amsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj → ...ests/Baselines/ParamsFiles/elm/elm.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...les_SDK_TFM/TFnet8_0/TFnet8_0.params.json → ...Baselines/ParamsFiles/elm/elm.params.json b/...les_SDK_TFM/TFnet8_0/TFnet8_0.params.json → ...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/...TypeReuse80/ServiceReference/Reference.cs → ...e/TypeReuse/ServiceReference/Reference.cs b/...TypeReuse80/ServiceReference/Reference.cs → ...e/TypeReuse/ServiceReference/Reference.cs
@@ -7,12 +7,12 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-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>, TypeReuse80_NS.ITypeReuseSvc
+    public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TypeReuse_NS.ITypeReuseSvc>, TypeReuse_NS.ITypeReuseSvc
     {
 
         /// <summary>

diff --git a/...rviceReference/dotnet-svcutil.params.json → ...rviceReference/dotnet-svcutil.params.json b/...rviceReference/dotnet-svcutil.params.json → ...rviceReference/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/...iceModel.Svcutil-bootstrapper.params.json → ...iceModel.Svcutil-bootstrapper.params.json b/...iceModel.Svcutil-bootstrapper.params.json → ...iceModel.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/...ilBootstrapper/SvcutilBootstrapper.csproj → ...ilBootstrapper/SvcutilBootstrapper.csproj b/...ilBootstrapper/SvcutilBootstrapper.csproj → ...ilBootstrapper/SvcutilBootstrapper.csproj
@@ -9,13 +9,13 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
-      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
+      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
     <Reference Include="BinLib">
-      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/BinLib.dll</HintPath>
+      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll</HintPath>
     </Reference>
     <Reference Include="TypesLib">
-      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/TypesLib.dll</HintPath>
+      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll</HintPath>
     </Reference>
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="99.99.99" />

diff --git a/.../TypeReuse/TypeReuse80/TypeReuse80.csproj → ...ines/TypeReuse/TypeReuse/TypeReuse.csproj b/.../TypeReuse/TypeReuse80/TypeReuse80.csproj → ...ines/TypeReuse/TypeReuse/TypeReuse.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/.../ParamsFiles_SDK_TFM/TFnet8_0/global.json → ...Baselines/TypeReuse/TypeReuse/global.json b/.../ParamsFiles_SDK_TFM/TFnet8_0/global.json → ...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
diff --git 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
@@ -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");