Skip to content

Commit 6ce6635

Browse files
StephenBonikowskyStephenBonikowsky
authored
Merge pull request #3921 from mmitche/update-arcade
[release/3.0.0] Update arcade to version with stable versioning support
2 parents 04c7c32 + 3c235de commit 6ce6635

32 files changed

+889
-274
lines changed

‎eng/Version.Details.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19425.1">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
9+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19425.1">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.19461.7">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
13+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19425.1">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19461.7">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
17+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19425.1">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19461.7">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
21+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19425.1">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.1-beta.19461.7">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>2de3acc671fc624191672a45564f9ef130af5cd4</Sha>
25+
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727
</PropertyGroup>
2828
<!-- Arcade dependencies -->
2929
<PropertyGroup>
30-
<MicrosoftDotNetArcadeSdkPackageVersion>1.0.0-beta.19425.1</MicrosoftDotNetArcadeSdkPackageVersion>
31-
<MicrosoftDotNetHelixSdkPackageVersion>2.0.0-beta.19425.1</MicrosoftDotNetHelixSdkPackageVersion>
32-
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19425.1</MicrosoftDotNetGenFacadesPackageVersion>
33-
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19425.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
34-
<MicrosoftDotNetSignToolVersion>1.0.0-beta.19425.1</MicrosoftDotNetSignToolVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>1.0.0-beta.19461.7</MicrosoftDotNetArcadeSdkPackageVersion>
31+
<MicrosoftDotNetHelixSdkPackageVersion>2.0.0-beta.19461.7</MicrosoftDotNetHelixSdkPackageVersion>
32+
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19461.7</MicrosoftDotNetGenFacadesPackageVersion>
33+
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.1-beta.19461.7</MicrosoftDotNetXUnitExtensionsPackageVersion>
34+
<MicrosoftDotNetSignToolVersion>1.0.0-beta.19461.7</MicrosoftDotNetSignToolVersion>
3535
</PropertyGroup>
3636
<!-- CoreFx dependencies -->
3737
<PropertyGroup>

‎eng/common/build.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ function Build {
8585
# Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons.
8686
# Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty.
8787
[string[]] $msbuildArgs = $properties
88+
89+
# Resolve relative project paths into full paths
90+
$projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';')
91+
8892
$msbuildArgs += "/p:Projects=$projects"
8993
$properties = $msbuildArgs
9094
}

‎eng/common/darc-init.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
param (
22
$darcVersion = $null,
3-
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
3+
$versionEndpoint = "https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16",
4+
$verbosity = "m"
45
)
56

6-
$verbosity = "m"
77
. $PSScriptRoot\tools.ps1
88

99
function InstallDarcCli ($darcVersion) {

‎eng/common/darc-init.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,10 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
1823
*)
1924
echo "Invalid argument: $1"
2025
usage
@@ -34,7 +39,6 @@ while [[ -h "$source" ]]; do
3439
[[ $source != /* ]] && source="$scriptroot/$source"
3540
done
3641
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3842

3943
. "$scriptroot/tools.sh"
4044

‎eng/common/native/CommonLibrary.psm1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,8 @@ function Get-File {
152152
}
153153
else {
154154
Write-Verbose "Downloading $Uri"
155+
# Don't display the console progress UI - it's a huge perf hit
156+
$ProgressPreference = 'SilentlyContinue'
155157
while($Attempt -Lt $DownloadRetries)
156158
{
157159
try {

‎eng/common/performance/perfhelixpublish.proj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@
8383
<ItemGroup Condition="$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
8484
<HelixWorkItem Include="@(Partition)">
8585
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
86-
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(BaselineArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
87-
<Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
86+
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</PreCommands>
87+
<Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"</Command>
8888
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)</PostCommands>
8989
<Timeout>4:00</Timeout>
9090
</HelixWorkItem>
@@ -93,8 +93,8 @@
9393
<ItemGroup Condition="!$(TargetCsproj.Contains('MicroBenchmarks.csproj'))">
9494
<HelixWorkItem Include="$(BuildConfig).WorkItem">
9595
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
96-
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --artifacts $(ArtifactsDirectory)"</PreCommands>
97-
<Command>$(WorkItemCommand) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --artifacts $(ArtifactsDirectory)"</Command>
96+
<PreCommands Condition="'$(Compare)' == 'true'">$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"</PreCommands>
97+
<Command>$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"</Command>
9898
<PostCommands Condition="'$(Compare)' == 'true'">$(DotnetExe) run -f $(_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)</PostCommands>
9999
<Timeout>4:00</Timeout>
100100
</HelixWorkItem>

‎eng/common/performance/performance-setup.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Param(
1717
[string] $Configurations="CompilationMode=$CompilationMode"
1818
)
1919

20-
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance")
20+
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
2121
$UseCoreRun = ($CoreRootDirectory -ne [string]::Empty)
2222
$UseBaselineCoreRun = ($BaselineCoreRootDirectory -ne [string]::Empty)
2323

‎eng/common/performance/performance-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ while (($# > 0)); do
113113
esac
114114
done
115115

116-
if [[ "$repository" == "dotnet/performance" ]]; then
116+
if [ "$repository" == "dotnet/performance" ] || [ "$repository" == "dotnet-performance" ]; then
117117
run_from_perf_repo=true
118118
fi
119119

‎eng/common/post-build/symbols-validation.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ function FirstMatchingSymbolDescriptionOrDefault {
3737
# DWARF file for a .dylib
3838
$DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
3939

40-
$dotnetsymbolExe = "$env:USERPROFILE\.dotnet\tools"
41-
$dotnetsymbolExe = Resolve-Path "$dotnetsymbolExe\dotnet-symbol.exe"
40+
$dotnetSymbolExe = "$env:USERPROFILE\.dotnet\tools"
41+
$dotnetSymbolExe = Resolve-Path "$dotnetSymbolExe\dotnet-symbol.exe"
4242

43-
& $dotnetsymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
43+
& $dotnetSymbolExe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
4444

4545
if (Test-Path $PdbPath) {
4646
return "PDB"
@@ -159,25 +159,25 @@ function CheckSymbolsAvailable {
159159
}
160160
}
161161

162-
function Installdotnetsymbol {
163-
$dotnetsymbolPackageName = "dotnet-symbol"
162+
function InstallDotnetSymbol {
163+
$dotnetSymbolPackageName = "dotnet-symbol"
164164

165165
$dotnetRoot = InitializeDotNetCli -install:$true
166166
$dotnet = "$dotnetRoot\dotnet.exe"
167167
$toolList = & "$dotnet" tool list --global
168168

169-
if (($toolList -like "*$dotnetsymbolPackageName*") -and ($toolList -like "*$dotnetsymbolVersion*")) {
170-
Write-Host "dotnet-symbol version $dotnetsymbolVersion is already installed."
169+
if (($toolList -like "*$dotnetSymbolPackageName*") -and ($toolList -like "*$dotnetSymbolVersion*")) {
170+
Write-Host "dotnet-symbol version $dotnetSymbolVersion is already installed."
171171
}
172172
else {
173-
Write-Host "Installing dotnet-symbol version $dotnetsymbolVersion..."
173+
Write-Host "Installing dotnet-symbol version $dotnetSymbolVersion..."
174174
Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed."
175-
& "$dotnet" tool install $dotnetsymbolPackageName --version $dotnetsymbolVersion --verbosity "minimal" --global
175+
& "$dotnet" tool install $dotnetSymbolPackageName --version $dotnetSymbolVersion --verbosity "minimal" --global
176176
}
177177
}
178178

179179
try {
180-
Installdotnetsymbol
180+
InstallDotnetSymbol
181181

182182
CheckSymbolsAvailable
183183
}

0 commit comments

Comments
 (0)