Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ public DangerousFileDetectorTests()
#endif
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
[Ignore("https://github.com/dotnet/sdk/issues/54951")]
public void ItShouldDetectFileWithMarkOfTheWeb()
{
var testFile = Path.Combine(TestAssetsManager.CreateTestDirectory().Path, Path.GetRandomFileName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
namespace Microsoft.DotNet.Cli.Utils.Tests
{
#pragma warning disable CA1416
// These tests share a single hardcoded registry key (.NET_SDK_TEST_PROVIDER_KEY) and mutate it
// (create/add/remove/delete), so they must not run concurrently. xUnit ran methods within a class
// serially; under MSTest MethodLevel parallelism (see https://github.com/dotnet/sdk/pull/54766)
// they race, producing intermittent "expected 1, actual 2 dependents" and missing-subkey failures.
[DoNotParallelize]
[TestClass]
public class DependencyProviderTests
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,9 @@ public void ILLink_TrimMode_new_options(string targetFramework, string trimMode)
.WithProjectChanges(project => SetGlobalTrimMode(project, trimMode));

var publishCommand = new PublishCommand(testAsset);
// Run from the (per-DataRow unique) project directory so the "-bl" binary log is written there
// instead of the shared current directory, where parallel DataRows would collide on msbuild.binlog.
publishCommand.WorkingDirectory = Path.Combine(testAsset.TestRoot, projectName);
publishCommand.Execute($"/p:RuntimeIdentifier={rid}", "-bl").Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, runtimeIdentifier: rid).FullName;
Expand Down
Loading