diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 67ac0d5578a08b..049440b628b4a5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.25516.2", + "version": "11.0.0-prerelease.26168.1", "commands": [ "xharness" ] diff --git a/NuGet.config b/NuGet.config index d74fa2a4c62854..f6e25f4daf50d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a0ec00cba10bf..fd743fa87e75f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -322,17 +322,17 @@ https://github.com/dotnet/runtime edbd5c769a19798b6955050baccf99e6797d3208 - + https://github.com/dotnet/xharness - 402df9c4f5abe6ee8519181dfb5481e04099fab0 + 607b3de9cf2dbfec6734e686e68d2813b40b2b51 - + https://github.com/dotnet/xharness - 402df9c4f5abe6ee8519181dfb5481e04099fab0 + 607b3de9cf2dbfec6734e686e68d2813b40b2b51 - + https://github.com/dotnet/xharness - 402df9c4f5abe6ee8519181dfb5481e04099fab0 + 607b3de9cf2dbfec6734e686e68d2813b40b2b51 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 2e92fa2c580cf1..928608910f3d17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -197,9 +197,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.25516.2 - 8.0.0-prerelease.25516.2 - 8.0.0-prerelease.25516.2 + 11.0.0-prerelease.26168.1 + 11.0.0-prerelease.26168.1 + 11.0.0-prerelease.26168.1 8.0.0-alpha.0.26116.3 2.4.2 1.0.0 diff --git a/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs b/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs index c30c99f7e33061..b442eee448fadd 100644 --- a/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs +++ b/src/tests/Common/XHarnessRunnerLibrary/GeneratedTestRunner.cs @@ -48,14 +48,14 @@ public override Task Run(IEnumerable testAssemblies) return Task.CompletedTask; } - public override string WriteResultsToFile(XmlResultJargon xmlResultJargon) + public override Task WriteResultsToFile(XmlResultJargon xmlResultJargon) { Debug.Assert(xmlResultJargon == XmlResultJargon.xUnit); File.WriteAllText(ResultsFileName, LastTestRun.GetTestResultOutput(_assemblyName)); - return ResultsFileName; + return Task.FromResult(ResultsFileName); } - public override void WriteResultsToFile(TextWriter writer, XmlResultJargon jargon) + public override Task WriteResultsToFile(TextWriter writer, XmlResultJargon jargon) { Debug.Assert(jargon == XmlResultJargon.xUnit); string lastTestResults = LastTestRun.GetTestResultOutput(_assemblyName); @@ -69,6 +69,7 @@ public override void WriteResultsToFile(TextWriter writer, XmlResultJargon jargo { writer.WriteLine(lastTestResults); } + return Task.CompletedTask; } public override void SkipTests(IEnumerable tests)