-
Notifications
You must be signed in to change notification settings - Fork 779
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/fsharp47' into fsi-packetmanagement
- Loading branch information
Showing
217 changed files
with
5,176 additions
and
3,325 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
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
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
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
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
Empty file.
Empty file.
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
Empty file.
Empty file.
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,77 @@ | ||
| <Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test"> | ||
|
|
||
| <PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'"> | ||
| <WorkItemCommand>%HELIX_CORRELATION_PAYLOAD%\performance\scripts\benchmarks_ci.py --csproj %HELIX_CORRELATION_PAYLOAD%\performance\$(TargetCsproj)</WorkItemCommand> | ||
| <CliArguments>--dotnet-versions %DOTNET_VERSION% --cli-source-info args --cli-branch %PERFLAB_BRANCH% --cli-commit-sha %PERFLAB_HASH% --cli-repository https://github.com/%PERFLAB_REPO% --cli-source-timestamp %PERFLAB_BUILDTIMESTAMP%</CliArguments> | ||
| <Python>py -3</Python> | ||
| <CoreRun>%HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe</CoreRun> | ||
| <HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd</HelixPreCommands> | ||
| <ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT' and '$(RunFromPerfRepo)' == 'false'"> | ||
| <BaseDirectory>$HELIX_CORRELATION_PAYLOAD</BaseDirectory> | ||
| <PerformanceDirectory>$(BaseDirectory)/performance</PerformanceDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT' and '$(RunFromPerfRepo)' == 'true'"> | ||
| <BaseDirectory>$HELIX_WORKITEM_PAYLOAD</BaseDirectory> | ||
| <PerformanceDirectory>$(BaseDirectory)</PerformanceDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'"> | ||
| <WorkItemCommand>$(PerformanceDirectory)/scripts/benchmarks_ci.py --csproj $(PerformanceDirectory)/$(TargetCsproj)</WorkItemCommand> | ||
| <CliArguments>--dotnet-versions $DOTNET_VERSION --cli-source-info args --cli-branch $PERFLAB_BRANCH --cli-commit-sha $PERFLAB_HASH --cli-repository https://github.com/$PERFLAB_REPO --cli-source-timestamp $PERFLAB_BUILDTIMESTAMP</CliArguments> | ||
| <Python>python3</Python> | ||
| <CoreRun>$(BaseDirectory)/Core_Root/corerun</CoreRun> | ||
| <HelixPreCommands>$(HelixPreCommands);chmod +x $(PerformanceDirectory)/tools/machine-setup.sh;. $(PerformanceDirectory)/tools/machine-setup.sh</HelixPreCommands> | ||
| <ArtifactsDirectory>$(BaseDirectory)/artifacts/BenchmarkDotNet.Artifacts</ArtifactsDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(UseCoreRun)' == 'true'"> | ||
| <CoreRunArgument>--corerun $(CoreRun)</CoreRunArgument> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(WorkItemCommand)' != ''"> | ||
| <WorkItemCommand>$(Python) $(WorkItemCommand) --incremental no --architecture $(Architecture) -f $(_Framework) $(PerfLabArguments)</WorkItemCommand> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(_Framework)' != 'net461'"> | ||
| <WorkItemCommand>$(WorkItemCommand) $(CliArguments)</WorkItemCommand> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)"> | ||
| <PayloadDirectory>%(Identity)</PayloadDirectory> | ||
| </HelixCorrelationPayload> | ||
| </ItemGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <PartitionCount>5</PartitionCount> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <Partition Include="$(BuildConfig).Partition0" Index="0" /> | ||
| <Partition Include="$(BuildConfig).Partition1" Index="1" /> | ||
| <Partition Include="$(BuildConfig).Partition2" Index="2" /> | ||
| <Partition Include="$(BuildConfig).Partition3" Index="3" /> | ||
| <Partition Include="$(BuildConfig).Partition4" Index="4" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- | ||
| Partition the Microbenchmarks project, but nothing else | ||
| --> | ||
| <ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))"> | ||
| <HelixWorkItem Include="@(Partition)"> | ||
| <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> | ||
| <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command> | ||
| <Timeout>4:00</Timeout> | ||
| </HelixWorkItem> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))"> | ||
| <HelixWorkItem Include="$(BuildConfig).WorkItem"> | ||
| <PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory> | ||
| <Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)"</Command> | ||
| <Timeout>4:00</Timeout> | ||
| </HelixWorkItem> | ||
| </ItemGroup> | ||
| </Project> |
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,91 @@ | ||
| Param( | ||
| [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, | ||
| [string] $CoreRootDirectory, | ||
| [string] $Architecture="x64", | ||
| [string] $Framework="netcoreapp3.0", | ||
| [string] $CompilationMode="Tiered", | ||
| [string] $Repository=$env:BUILD_REPOSITORY_NAME, | ||
| [string] $Branch=$env:BUILD_SOURCEBRANCH, | ||
| [string] $CommitSha=$env:BUILD_SOURCEVERSION, | ||
| [string] $BuildNumber=$env:BUILD_BUILDNUMBER, | ||
| [string] $RunCategories="coreclr corefx", | ||
| [string] $Csproj="src\benchmarks\micro\MicroBenchmarks.csproj", | ||
| [string] $Kind="micro", | ||
| [switch] $Internal, | ||
| [string] $Configurations="CompilationMode=$CompilationMode" | ||
| ) | ||
|
|
||
| $RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") | ||
| $UseCoreRun = ($CoreRootDirectory -ne [string]::Empty) | ||
|
|
||
| $PayloadDirectory = (Join-Path $SourceDirectory "Payload") | ||
| $PerformanceDirectory = (Join-Path $PayloadDirectory "performance") | ||
| $WorkItemDirectory = (Join-Path $SourceDirectory "workitem") | ||
| $ExtraBenchmarkDotNetArguments = "--iterationCount 1 --warmupCount 0 --invocationCount 1 --unrollFactor 1 --strategy ColdStart --stopOnFirstError true" | ||
| $Creator = $env:BUILD_DEFINITIONNAME | ||
| $PerfLabArguments = "" | ||
| $HelixSourcePrefix = "pr" | ||
|
|
||
| $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open" | ||
|
|
||
| if ($Framework.StartsWith("netcoreapp")) { | ||
| $Queue = "Windows.10.Amd64.ClientRS4.Open" | ||
| } | ||
|
|
||
| if ($Internal) { | ||
| $Queue = "Windows.10.Amd64.ClientRS5.Perf" | ||
| $PerfLabArguments = "--upload-to-perflab-container" | ||
| $ExtraBenchmarkDotNetArguments = "" | ||
| $Creator = "" | ||
| $HelixSourcePrefix = "official" | ||
| } | ||
|
|
||
| $CommonSetupArguments="--frameworks $Framework --queue $Queue --build-number $BuildNumber --build-configs $Configurations" | ||
| $SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments" | ||
|
|
||
| if ($RunFromPerformanceRepo) { | ||
| $SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments" | ||
|
|
||
| robocopy $SourceDirectory $PerformanceDirectory /E /XD $PayloadDirectory $SourceDirectory\artifacts $SourceDirectory\.git | ||
| } | ||
| else { | ||
| git clone --branch master --depth 1 --quiet https://github.com/dotnet/performance $PerformanceDirectory | ||
| } | ||
|
|
||
| if ($UseCoreRun) { | ||
| $NewCoreRoot = (Join-Path $PayloadDirectory "Core_Root") | ||
| Move-Item -Path $CoreRootDirectory -Destination $NewCoreRoot | ||
| } | ||
|
|
||
| $DocsDir = (Join-Path $PerformanceDirectory "docs") | ||
| robocopy $DocsDir $WorkItemDirectory | ||
|
|
||
| # Set variables that we will need to have in future steps | ||
| $ci = $true | ||
|
|
||
| . "$PSScriptRoot\..\pipeline-logging-functions.ps1" | ||
|
|
||
| # Directories | ||
| Write-PipelineSetVariable -Name 'PayloadDirectory' -Value "$PayloadDirectory" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'PerformanceDirectory' -Value "$PerformanceDirectory" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'WorkItemDirectory' -Value "$WorkItemDirectory" -IsMultiJobVariable $false | ||
|
|
||
| # Script Arguments | ||
| Write-PipelineSetVariable -Name 'Python' -Value "py -3" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'ExtraBenchmarkDotNetArguments' -Value "$ExtraBenchmarkDotNetArguments" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'SetupArguments' -Value "$SetupArguments" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'PerfLabArguments' -Value "$PerfLabArguments" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'BDNCategories' -Value "$RunCategories" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'TargetCsproj' -Value "$Csproj" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'Kind' -Value "$Kind" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'Architecture' -Value "$Architecture" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'UseCoreRun' -Value "$UseCoreRun" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'RunFromPerfRepo' -Value "$RunFromPerformanceRepo" -IsMultiJobVariable $false | ||
|
|
||
| # Helix Arguments | ||
| Write-PipelineSetVariable -Name 'Creator' -Value "$Creator" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false | ||
| Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false | ||
|
|
||
| exit 0 |
Oops, something went wrong.