diff options
author | Tanay Parikh <TanayParikh@users.noreply.github.com> | 2022-04-30 04:31:05 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-30 04:31:05 +0300 |
commit | 0be2c29d9c09da46e95047afb41514fb58137c26 (patch) | |
tree | 76863b0c1aba414bb0ffe768e17caad77c536774 /AspNetCore.sln | |
parent | e579ee6ba1909c84dbc4c033292193ff42a96b36 (diff) |
Helix Restore Issue Mitigation (#41311)
* RunTests dotnet run --no-build
* Remove duplicate run
* Add to Build.props
* Treat CA2007 as a warning in RunTests
* NoWarn CA2007
* Ignore NU5104 for System.CommandLine prerelease package
* PR Feedback
* PR Feedback
* Generate .config/dotnet-tools.json
- add generation to GenerateFiles.csproj
- include all required versions in eng/Versions.props
- nit: bump tool versions slightly
- `dotnet-dump` move from `5.0.0-*` to `6.0.322601` is largest version bump
- have `git` ignore generated file
- nit: put `*.svclog` together w/ other extension exclusions
* Add tool packages to Helix correlation payloads
* Do not restore tools from network
- get tool packages from Helix correlation root
- to do this, save and restore NuGet.config file
- this removes `--version` from `dotnet-dump` and `dotnet-ef` installations
- will only have a single package for each tool in the correlation payload
* Do not pass `dotnet-ef` version to `RunTests`
- mostly cleanup; no longer needed
* Remove DotNetToolsInstaller.csproj
- mostly cleanup
- `dotnet-ef` tool now restored by Arcade's Tools.proj much earlier in our build because
most configured tool packages are needed in `RunTests` on Helix agents
* Add `--playwright` option in `Runtests`
- remove `INSTALLPLAYWRIGHT` define and `$env:INSTALLPLAYWRIGHT`
- always reference Microsoft.Playwright in `RunTests`
- nit: `InstallPlaywrightAsync()` wasn't `async`; fix it and rename to `InstallPlaywright()`
* Use Arcade SDK in `RunTests` and `Publish` project
- match most other projects in this repo
- remove empty Directory.Build.props and .targets files preventing Arcade imports
- exclude project build if `$(SkipTestBuild)` (though not a test project)
* Correct minor problems in `RunTests` source
* Use file-scoped namespaces in `RunTests` source
* Use VS code fixes in `RunTests`
* Use published `RunTests` output on Helix agents
* Move `RunTests` under eng/tools/
- don't need the project on Helix agents
- restore Directory.Build.* files removed when switching to Arcade
* Add `RunTests` to tools.slnf
* Rename `RunTests` project to `HelixTestRunner`
- less confusing given `RunTests` target and runtests.sh et cetera
* !fixup! Define `$(ArtifactsBinDir)` in helix.proj
* !fixup! Use `$(Configuration)` in helix.proj
* !fixup! Fix typo in property function
* !fixup! Fix `dotnet` syntax in runtests.sh
* !fixup! Correct `%(HelixCorrelationPayload.Destination)`
Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Diffstat (limited to 'AspNetCore.sln')
-rw-r--r-- | AspNetCore.sln | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/AspNetCore.sln b/AspNetCore.sln index 3ed16097b0..8f1e7bf485 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -1618,8 +1618,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "src\Middleware\CORS\test\testassets\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{9B240135-3D1E-4EE6-B870-D810F3C856FB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "src\ProjectTemplates\testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{C0FD6DB3-9407-4F07-B909-16762E579ECB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{5E46DC83-C39C-4E3A-B242-C064607F4367}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}" @@ -1706,6 +1704,8 @@ 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}") = "HelixTestRunner", "eng\tools\HelixTestRunner\HelixTestRunner.csproj", "{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -9778,22 +9778,6 @@ Global {9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x64.Build.0 = Release|Any CPU {9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.ActiveCfg = Release|Any CPU {9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.Build.0 = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|arm64.ActiveCfg = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|arm64.Build.0 = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x64.ActiveCfg = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x64.Build.0 = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x86.ActiveCfg = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x86.Build.0 = Debug|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|Any CPU.Build.0 = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|arm64.ActiveCfg = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|arm64.Build.0 = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x64.ActiveCfg = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x64.Build.0 = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x86.ActiveCfg = Release|Any CPU - {C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x86.Build.0 = Release|Any CPU {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|Any CPU.ActiveCfg = Debug|Win32 {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|arm64.ActiveCfg = Debug|Win32 {7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.ActiveCfg = Debug|x64 @@ -10227,6 +10211,22 @@ Global {41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x64.Build.0 = Release|Any CPU {41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.ActiveCfg = Release|Any CPU {41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.Build.0 = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.ActiveCfg = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.Build.0 = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.ActiveCfg = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.Build.0 = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.ActiveCfg = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.Build.0 = Debug|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.Build.0 = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.ActiveCfg = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.Build.0 = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.ActiveCfg = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.Build.0 = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.ActiveCfg = Release|Any CPU + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -11028,7 +11028,6 @@ Global {3F0C05F5-47EF-4896-8D32-4C80C4563286} = {B5E22428-DAD8-4275-B8F0-14EC2174DDFE} {83FA6123-6EC3-47F3-A0DC-A10225B5EB16} = {45211BB8-4F51-427D-ADA2-7478E3398A60} {9B240135-3D1E-4EE6-B870-D810F3C856FB} = {83FA6123-6EC3-47F3-A0DC-A10225B5EB16} - {C0FD6DB3-9407-4F07-B909-16762E579ECB} = {08D53E58-4AAE-40C4-8497-63EC8664F304} {5E46DC83-C39C-4E3A-B242-C064607F4367} = {017429CC-C5FB-48B4-9C46-034E29EE2F06} {7C27E72F-54D0-4820-8CFA-5E4BE640974B} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} {7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6} @@ -11070,6 +11069,7 @@ Global {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B} = {017429CC-C5FB-48B4-9C46-034E29EE2F06} {3AEFB466-6310-4F3F-923F-9154224E3629} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B} {EFC8EA45-572D-4D8D-A597-9045A2D8EC40} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B} + {51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F} = {0F84F170-57D0-496B-8E2C-7984178EF69F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F} |