From 089e65fb2118786292ca2f1a187f08e5e351af13 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Fri, 19 Aug 2022 10:30:02 -0700 Subject: [PATCH 1/2] Update Xunit to 2.4.2 --- Documentation/AzureDevOps/SendingJobsToHelix.md | 4 ++-- eng/Versions.props | 2 +- src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props | 2 +- src/Microsoft.DotNet.Helix/Sdk/Readme.md | 2 +- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/AzureDevOps/SendingJobsToHelix.md b/Documentation/AzureDevOps/SendingJobsToHelix.md index f5055c77cea..ec1a83da7c7 100644 --- a/Documentation/AzureDevOps/SendingJobsToHelix.md +++ b/Documentation/AzureDevOps/SendingJobsToHelix.md @@ -83,7 +83,7 @@ The simplest Helix use-case is zipping up a single folder containing your projec Simply specify the xUnit project(s) you wish to run (semicolon delimited) with the `XUnitProjects` parameter. Then, specify: * the `XUnitPublishTargetFramework` – this is the framework your **test projects are targeting**, e.g. `netcoreapp3.1`. * the `XUnitRuntimeTargetFramework` – this is the framework version of xUnit you want to use from the xUnit NuGet package, e.g. `netcoreapp2.0`. Notably, the xUnit console runner only supports up to netcoreapp2.0 as of 14 March 2018, so this is the target that should be specified for running against any higher version test projects. -* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.4.2-pre.9`). +* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.4.2`). Finally, set `IncludeDotNetCli` to true and specify which `DotNetCliPackageType` (`sdk`, `runtime` or `aspnetcore-runtime`) and `DotNetCliVersion` you wish to use. (For a full list of .NET CLI versions/package types, see these links: [3.0](https://dotnet.microsoft.com/download/dotnet-core/3.0), [2.1](https://dotnet.microsoft.com/download/dotnet-core/2.1), [2.2](https://dotnet.microsoft.com/download/dotnet-core/2.2).) @@ -104,7 +104,7 @@ The list of available Helix queues can be found on the [Helix homepage](https:// # XUnitWorkItemTimeout: '00:05:00' -- a timeout (specified as a System.TimeSpan string) for all work items created from XUnitProjects XUnitPublishTargetFramework: netcoreapp3.1 # specify your publish target framework here XUnitRuntimeTargetFramework: netcoreapp2.0 # specify the framework you want to use for the xUnit runner - XUnitRunnerVersion: 2.4.2-pre.9 # specify the version of xUnit runner you wish to use here + XUnitRunnerVersion: 2.4.2 # specify the version of xUnit runner you wish to use here # WorkItemDirectory: '' -- payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects # WorkItemCommand: '' -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects # WorkItemTimeout: '' -- a timeout (specified as a System.TimeSpan string) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects diff --git a/eng/Versions.props b/eng/Versions.props index 394c25efdc2..42123340081 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,7 +69,7 @@ 4.5.2 4.5.0 8.5.0 - 2.4.2-pre.9 + 2.4.2 2.0.3 7.0.0-beta.22417.2 7.0.0-beta.22417.2 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props index 514433d41ce..54f3d07baec 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props @@ -87,7 +87,7 @@ $(ArcadeSdkVersion) $(ArcadeSdkVersion) 16.5.0 - 2.4.2-pre.9 + 2.4.2 $(XUnitVersion) 2.4.3 diff --git a/src/Microsoft.DotNet.Helix/Sdk/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/Readme.md index 2deab5e4209..cf17d4c481e 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/Readme.md +++ b/src/Microsoft.DotNet.Helix/Sdk/Readme.md @@ -228,7 +228,7 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r netcoreapp2.0 - 2.4.2-pre.9 + 2.4.2/XUnitRunnerVersion> diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets index b0525e08ca2..e415fac066e 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -3,7 +3,7 @@ net7.0 netcoreapp2.0 - 2.4.2-pre.9 + 2.4.2 <_XUnitPublishTargetsPath>$(MSBuildThisFileDirectory)XUnitPublish.targets From 3da5c07d459f81f9d073fa75dfd25e674f36d0c5 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 22 Aug 2022 19:41:19 +0200 Subject: [PATCH 2/2] Update Readme.md --- src/Microsoft.DotNet.Helix/Sdk/Readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.DotNet.Helix/Sdk/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/Readme.md index cf17d4c481e..d3505094e18 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/Readme.md +++ b/src/Microsoft.DotNet.Helix/Sdk/Readme.md @@ -228,7 +228,7 @@ Given a local folder `$(TestFolder)` containing `runtests.cmd`, this will run `r netcoreapp2.0 - 2.4.2/XUnitRunnerVersion> + 2.4.2