From dcda4c40178a904e81591a631766f34784c3a070 Mon Sep 17 00:00:00 2001 From: Carol Wang Date: Fri, 19 Jan 2024 06:40:34 +0000 Subject: [PATCH] rebase and fix test failure due to product upgrade. --- .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 5 +++++ .../ServiceReference/dotnet-svcutil.params.json | 4 ++-- ...ols.ServiceModel.Svcutil-bootstrapper.params.json | 4 ++-- .../SvcutilBootstrapper/SvcutilBootstrapper.csproj | 7 +++++-- .../Baselines/TypeReuse/TypeReuse/TypeReuse.csproj | 3 +++ src/dotnet-svcutil/lib/tests/src/FixupUtil.cs | 12 ++++++++++++ src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs | 2 +- 12 files changed, 55 insertions(+), 7 deletions(-) diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 869f06a74012..81dc84e13b60 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj index db2bb4e528fd..251843c55123 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNet60/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 9d76a6f85124..687377f55906 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 726c406c2de1..719d21e35592 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrap/tfmNetstd21/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 922c4f271025..07f592d0eee9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalDefault/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll + + + \ No newline at end of file diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj index 922c4f271025..07f592d0eee9 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TFMBootstrapGlobal/tfmGlobalNetstd20/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -3,12 +3,17 @@ Exe N.N + enable + enable $USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll + + + \ No newline at end of file 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 index f74209cb70ee..50b9a2b5a400 100644 --- 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 @@ -11,8 +11,8 @@ "outputFile": "Reference.cs", "references": [ "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll", + "$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.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/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 index 65440663c702..ae383633ff3f 100644 --- 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 @@ -17,8 +17,8 @@ "projectFile": "$resultPath$/TestResults/TypeReuse/TypeReuse/TypeReuse.csproj", "references": [ "dotnet-svcutil-lib, {dotnet-svcutil-lib, 99.99.99}", - "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//BinLib.dll", - "$resultPath$//TestResults//TypeReuse//TypeReuse//bin//Debug//net8.0//TypesLib.dll", + "$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.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/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj index b2079980919d..247d38de8420 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/SvcutilBootstrapper/SvcutilBootstrapper.csproj @@ -11,12 +11,15 @@ $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll + - $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/BinLib.dll - $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll + $resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/TypesLib.dll + + diff --git a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj index 91bdd59170b1..20846a90893a 100644 --- a/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj +++ b/src/dotnet-svcutil/lib/tests/Baselines/TypeReuse/TypeReuse/TypeReuse.csproj @@ -8,6 +8,9 @@ + + + $resultPath$/TestResults/TypeReuse/BinLib/bin/Debug/netstandard1.3/BinLib.dll diff --git a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs index 0884996051b7..caec76c52a3f 100644 --- a/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs +++ b/src/dotnet-svcutil/lib/tests/src/FixupUtil.cs @@ -87,6 +87,18 @@ 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+/any/internalAssets", "DOTNET_VERSION/any/internalAssets") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\any\\internalAssets", "DOTNET_VERSION\\any\\internalAssets") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+/internalAssets", "DOTNET_VERSION/internalAssets") { UseRegex = true }); + _replacements.Add(new ReplaceInfo(@"net\d+\.\d+\\internalAssets", "DOTNET_VERSION\\internalAssets") { 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 d8400dbd325a..028599a1a69e 100644 --- a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs +++ b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs @@ -141,7 +141,7 @@ public async Task MultiTargetCloseAsyncGeneration(string testCaseName) [Trait("Category", "BVT")] [Theory] [InlineData("-elm")] - public void ParamsFiles(string extraOptions) + public async void ParamsFiles(string extraOptions) { this_TestCaseName = "ParamsFiles"; TestFixture();