-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2066 from dotnet/merges/release/2.1.2xx-to-releas…
…e/2.1.3xx Merge release/2.1.2xx to release/2.1.3xx
- Loading branch information
Showing
24 changed files
with
301 additions
and
77 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| @echo off | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass %~dp0build\build.ps1 -build -restore -log %* | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0build\build.ps1""" -build -restore -log %*" | ||
| exit /b %ErrorLevel% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| @echo off | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass %~dp0Build.ps1 -restore -build -test -sign -pack -ci %* | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -ci %*" | ||
| exit /b %ErrorLevel% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| @echo off | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -NoExit %~dp0Build.ps1 -dogfood %* | ||
| powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -NoExit -Command "& """%~dp0Build.ps1""" -dogfood %*" | ||
| exit /b %ErrorLevel% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| @echo off | ||
| setlocal EnableDelayedExpansion | ||
|
|
||
| REM The intent of this script is upload produced performance results to BenchView in a CI context. | ||
| REM There is no support for running this script in a dev environment. | ||
|
|
||
| if "%perfWorkingDirectory%" == "" ( | ||
| echo EnvVar perfWorkingDirectory should be set; exiting... | ||
| exit /b %1) | ||
| if "%configuration%" == "" ( | ||
| echo EnvVar configuration should be set; exiting... | ||
| exit /b 1) | ||
| if "%architecture%" == "" ( | ||
| echo EnvVar architecture should be set; exiting... | ||
| exit /b 1) | ||
| if "%OS%" == "" ( | ||
| echo EnvVar OS should be set; exiting... | ||
| exit /b 1) | ||
| if "%runType%" == "" ( | ||
| echo EnvVar runType should be set; exiting... | ||
| exit /b 1) | ||
| if "%GIT_BRANCH%" == "" ( | ||
| echo EnvVar GIT_BRANCH should be set; exiting... | ||
| exit /b 1) | ||
| if "%GIT_COMMIT%" == "" ( | ||
| echo EnvVar GIT_COMMIT should be set; exiting... | ||
| exit /b 1) | ||
| if /I "%runType%" == "private" ( | ||
| if "%BenchviewCommitName%" == "" ( | ||
| echo EnvVar BenchviewCommitName should be set; exiting... | ||
| exit /b 1)) | ||
|
|
||
|
|
||
| powershell -NoProfile wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile "%perfWorkingDirectory%\nuget.exe" | ||
|
|
||
| if exist "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat" rmdir /s /q "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat" | ||
| "%perfWorkingDirectory%\nuget.exe" install Microsoft.BenchView.JSONFormat -Source http://benchviewtestfeed.azurewebsites.net/nuget -OutputDirectory "%perfWorkingDirectory%" -Prerelease -ExcludeVersion | ||
|
|
||
| REM Do this here to remove the origin but at the front of the branch name as this is a problem for BenchView | ||
| if "%GIT_BRANCH:~0,7%" == "origin/" (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH:origin/=%) else (set GIT_BRANCH_WITHOUT_ORIGIN=%GIT_BRANCH%) | ||
|
|
||
| set benchViewName=SDK perf %OS% %architecture% %configuration% %runType% %GIT_BRANCH_WITHOUT_ORIGIN% | ||
| if /I "%runType%" == "private" (set benchViewName=%benchViewName% %BenchviewCommitName%) | ||
| if /I "%runType%" == "rolling" (set benchViewName=%benchViewName% %GIT_COMMIT%) | ||
| echo BenchViewName: "%benchViewName%" | ||
|
|
||
| echo Creating: "%perfWorkingDirectory%\submission-metadata.json" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission-metadata.py" --name "%benchViewName%" --user-email "[email protected]" -o "%perfWorkingDirectory%\submission-metadata.json" | ||
|
|
||
| echo Creating: "%perfWorkingDirectory%\build.json" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\build.py" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type "%runType%" -o "%perfWorkingDirectory%\build.json" | ||
|
|
||
| echo Creating: "%perfWorkingDirectory%\machinedata.json" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\machinedata.py" -o "%perfWorkingDirectory%\machinedata.json" | ||
|
|
||
| echo Creating: "%perfWorkingDirectory%\measurement.json" | ||
| pushd "%perfWorkingDirectory%" | ||
| for /f "tokens=*" %%a in ('dir /b/a-d *.xml') do ( | ||
| echo Processing: "%%a" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\measurement.py" xunitscenario "%%a" --better desc --append -o "%perfWorkingDirectory%\measurement.json" | ||
| ) | ||
| popd | ||
|
|
||
| echo Creating: "${perfWorkingDirectory}\submission.json" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission.py" "%perfWorkingDirectory%\measurement.json" ^ | ||
| --build "%perfWorkingDirectory%\build.json" ^ | ||
| --machine-data "%perfWorkingDirectory%\machinedata.json" ^ | ||
| --metadata "%perfWorkingDirectory%\submission-metadata.json" ^ | ||
| --group "SDK Perf Tests" ^ | ||
| --type "%runType%" ^ | ||
| --config-name %configuration% ^ | ||
| --config Configuration %configuration% ^ | ||
| --architecture %architecture% ^ | ||
| --machinepool "perfsnake" ^ | ||
| -o "%perfWorkingDirectory%\submission.json" | ||
|
|
||
| echo Uploading: "%perfWorkingDirectory%\submission.json" | ||
| py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\upload.py" "%perfWorkingDirectory%\submission.json" --container coreclr | ||
|
|
||
| exit /b %ErrorLevel% |
Oops, something went wrong.