Get Helix ready for servicing #25477
Conversation
… Helix runs - remove hard-coded `$(AppRuntimeVersion)` property entirely - use `$(SharedFxVersion)` instead nits: - make `RunTests` help more clear about how `--runtime` option is used - remove unused `--sdk` option on `RunTests` command line - add Microsoft.AspNetCore.App.Ref package to Helix content later, ensuring it exists
ghost
added
the
area-infrastructure
|
@Pilchie I assume this can be |
|
/fyi Reviewers, this came out of the servicing readiness test. Turns out another change I made for the (still-failing) 6.0 branding work is needed once we stabilize our versions. |
|
Definitely tell before 10am tomorrow. I'll confirm the test only bar for after that during tactics tomorrow. |
| <HelixUseArchive>false</HelixUseArchive> | ||
| <LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging> | ||
| <NodeVersion>10.15.3</NodeVersion> | ||
| <AppRuntimeVersion>5.0.0-ci</AppRuntimeVersion> |
There was a problem hiding this comment.
I also wonder if this hard-code version was causing problems when using eng/scripts/RunHelix.ps1 locally, where the version would be 5.0.0-dev even now❔
There was a problem hiding this comment.
Yes for sure, that's what we use for the directory we install to, if you were seeing weirdness with the bits not installed correctly this would be why
| <PostCommands>@(HelixPostCommand)</PostCommands> | ||
| <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout)</Command> | ||
| <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(AppRuntimeVersion).nupkg Microsoft.AspNetCore.App.Ref.$(AppRuntimeVersion).nupkg $(HelixTimeout)</Command> | ||
| <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(SharedFxVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture) $(RunQuarantinedTests) $(DotnetEfPackageVersion) Microsoft.AspNetCore.App.Runtime.win-x64.$(SharedFxVersion).nupkg Microsoft.AspNetCore.App.Ref.$(SharedFxVersion).nupkg $(HelixTimeout)</Command> |
There was a problem hiding this comment.
Seems worth considering calculating the runtime from the sharedfxversion, would save us one parameter...
There was a problem hiding this comment.
Maybe. I was originally thinking of parsing the filename i.e. going the other way but dropped that before thinking of creating the filename. But, worthwhile or not, I'd rather get this in if it passes the CI. I'm also unlikely to do the relatively minor follow up but feel free❕
Do not use
$(AppRuntimeVersion)or NETCore version for shared Fx in Helix runs$(AppRuntimeVersion)property entirely$(SharedFxVersion)insteadnits:
RunTestshelp more clear about how--runtimeoption is used--sdkoption onRunTestscommand line