rebase and fix test issue.

dotnet · Feb 4, 2024 · f438576 · f438576
1 parent b8c8e30
commit f438576
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...soft.Svcutil.NamedPipeMetadataImporter/Microsoft.Svcutil.NamedPipeMetadataImporter.csproj b/...soft.Svcutil.NamedPipeMetadataImporter/Microsoft.Svcutil.NamedPipeMetadataImporter.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>net6.0;net462</TargetFrameworks>
+	<PropertyGroup>
+		<TargetFrameworks>net6.0;net462</TargetFrameworks>
     <RootNamespace>Microsoft.Tools.ServiceModel.Svcutil</RootNamespace>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.ServiceModel.NetNamedPipe" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'">
-      <PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
-    </PackageReference>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="System.ServiceModel.NetNamedPipe" Version="6.0.*" Condition="'$(TargetFramework)' == 'net6.0'">
+			<PrivateAssets>contentfiles;analyzers;build</PrivateAssets>
+		</PackageReference>
     <Reference Include="System.ServiceModel" Condition="'$(TargetFramework)' == 'net462'" />
-  </ItemGroup>
+	</ItemGroup>
 </Project>
diff --git a/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs b/src/dotnet-svcutil/lib/tests/src/GlobalToolTests.cs
@@ -140,7 +140,7 @@ public async Task MultiTargetCloseAsyncGeneration(string testCaseName)
 
         [Trait("Category", "BVT")]
         [Fact]
-        public void MultiTargetTypeReuse()
+        public async Task MultiTargetTypeReuse()
         {
             this_TestCaseName = "MultiTargetTypeReuse";
             TestFixture();
@@ -154,8 +154,8 @@ public void MultiTargetTypeReuse()
             FileUtil.TryDeleteDirectory(this_TestCaseOutputDir);
             Directory.CreateDirectory(this_TestCaseOutputDir);
             FileUtil.CopyDirectory(Path.Combine(g_TestCasesDir, this_TestCaseName), this_TestGroupOutputDir, true);
-            this_TestCaseProject = MSBuildProj.FromPathAsync(Path.Combine(this_TestCaseOutputDir, $"{testClientFolder}.csproj"), null, CancellationToken.None).Result;
-            ProcessRunner.ProcessResult ret = this_TestCaseProject.BuildAsync(true, this_TestCaseLogger, CancellationToken.None).Result;
+            this_TestCaseProject = await MSBuildProj.FromPathAsync(Path.Combine(this_TestCaseOutputDir, $"{testClientFolder}.csproj"), null, CancellationToken.None);
+            ProcessRunner.ProcessResult ret = await this_TestCaseProject.BuildAsync(true, this_TestCaseLogger, CancellationToken.None);
             Assert.True(ret.ExitCode == 0, ret.OutputText);
 
             this_FixupUtil = new FixupUtil();