Skip to content

Commit 32a62c9

Browse files
committed
Merge in 'release/6.0' changes
2 parents 5b7875a + 1aaf3bf commit 32a62c9

File tree

1 file changed

+4
-0
lines changed
  • src/installer/tests/HostActivation.Tests/NativeHosting

1 file changed

+4
-0
lines changed

src/installer/tests/HostActivation.Tests/NativeHosting/Nethost.cs

+4
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ public void GetHostFxrPath_DotNetRootParameter(bool explicitLoad, bool useAssemb
8989
}
9090

9191
[Theory]
92+
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
9293
[InlineData(true, false, true, false)]
9394
[InlineData(true, false, true, true)]
9495
[InlineData(true, false, false, false)]
@@ -180,6 +181,7 @@ public void GetHostFxrPath_HostFxrAlreadyLoaded()
180181
}
181182

182183
[Theory]
184+
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
183185
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
184186
[InlineData("{0}", false, true)]
185187
[InlineData("{0}\n", false, true)]
@@ -245,6 +247,7 @@ public void GetHostFxrPath_InstallLocationFile(string value, bool shouldUseArchS
245247
}
246248

247249
[Fact]
250+
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
248251
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
249252
public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
250253
{
@@ -275,6 +278,7 @@ public void GetHostFxrPath_GlobalInstallation_HasNoDefaultInstallationPath()
275278
}
276279

277280
[Fact]
281+
[ActiveIssue("https://github.com/dotnet/runtime/issues/61131", TestPlatforms.OSX)]
278282
[SkipOnPlatform(TestPlatforms.Windows, "This test targets the install_location config file which is only used on Linux and macOS.")]
279283
public void GetHostFxrPath_GlobalInstallation_ArchitectureSpecificPathIsPickedOverDefaultPath()
280284
{

0 commit comments

Comments
 (0)