rebase and fix test failure due to product upgrade.

imcarolwang · imcarolwang · commit dcda4c40178a · 2024-01-19T06:40:34.000Z
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmDefault/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNet60/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNetstd20/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TFMBootstrap/tfmNetstd21/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <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)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -3,12 +3,17 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>N.N</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <WarningsAsErrors />
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$USERPROFILE$/.dotnet/tools/.store/dotnet-svcutil/99.99.99/dotnet-svcutil/99.99.99/tools/DOTNET_VERSION/any/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <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)" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="*" />
   </ItemGroup>
 </Project>
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
@@ -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
@@ -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
@@ -11,12 +11,15 @@
     <Reference Include="dotnet-svcutil-lib">
       <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/dotnet-svcutil-lib.dll</HintPath>
     </Reference>
+    <Content CopyToOutputDirectory="always" Include="$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
     <Reference Include="BinLib">
-      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/BinLib.dll</HintPath>
+      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/BinLib.dll</HintPath>
     </Reference>
     <Reference Include="TypesLib">
-      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/net8.0/TypesLib.dll</HintPath>
+      <HintPath>$resultPath$/TestResults/TypeReuse/TypeReuse/bin/Debug/DOTNET_VERSION/TypesLib.dll</HintPath>
     </Reference>
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="99.99.99" />
     <PackageReference Include="Microsoft.DotNet.InternalAbstractions" Version="99.99.99" />
diff --git 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 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="dotnet-svcutil-lib" Version="99.99.99" />
+    <Content CopyToOutputDirectory="always" Include="$(NuGetPackageRoot)dotnet-svcutil-lib/99.99.99/content/internalAssets/**" Link="internalAssets/%(RecursiveDir)%(Filename)%(Extension)" />
+  </ItemGroup>
+  <ItemGroup>
     <Reference Include="BinLib">
       <HintPath>$resultPath$/TestResults/TypeReuse/BinLib/bin/Debug/netstandard1.3/BinLib.dll</HintPath>
     </Reference>
diff --git 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
@@ -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();
