From 5b14ca685958b71f6fb4c10b1744d6bebb893e9f Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Thu, 28 Apr 2022 18:20:15 -0700 Subject: [PATCH] Rename `RunTests` project to `HelixTestRunner` - less confusing given `RunTests` target and runtests.sh et cetera --- AspNetCore.sln | 2 +- docs/UpdatingMajorVersionAndTFM.md | 4 ++-- eng/Build.props | 2 +- eng/helix/content/runtests.cmd | 4 ++-- eng/helix/content/runtests.sh | 4 ++-- eng/helix/helix.proj | 8 ++++---- eng/targets/Helix.targets | 6 +++--- .../HelixTestRunner.csproj} | 0 .../HelixTestRunnerOptions.cs} | 8 ++++---- eng/tools/{RunTests => HelixTestRunner}/ProcessResult.cs | 2 +- eng/tools/{RunTests => HelixTestRunner}/ProcessUtil.cs | 2 +- eng/tools/{RunTests => HelixTestRunner}/Program.cs | 6 +++--- eng/tools/{RunTests => HelixTestRunner}/TestRunner.cs | 8 ++++---- eng/tools/tools.slnf | 4 ++-- 14 files changed, 30 insertions(+), 30 deletions(-) rename eng/tools/{RunTests/RunTests.csproj => HelixTestRunner/HelixTestRunner.csproj} (100%) rename eng/tools/{RunTests/RunTestsOptions.cs => HelixTestRunner/HelixTestRunnerOptions.cs} (95%) rename eng/tools/{RunTests => HelixTestRunner}/ProcessResult.cs (94%) rename eng/tools/{RunTests => HelixTestRunner}/ProcessUtil.cs (99%) rename eng/tools/{RunTests => HelixTestRunner}/Program.cs (89%) rename eng/tools/{RunTests => HelixTestRunner}/TestRunner.cs (98%) diff --git a/AspNetCore.sln b/AspNetCore.sln index 570c59e03a42..8f1e7bf485dc 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1704,7 +1704,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLimiting.Tests", "src\Middleware\RateLimiting\test\Microsoft.AspNetCore.RateLimiting.Tests.csproj", "{41FF4F96-98D2-4482-A2A7-4B179E80D285}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RunTests", "eng\tools\RunTests\RunTests.csproj", "{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelixTestRunner", "eng\tools\HelixTestRunner\HelixTestRunner.csproj", "{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/docs/UpdatingMajorVersionAndTFM.md b/docs/UpdatingMajorVersionAndTFM.md index 9be461a58d31..ec0f304d657f 100644 --- a/docs/UpdatingMajorVersionAndTFM.md +++ b/docs/UpdatingMajorVersionAndTFM.md @@ -33,7 +33,7 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda * In [eng/Versions.props](/eng/Versions.props), increment `DefaultNetCoreTargetFramework` by 1. * Do a global repo search for the current version string, and update almost everything by 1 (e.g. find `net7`, replace with `net8`). See the PR linked above for examples - this shouldn't be done blindly, but on a case-by-case basis. Most things should be updated, and most choices should be obvious. - * Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/RunTests/RunTests.csproj](/eng/tools/RunTests/RunTests.csproj). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`. + * Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/HelixTestRunner/HelixTestRunner.csproj](/eng/tools/HelixTestRunner/HelixTestRunner.csproj). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`. * Add a reference to the new `SiteExtensions` package for the previous Major Version. 1. Add references to [src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj](/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj) to `Microsoft.AspNetCore.AzureAppServices.SiteExtension.{PreviousMajorVersion}.0.x64` and `Microsoft.AspNetCore.AzureAppServices.SiteExtension.{PreviousMajorVersion}.0.x86`. 2. Add entries in [eng/Versions.props](/eng/Versions.props) similar to [these](https://github.com/dotnet/aspnetcore/blob/216c92b78bce31d5e81a70b589707ec2ae5ab21a/eng/Versions.props#L224-L226) - the version should be from the latest released build of .Net. @@ -56,4 +56,4 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda ## Ingesting an SDK with the new TFM -Typically we update the SDK we use in `main` every Monday. Once we have one that contains `Microsoft.Netcore.App` entries with the new TFM, we can update [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/RunTests/RunTests.csproj](/eng/helix/tools/RunTests.csproj) to use `DefaultNetCoreTargetFramework` again rather than hard-coding the previous TFM. +Typically we update the SDK we use in `main` every Monday. Once we have one that contains `Microsoft.Netcore.App` entries with the new TFM, we can update [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/HelixTestRunner/HelixTestRunner.csproj](/eng/helix/tools/HelixTestRunner.csproj) to use `DefaultNetCoreTargetFramework` again rather than hard-coding the previous TFM. diff --git a/eng/Build.props b/eng/Build.props index c2566a81e5e2..76464fbdd8d1 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -199,7 +199,7 @@ $(RepoRoot)src\Extensions\**\*.csproj; $(RepoRoot)src\BuildAfterTargetingPack\*.csproj; $(RepoRoot)src\OpenApi\**\*.csproj; - $(RepoRoot)eng\tools\RunTests\RunTests.csproj; + $(RepoRoot)eng\tools\HelixTestRunner\HelixTestRunner.csproj; " Exclude=" @(ProjectToBuild); diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index ea9383a5d529..379597f02fe4 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -21,8 +21,8 @@ echo. set exit_code=0 -echo "Running tests: $HELIX_CORRELATION_PAYLOAD/RunTests/RunTests.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright $installPlaywright" -$HELIX_CORRELATION_PAYLOAD/RunTests/RunTests.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright $installPlaywright +echo "Running tests: $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright $installPlaywright" +$HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.exe --target %$target% --runtime %$aspRuntimeVersion% --queue %$queue% --arch %$arch% --quarantined %$quarantined% --helixTimeout %$helixTimeout% --playwright $installPlaywright if not errorlevel 0 ( set exit_code=%errorlevel% ) diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index 629336006df0..d8ca1ecd7886 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -75,8 +75,8 @@ sync exit_code=0 -echo "Running tests: dotnet run $HELIX_CORRELATION_PAYLOAD/RunTests/RunTests.dll -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright" -dotnet run $HELIX_CORRELATION_PAYLOAD/RunTests/RunTests.dll -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright +echo "Running tests: dotnet run $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright" +dotnet run $HELIX_CORRELATION_PAYLOAD/HelixTestRunner/HelixTestRunner.dll -- --target $1 --runtime $2 --queue $helixQueue --arch $4 --quarantined $5 --helixTimeout $6 --playwright $installPlaywright exit_code=$? echo "Finished tests...exit_code=$exit_code" diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index ab79917aefe5..9c1625bcdc8c 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -48,14 +48,14 @@ runtime - + - - + + diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 582eead9d6cd..c290255176b1 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -188,9 +188,9 @@ SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" /> ("--runtime"); - var options = new RunTestsOptions + var options = new HelixTestRunnerOptions { Architecture = parseResult.ValueForOption("--arch"), HelixQueue = parseResult.ValueForOption("--queue"), diff --git a/eng/tools/RunTests/ProcessResult.cs b/eng/tools/HelixTestRunner/ProcessResult.cs similarity index 94% rename from eng/tools/RunTests/ProcessResult.cs rename to eng/tools/HelixTestRunner/ProcessResult.cs index 7f2fc0a297b5..29a8b3bc1e88 100644 --- a/eng/tools/RunTests/ProcessResult.cs +++ b/eng/tools/HelixTestRunner/ProcessResult.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace RunTests; +namespace HelixTestRunner; public class ProcessResult { diff --git a/eng/tools/RunTests/ProcessUtil.cs b/eng/tools/HelixTestRunner/ProcessUtil.cs similarity index 99% rename from eng/tools/RunTests/ProcessUtil.cs rename to eng/tools/HelixTestRunner/ProcessUtil.cs index 40ea7a9df1d1..1dc275987c6e 100644 --- a/eng/tools/RunTests/ProcessUtil.cs +++ b/eng/tools/HelixTestRunner/ProcessUtil.cs @@ -12,7 +12,7 @@ #nullable enable -namespace RunTests; +namespace HelixTestRunner; public static class ProcessUtil { diff --git a/eng/tools/RunTests/Program.cs b/eng/tools/HelixTestRunner/Program.cs similarity index 89% rename from eng/tools/RunTests/Program.cs rename to eng/tools/HelixTestRunner/Program.cs index 41463de30832..f388f76851ee 100644 --- a/eng/tools/RunTests/Program.cs +++ b/eng/tools/HelixTestRunner/Program.cs @@ -4,7 +4,7 @@ using System; using System.Threading.Tasks; -namespace RunTests; +namespace HelixTestRunner; class Program { @@ -12,7 +12,7 @@ static async Task Main(string[] args) { try { - var runner = new TestRunner(RunTestsOptions.Parse(args)); + var runner = new TestRunner(HelixTestRunnerOptions.Parse(args)); var keepGoing = runner.SetupEnvironment(); if (keepGoing) @@ -54,7 +54,7 @@ static async Task Main(string[] args) } catch (Exception e) { - Console.WriteLine($"RunTests uncaught exception: {e.ToString()}"); + Console.WriteLine($"HelixTestRunner uncaught exception: {e.ToString()}"); Environment.Exit(1); } } diff --git a/eng/tools/RunTests/TestRunner.cs b/eng/tools/HelixTestRunner/TestRunner.cs similarity index 98% rename from eng/tools/RunTests/TestRunner.cs rename to eng/tools/HelixTestRunner/TestRunner.cs index f21f3036e418..17cbf5b0ebda 100644 --- a/eng/tools/RunTests/TestRunner.cs +++ b/eng/tools/HelixTestRunner/TestRunner.cs @@ -1,17 +1,17 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace RunTests; +namespace HelixTestRunner; public class TestRunner { - public TestRunner(RunTestsOptions options) + public TestRunner(HelixTestRunnerOptions options) { Options = options; EnvironmentVariables = new Dictionary(); } - public RunTestsOptions Options { get; set; } + public HelixTestRunnerOptions Options { get; set; } public Dictionary EnvironmentVariables { get; set; } public bool SetupEnvironment() @@ -262,7 +262,7 @@ public async Task RunTestsAsync() } catch (Exception e) { - Console.WriteLine($"Exception in RunTests: {e}"); + Console.WriteLine($"Exception in HelixTestRunner: {e}"); exitCode = 1; } return exitCode; diff --git a/eng/tools/tools.slnf b/eng/tools/tools.slnf index d5cd80951d98..bdd4896e94f4 100644 --- a/eng/tools/tools.slnf +++ b/eng/tools/tools.slnf @@ -4,7 +4,7 @@ "projects": [ "eng\\tools\\BaselineGenerator\\BaselineGenerator.csproj", "eng\\tools\\RepoTasks\\RepoTasks.csproj", - "eng\\tools\\RunTests\\RunTests.csproj" + "eng\\tools\\HelixTestRunner\\HelixTestRunner.csproj" ] } -} \ No newline at end of file +}