[PERF] Finish fixing PerfBDNApp, continuation of #89057 #89135
Conversation
…l out the BDNVersion value from the performance Versions.props.
LoopedBard3
requested review from
sblom,
cincuranet,
DrewScoggins and
caaavik-msft
|
Tagging subscribers to this area: @dotnet/runtime-infrastructure Issue DetailsContinuation of https://github.com/dotnet/runtime/pull/89057/files as it didn't completely fix the issue. Slightly reorders the build steps in the yml and grabs the BDNVersion used in the performance repo in order to inject the version into the maui PerfBDNApp build csproj. This is necessary because the Versions.props file from the performance repo is not available when building the mobile app. Test run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2224698&view=results
|
| - pwsh: | | ||
| $BenchmarkDotNetVersionCapture = Get-Content .\performance\eng\Versions.props | Select-String -Pattern '<BenchmarkDotNetVersion>(.*)</BenchmarkDotNetVersion>' |
There was a problem hiding this comment.
Maybe use (.+?) for "tighter" match.
| - pwsh: | | ||
| $BenchmarkDotNetVersionCapture = Get-Content .\performance\eng\Versions.props | Select-String -Pattern '<BenchmarkDotNetVersion>(.*)</BenchmarkDotNetVersion>' | ||
| $BenchmarkDotNetVersion = $BenchmarkDotNetVersionCapture.Matches.Groups[1].Value |
There was a problem hiding this comment.
Check here also that the match was successful?
There was a problem hiding this comment.
Added a check for this.
There was a problem hiding this comment.
Please take a quick look at this match check an let me know if you have any thoughts on better ways to do the check. Thanks!
There was a problem hiding this comment.
I don't have a strong opinion here. $BenchmarkDotNetVersionCapture.Matches[0].Success or ...Matches.Groups[1].Success might be other option.
…heck for the BDN version capture to make sure we find it, exiting with a 1 if not.
…d Mac, adding E for extended regex.
…tion-operator operand invalid as non-greedy matches appear to not be supported by all sed.
This reverts commit 23ed8d3.
|
Successful test run: https://dev.azure.com/dnceng/internal/_build/results?buildId=2225637&view=results |
| - pwsh: | | ||
| $BenchmarkDotNetVersionCapture = Get-Content .\performance\eng\Versions.props | Select-String -Pattern '<BenchmarkDotNetVersion>(.*)</BenchmarkDotNetVersion>' | ||
| $BenchmarkDotNetVersion = $BenchmarkDotNetVersionCapture.Matches.Groups[1].Value |
There was a problem hiding this comment.
I don't have a strong opinion here. $BenchmarkDotNetVersionCapture.Matches[0].Success or ...Matches.Groups[1].Success might be other option.
ghost
locked as resolved and limited conversation to collaborators
Continuation of #89057 as it didn't completely fix the issue. Slightly reorders the build steps in the yml and grabs the BDNVersion used in the performance repo in order to inject the version into the maui PerfBDNApp build csproj. This is necessary because the Versions.props file from the performance repo is not available when building the mobile app.
Test with successful build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2224698&view=results