Skip to content

Commit dcda4c4

Browse files
imcarolwangimcarolwang
committed
rebase and fix test failure due to product upgrade.
1 parent 17f2cf5 commit dcda4c4

File tree

12 files changed

+55
-7
lines changed

12 files changed

+55
-7
lines changed

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

‎src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,17 @@
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
55
<TargetFramework>N.N</TargetFramework>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
68
<WarningsAsErrors />
79
</PropertyGroup>
810
<ItemGroup>
911
<Reference Include="dotnet-svcutil-lib">
1012
<HintPath>$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll</HintPath>
1113
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
15+
</ItemGroup>
16+
<ItemGroup>
1217
<PackageReference Include="Newtonsoft.Json" Version="*" />
1318
</ItemGroup>
1419
</Project>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"outputFile": "Reference.cs",
1212
"references": [
1313
"dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}",
14-
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll",
15-
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll",
14+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//BinLib.dll",
15+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//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/TypeReuse/SvcutilBootstrapper/Microsoft.Tools.ServiceModel.Svcutil-bootstrapper.params.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/TypeReuse.csproj",
1818
"references": [
1919
"dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}",
20-
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll",
21-
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll",
20+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//BinLib.dll",
21+
"$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//DOTNET_VERSION//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/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj

+5-2
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@
1111
<Reference Include="dotnet-svcutil-lib">
1212
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
1313
</Reference>
14+
<Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
1415
<Reference Include="BinLib">
15-
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll</HintPath>
16+
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/BinLib.dll</HintPath>
1617
</Reference>
1718
<Reference Include="TypesLib">
18-
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll</HintPath>
19+
<HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/TypesLib.dll</HintPath>
1920
</Reference>
21+
</ItemGroup>
22+
<ItemGroup>
2023
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
2124
<PackageReference Include="Microsoft.ApplicationInsights" Version="99.99.99" />
2225
<PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="99.99.99" />

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

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
</PropertyGroup>
99
<ItemGroup>
1010
<PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
11+
<Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
12+
</ItemGroup>
13+
<ItemGroup>
1114
<Reference Include="BinLib">
1215
<HintPath>$resultPath$/TestResults/TypeReuse/BinLib/bin/Debug/netstandard1.3/BinLib.dll</HintPath>
1316
</Reference>

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

+12
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,18 @@ public void Init(string resultsPath, string testCasesPath, string projectPath, s
8787
_replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+\\dotnet-svcutil-lib.dll", "DOTNET_VERSION\\dotnet-svcutil-lib.dll") { UseRegex = true }); //for windows
8888
_replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+/any/dotnet-svcutil-lib.dll", "DOTNET_VERSION/any/dotnet-svcutil-lib.dll") { UseRegex = true }); //for linux
8989
_replacements.Add(new ReplaceInfo(@"net(coreapp)?\d+\.\d+\\any\\dotnet-svcutil-lib.dll", "DOTNET_VERSION\\any\\dotnet-svcutil-lib.dll") { UseRegex = true }); //for windows
90+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+/any/internalAssets", "DOTNET_VERSION/any/internalAssets") { UseRegex = true });
91+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\any\\internalAssets", "DOTNET_VERSION\\any\\internalAssets") { UseRegex = true });
92+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+/internalAssets", "DOTNET_VERSION/internalAssets") { UseRegex = true });
93+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\internalAssets", "DOTNET_VERSION\\internalAssets") { UseRegex = true });
94+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+//BinLib.dll", "DOTNET_VERSION//BinLib.dll") { UseRegex = true });
95+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+//TypesLib.dll", "DOTNET_VERSION//TypesLib.dll") { UseRegex = true });
96+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\\\BinLib.dll", "DOTNET_VERSION\\\\BinLib.dll") { UseRegex = true });
97+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\\\TypesLib.dll", "DOTNET_VERSION\\\\TypesLib.dll") { UseRegex = true });
98+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+/BinLib.dll", "DOTNET_VERSION/BinLib.dll") { UseRegex = true });
99+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+/TypesLib.dll", "DOTNET_VERSION/TypesLib.dll") { UseRegex = true });
100+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\BinLib.dll", "DOTNET_VERSION\\BinLib.dll") { UseRegex = true });
101+
_replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\TypesLib.dll", "DOTNET_VERSION\\TypesLib.dll") { UseRegex = true });
90102
_replacements.Add(new ReplaceInfo(@"Release\Shipping", @"RelType/ShipType"));
91103
_replacements.Add(new ReplaceInfo(@"Release\NonShipping", @"RelType/ShipType"));
92104
_replacements.Add(new ReplaceInfo(@"Debug\Shipping", @"RelType/ShipType"));

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public async Task MultiTargetCloseAsyncGeneration(string testCaseName)
141141
[Trait("Category", "BVT")]
142142
[Theory]
143143
[InlineData("-elm")]
144-
public void ParamsFiles(string extraOptions)
144+
public async void ParamsFiles(string extraOptions)
145145
{
146146
this_TestCaseName = "ParamsFiles";
147147
TestFixture();

0 commit comments

Comments
 (0)