diff --git a/eng/build-pr.yml b/eng/build-pr.yml
index d86f37aab..fbd4180a2 100644
--- a/eng/build-pr.yml
+++ b/eng/build-pr.yml
@@ -234,8 +234,8 @@ jobs:
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
- testRunner: XUnit
- testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+ testRunner: VSTest
+ testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
platform: '$(BuildPlatform)'
configuration: '${{ parameters.buildConfiguration }}'
diff --git a/eng/build.yml b/eng/build.yml
index 23b1c7148..4047d8437 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -240,8 +240,8 @@ jobs:
- task: PublishTestResults@2
displayName: Publish Test Results
inputs:
- testRunner: XUnit
- testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+ testRunner: VSTest
+ testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
platform: '$(BuildPlatform)'
configuration: '${{ parameters.buildConfiguration }}'
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 26d486322..8369b6680 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -3,5 +3,6 @@
true
+ true
diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs
index cdede126c..0b2668afc 100644
--- a/test/EndToEnd/ValidateInsertedManifests.cs
+++ b/test/EndToEnd/ValidateInsertedManifests.cs
@@ -34,7 +34,7 @@ namespace EndToEnd.Tests
File.Exists(manifestFile).Should().BeTrue();
using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read);
Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile);
- readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
+ readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid");
}
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
index 7301d9a81..2c883c418 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
@@ -28,14 +28,14 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public AndConstraint Pass()
{
Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)
- .FailWith(AppendDiagnosticsTo($"Expected command to pass but it did not."));
+ .FailWith(AppendDiagnosticsTo("Expected command to pass but it did not."));
return new AndConstraint(this);
}
public AndConstraint Fail()
{
Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)
- .FailWith(AppendDiagnosticsTo($"Expected command to fail but it did not."));
+ .FailWith(AppendDiagnosticsTo("Expected command to fail but it did not."));
return new AndConstraint(this);
}
@@ -125,7 +125,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public AndConstraint NotHaveStdOut()
{
Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))
- .FailWith(AppendDiagnosticsTo($"Expected command to not output to stdout but it was not:"));
+ .FailWith(AppendDiagnosticsTo("Expected command to not output to stdout but it was not:"));
return new AndConstraint(this);
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
index adb83caf2..74b45b8db 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/DirectoryInfoAssertions.cs
@@ -26,7 +26,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public AndConstraint Exist()
{
Execute.Assertion.ForCondition(_dirInfo.Exists)
- .FailWith("Expected directory {0} does not exist.", _dirInfo.FullName);
+ .FailWith(String.Format("Expected directory {0} does not exist.", _dirInfo.FullName));
return new AndConstraint(this);
}
@@ -71,7 +71,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
Execute.Assertion
.ForCondition(file == null)
.BecauseOf(because, reasonArgs)
- .FailWith("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName);
+ .FailWith(String.Format("File {0} should not be found in directory {1}.", expectedFile, _dirInfo.FullName));
return new AndConstraint(this);
}
@@ -109,8 +109,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
Execute.Assertion
.ForCondition(matchingFileExists == true)
.BecauseOf(because, reasonArgs)
- .FailWith("Expected directory {0} to contain files matching {1}, but no matching file exists.",
- _dirInfo.FullName, expectedFilesSearchPattern);
+ .FailWith(String.Format("Expected directory {0} to contain files matching {1}, but no matching file exists.",
+ _dirInfo.FullName, expectedFilesSearchPattern));
return new AndConstraint(this);
}
@@ -132,8 +132,8 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
var matchingFileCount = _dirInfo.EnumerateFiles(expectedFilesSearchPattern, searchOption).Count();
Execute.Assertion.ForCondition(matchingFileCount == 0)
- .FailWith("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
- matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern);
+ .FailWith(String.Format("Found {0} files that should not exist in directory {1}. No file matching {2} should exist.",
+ matchingFileCount, _dirInfo.FullName, expectedFilesSearchPattern));
return new AndConstraint(this);
}
@@ -141,7 +141,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
var dir = _dirInfo.EnumerateDirectories(expectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
Execute.Assertion.ForCondition(dir != null)
- .FailWith("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName);
+ .FailWith(String.Format("Expected directory {0} cannot be found inside directory {1}.", expectedDir, _dirInfo.FullName));
return new AndConstraint(new DirectoryInfoAssertions(dir));
}
@@ -160,7 +160,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
var dir = _dirInfo.EnumerateDirectories(unexpectedDir, SearchOption.TopDirectoryOnly).SingleOrDefault();
Execute.Assertion.ForCondition(dir == null)
- .FailWith("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName);
+ .FailWith(String.Format("Directory {0} should not be found in directory {1}.", unexpectedDir, _dirInfo.FullName));
return new AndConstraint(new DirectoryInfoAssertions(dir));
}
diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
index 27da1cfb8..485ec5fad 100644
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
@@ -4,7 +4,7 @@
-
+
diff --git a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
index 47b6ce517..0e751c8ab 100644
--- a/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
+++ b/test/core-sdk-tasks.Tests/core-sdk-tasks.Tests.csproj
@@ -5,7 +5,7 @@
-
+