Skip to content

Commit 33cd695

Browse files
imcarolwangimcarolwang
committed
Update test to use default target framework instead of update to use latest for each new release.
1 parent b51e8c2 commit 33cd695

File tree

13 files changed

+40
-44
lines changed

13 files changed

+40
-44
lines changed

‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/Reference.cs renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/Reference.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace TFnet8_0_NS
10+
namespace elm_NS
1111
{
1212
using System.Runtime.Serialization;
1313

@@ -72,25 +72,25 @@ public string StringValue
7272
}
7373

7474
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
75-
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="TFnet8_0_NS.ITypeReuseSvc")]
75+
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="elm_NS.ITypeReuseSvc")]
7676
public interface ITypeReuseSvc
7777
{
7878

7979
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetData", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataResponse")]
80-
System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value);
80+
System.Threading.Tasks.Task<elm_NS.BinLibrary> GetDataAsync(int value);
8181

8282
[System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContract", ReplyAction="http://tempuri.org/ITypeReuseSvc/GetDataUsingDataContractResponse")]
83-
System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite);
83+
System.Threading.Tasks.Task<elm_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite);
8484
}
8585

8686
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
87-
public interface ITypeReuseSvcChannel : TFnet8_0_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
87+
public interface ITypeReuseSvcChannel : elm_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
8888
{
8989
}
9090

9191
[System.Diagnostics.DebuggerStepThroughAttribute()]
9292
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
93-
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TFnet8_0_NS.ITypeReuseSvc>, TFnet8_0_NS.ITypeReuseSvc
93+
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<elm_NS.ITypeReuseSvc>, elm_NS.ITypeReuseSvc
9494
{
9595

9696
/// <summary>
@@ -133,12 +133,12 @@ public TypeReuseSvcClient(System.ServiceModel.Channels.Binding binding, System.S
133133
{
134134
}
135135

136-
public System.Threading.Tasks.Task<TFnet8_0_NS.BinLibrary> GetDataAsync(int value)
136+
public System.Threading.Tasks.Task<elm_NS.BinLibrary> GetDataAsync(int value)
137137
{
138138
return base.Channel.GetDataAsync(value);
139139
}
140140

141-
public System.Threading.Tasks.Task<TFnet8_0_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(TFnet8_0_NS.TypeReuseCompositeType composite)
141+
public System.Threading.Tasks.Task<elm_NS.TypeReuseCompositeType> GetDataUsingDataContractAsync(elm_NS.TypeReuseCompositeType composite)
142142
{
143143
return base.Channel.GetDataUsingDataContractAsync(composite);
144144
}

‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/dotnet-svcutil.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/dotnet-svcutil.params.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"../../../../../src/dotnet-svcutil/lib/tests/TestCases/wsdl/Simple.wsdl"
77
],
88
"namespaceMappings": [
9-
"*, TFnet8_0_NS"
9+
"*, elm_NS"
1010
],
1111
"outputFile": "Reference.cs",
1212
"references": [

‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6-
<LangVersion>latest</LangVersion>
76
<ImplicitUsings>enable</ImplicitUsings>
87
<Nullable>enable</Nullable>
98
</PropertyGroup>

‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles/elm/elm.params.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
2-
"providerId": "TFnet8_0",
2+
"providerId": "elm",
33
"version": "99.99.99",
44
"options": {
55
"inputs": [
66
"$testCasesPath$/wsdl/Simple.wsdl"
77
],
8-
"bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles_SDK_TFM/TFnet8_0",
8+
"bootstrapPath": "$resultPath$/TestBootstrap/ParamsFiles/elm",
99
"namespaceMappings": [
10-
"*, TFnet8_0_NS"
10+
"*, elm_NS"
1111
],
1212
"noLogo": true,
1313
"noTelemetry": true,
14-
"outputDir": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0",
15-
"projectFile": "$resultPath$/TestResults/ParamsFiles_SDK_TFM/TFnet8_0/TFnet8_0.csproj",
14+
"outputDir": "$resultPath$/TestResults/ParamsFiles/elm",
15+
"projectFile": "$resultPath$/TestResults/ParamsFiles/elm/elm.csproj",
1616
"references": [
1717
"Newtonsoft.Json, {Newtonsoft.Json, 99.99.99}"
1818
],

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/Reference.cs renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/Reference.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
// </auto-generated>
88
//------------------------------------------------------------------------------
99

10-
namespace TypeReuse80_NS
10+
namespace TypeReuse_NS
1111
{
1212

1313

1414
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
15-
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse80_NS.ITypeReuseSvc")]
15+
[System.ServiceModel.ServiceContractAttribute(ConfigurationName="TypeReuse_NS.ITypeReuseSvc")]
1616
public interface ITypeReuseSvc
1717
{
1818

@@ -24,13 +24,13 @@ public interface ITypeReuseSvc
2424
}
2525

2626
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
27-
public interface ITypeReuseSvcChannel : TypeReuse80_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
27+
public interface ITypeReuseSvcChannel : TypeReuse_NS.ITypeReuseSvc, System.ServiceModel.IClientChannel
2828
{
2929
}
3030

3131
[System.Diagnostics.DebuggerStepThroughAttribute()]
3232
[System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.Tools.ServiceModel.Svcutil", "99.99.99")]
33-
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TypeReuse80_NS.ITypeReuseSvc>, TypeReuse80_NS.ITypeReuseSvc
33+
public partial class TypeReuseSvcClient : System.ServiceModel.ClientBase<TypeReuse_NS.ITypeReuseSvc>, TypeReuse_NS.ITypeReuseSvc
3434
{
3535

3636
/// <summary>

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/ServiceReference/dotnet-svcutil.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/ServiceReference/dotnet-svcutil.params.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
"../../TypeReuseSvc.wsdl"
77
],
88
"namespaceMappings": [
9-
"*, TypeReuse80_NS"
9+
"*, TypeReuse_NS"
1010
],
1111
"outputFile": "Reference.cs",
1212
"references": [
1313
"dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}",
14-
"$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//BinLib.dll",
15-
"$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//TypesLib.dll",
14+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll",
15+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll",
1616
"Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}",
1717
"Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}",
1818
"Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}",

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
"inputs": [
66
"$resultPath$/TestResults/TypeReuse/TypeReuseSvc.wsdl"
77
],
8-
"bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse80",
8+
"bootstrapPath": "$resultPath$/TestResults/TypeReuse/TypeReuse",
99
"namespaceMappings": [
10-
"*, TypeReuse80_NS"
10+
"*, TypeReuse_NS"
1111
],
1212
"noBootstrapping": true,
1313
"noLogo": true,
1414
"noProjectUpdates": true,
15-
"outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse80/ServiceReference",
16-
"outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse80/ServiceReference/Reference.cs",
17-
"projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse80/TypeReuse80.csproj",
15+
"outputDir": "$resultPath$/TestResults/TypeReuse/TypeReuse/ServiceReference",
16+
"outputFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/ServiceReference/Reference.cs",
17+
"projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/TypeReuse.csproj",
1818
"references": [
1919
"dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}",
20-
"$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//BinLib.dll",
21-
"$resultPath$//TestResults//TypeReuse//TypeReuse80//bin//Debug//net8.0//TypesLib.dll",
20+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll",
21+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll",
2222
"Microsoft.ApplicationInsights, {Microsoft.ApplicationInsights, 99.99.99}",
2323
"Microsoft.DotNet.InternalAbstractions, {Microsoft.DotNet.InternalAbstractions, 99.99.99}",
2424
"Microsoft.Extensions.DependencyModel, {Microsoft.Extensions.DependencyModel, 99.99.99}",

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/SvcutilBootstrapper/SvcutilBootstrapper.csproj renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<Reference Include="dotnet-svcutil-lib">
12-
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
12+
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1313
</Reference>
1414
<Reference Include="BinLib">
15-
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/BinLib.dll</HintPath>
15+
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll</HintPath>
1616
</Reference>
1717
<Reference Include="TypesLib">
18-
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse80/bin/Debug/net8.0/TypesLib.dll</HintPath>
18+
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll</HintPath>
1919
</Reference>
2020
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
2121
<PackageReference Include="Microsoft.ApplicationInsights" Version="99.99.99" />

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/TypeReuse80.csproj renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6-
<LangVersion>latest</LangVersion>
76
<ImplicitUsings>enable</ImplicitUsings>
87
<Nullable>enable</Nullable>
98
</PropertyGroup>

‎src/dotnet-svcutil/lib/tests/Baselines/ParamsFiles_SDK_TFM/TFnet8_0/global.json renamed to ‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/global.json

File renamed without changes.

‎src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse80/global.json

-1
This file was deleted.

‎src/dotnet-svcutil/lib/tests/src/E2ETests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,12 @@ public void NamespaceParam(string testCaseName, string options, bool expectSucce
201201

202202
[Trait("Category", "BVT")]
203203
[Theory]
204-
[InlineData("TypeReuse80", "net8.0")]
205-
public void TypeReuse(string testCaseName, string targetFramework)
204+
[InlineData("TypeReuse")]
205+
public void TypeReuse(string testCaseName)
206206
{
207207
this_TestCaseName = "TypeReuse";
208208
TestFixture();
209-
InitializeE2E(testCaseName, createUniqueProject: true, targetFramework: targetFramework, sdkVersion: g_SdkVersion);
209+
InitializeE2E(testCaseName, createUniqueProject: true);
210210

211211
var uri = SetupProjectDependencies();
212212
var outDir = Path.Combine(this_TestCaseOutputDir, "ServiceReference");

‎src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs

+6-7
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,17 @@ public void FullFramework(string testCaseName)
105105

106106
[Trait("Category", "BVT")]
107107
[Theory]
108-
[InlineData("net8.0", "-elm")]
109-
public void ParamsFiles_SDK_TFM(string targetFramework, string extraOptions)
108+
[InlineData("-elm")]
109+
public void ParamsFiles(string extraOptions)
110110
{
111-
this_TestCaseName = "ParamsFiles_SDK_TFM";
111+
this_TestCaseName = "ParamsFiles";
112112
TestFixture();
113-
var testCaseName = $"TF{targetFramework}".Replace(".", "_");
114-
InitializeGlobal(testCaseName, targetFramework: targetFramework, g_SdkVersion);
115-
this_TestCaseProject.TargetFramework = targetFramework;
113+
var testCaseName = extraOptions.Substring(1);
114+
InitializeGlobal(testCaseName);
116115
this_TestCaseProject.SaveAsync(this_TestCaseLogger, System.Threading.CancellationToken.None).Wait();
117116

118117
var url = $"{Path.Combine(g_TestCasesDir, "wsdl", "Simple.wsdl")}";
119-
var ns = testCaseName.Replace(".", "_") + "_NS";
118+
var ns = testCaseName + "_NS";
120119

121120
// generate params file from options
122121
var paramsFilePath = Path.Combine(this_TestCaseOutputDir, $"{testCaseName}.params.json");

0 commit comments

Comments
 (0)