From 269515e81cb11c731a31980637eac70d1dee10d5 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Fri, 17 Sep 2021 12:06:44 -0700 Subject: [PATCH 1/7] Updating xunit package version on dotnet/arcade --- Documentation/AzureDevOps/SendingJobsToHelix.md | 4 ++-- eng/Versions.props | 3 +-- 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(+), 7 deletions(-) diff --git a/Documentation/AzureDevOps/SendingJobsToHelix.md b/Documentation/AzureDevOps/SendingJobsToHelix.md index a452bde15de..7bfe6f68ba2 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.1`). +* the `XUnitRunnerVersion` (the version of the xUnit nuget package you want to use, e.g. `2.4.2-pre.9`). 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.1 # specify the version of xUnit runner you wish to use here + XUnitRunnerVersion: 2.4.2-pre.9 # 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 ed7dd90f03b..5119da4af9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,8 @@ 4.5.2 4.4.0 8.5.0 - 2.4.1 + 2.4.2-pre.9 2.0.3 - 2.4.1 7.0.0-beta.21463.4 7.0.0-beta.21463.4 1.22.0 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props index e3426bf8703..e2936888774 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/DefaultVersions.props @@ -89,7 +89,7 @@ $(ArcadeSdkVersion) $(ArcadeSdkVersion) 16.5.0 - 2.4.1 + 2.4.2-pre.9 $(XUnitVersion) 2.4.3 diff --git a/src/Microsoft.DotNet.Helix/Sdk/Readme.md b/src/Microsoft.DotNet.Helix/Sdk/Readme.md index 57a690c29e3..612fd72bd7d 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.1 + 2.4.2-pre.9 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 4dc2c244878..8356d66c2bc 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 @@ netcoreapp3.1 netcoreapp2.0 - 2.4.1 + 2.4.2-pre.9 <_XUnitPublishTargetsPath>$(MSBuildThisFileDirectory)XUnitPublish.targets From f8d6df0943301aefd21a8cc9ef86a9527fb459c9 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Mon, 20 Sep 2021 10:28:49 -0700 Subject: [PATCH 2/7] temporarily continue using nuget older xrunner console version --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8356d66c2bc..950313b278d 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://api.nuget.org/v3-flatcontainer/xunit.runner.console/$(XUnitRunnerVersion)/xunit.runner.console.$(XUnitRunnerVersion).nupkg + https://api.nuget.org/v3-flatcontainer/xunit.runner.console/2.4.1/xunit.runner.console.$(XUnitRunnerVersion).nupkg xunit-runner From b62d18ea4566e3968656da38e36ffff30a7ef174 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Tue, 21 Sep 2021 10:54:08 -0700 Subject: [PATCH 3/7] Update src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 950313b278d..4562b0beb83 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://api.nuget.org/v3-flatcontainer/xunit.runner.console/2.4.1/xunit.runner.console.$(XUnitRunnerVersion).nupkg + https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=2.4.2-pre.9 xunit-runner From a04931f384083415e849e560b2f4533c6e5479b3 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Tue, 21 Sep 2021 10:55:19 -0700 Subject: [PATCH 4/7] Update src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4562b0beb83..dd235c4f606 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=2.4.2-pre.9 + https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=$(XUnitRunnerVersion) xunit-runner From 0b214f6daef0a9e3119e16c3a9c8fa3601efd927 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Thu, 23 Sep 2021 14:13:09 -0700 Subject: [PATCH 5/7] Update src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 dd235c4f606..261b40a6ace 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=$(XUnitRunnerVersion) + https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=$(XUnitRunnerVersion) xunit-runner From c6e6ca8a9de9cfa7e315186f2c84b8804f42c737 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Mon, 27 Sep 2021 17:12:58 -0700 Subject: [PATCH 6/7] Update src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 261b40a6ace..38e9bde08c4 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=xunit.runner.console&protocolType=NuGet&version=$(XUnitRunnerVersion) + https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xunit/$(XUnitRunnerVersion)/xunit.$(XUnitRunnerVersion).nupkg xunit-runner From 06868dd339ca05ad440f334e78ebc4927d71de88 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Tue, 28 Sep 2021 17:48:18 -0700 Subject: [PATCH 7/7] Update src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets Co-authored-by: Eric StJohn --- .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 38e9bde08c4..c188051bc85 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -12,7 +12,7 @@ - https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xunit/$(XUnitRunnerVersion)/xunit.$(XUnitRunnerVersion).nupkg + https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/xunit.runner.console/$(XUnitRunnerVersion)/xunit.runner.console.$(XUnitRunnerVersion).nupkg xunit-runner