Skip to content

Commit 64cc95b

Browse files
dotnet-maestro[bot]brettfo
dotnet-maestro[bot]
and
brettfo
authored
[main] Update dependencies from dotnet/arcade (#1234)
* Update dependencies from https://github.com/dotnet/arcade build 20210317.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.21105.12 -> To Version 6.0.0-beta.21167.3 * remain on stable sdk Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brett V. Forsgren <brettfo@microsoft.com>
1 parent 92ca730 commit 64cc95b

25 files changed

+266
-150
lines changed

‎eng/Version.Details.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21105.12">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21167.3">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>938b3e8b4edcd96ca0f0cbbae63c87b3f51f7afe</Sha>
9-
<SourceBuild RepoName="arcade" ManagedOnly="true"/>
8+
<Sha>0ca849f0b71866b007fedaaa938cee63f8d056a6</Sha>
9+
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

‎eng/common/cross/armel/tizen-fetch.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
157157
Inform "Initialize arm base"
158158
fetch_tizen_pkgs_init standard base
159159
Inform "fetch common packages"
160-
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
160+
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
162162
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163163
Inform "fetch corefx packages"

‎eng/common/cross/build-rootfs.sh‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ usage()
66
{
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
9-
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
9+
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd11 or freebsd12."
1111
echo " for illumos can be: illumos."
1212
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
@@ -183,9 +183,20 @@ while :; do
183183
__UbuntuRepo=
184184
__Tizen=tizen
185185
;;
186-
alpine)
186+
alpine|alpine3.9)
187187
__CodeName=alpine
188188
__UbuntuRepo=
189+
__AlpineVersion=3.9
190+
;;
191+
alpine3.13)
192+
__CodeName=alpine
193+
__UbuntuRepo=
194+
__AlpineVersion=3.13
195+
# Alpine 3.13 has all the packages we need in the 3.13 repository
196+
__AlpinePackages+=$__AlpinePackagesEdgeCommunity
197+
__AlpinePackagesEdgeCommunity=
198+
__AlpinePackages+=$__AlpinePackagesEdgeMain
199+
__AlpinePackagesEdgeMain=
189200
;;
190201
freebsd11)
191202
__FreeBSDBase="11.3-RELEASE"
@@ -243,7 +254,6 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )"
243254

244255
if [[ "$__CodeName" == "alpine" ]]; then
245256
__ApkToolsVersion=2.9.1
246-
__AlpineVersion=3.9
247257
__ApkToolsDir=$(mktemp -d)
248258
wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir
249259
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
@@ -256,15 +266,19 @@ if [[ "$__CodeName" == "alpine" ]]; then
256266
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
257267
add $__AlpinePackages
258268

259-
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
260-
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
261-
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
262-
add $__AlpinePackagesEdgeMain
269+
if [[ -n "$__AlpinePackagesEdgeMain" ]]; then
270+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
271+
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
272+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
273+
add $__AlpinePackagesEdgeMain
274+
fi
263275

264-
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
265-
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
266-
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
267-
add $__AlpinePackagesEdgeCommunity
276+
if [[ -n "$__AlpinePackagesEdgeCommunity" ]]; then
277+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
278+
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
279+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
280+
add $__AlpinePackagesEdgeCommunity
281+
fi
268282

269283
rm -r $__ApkToolsDir
270284
elif [[ "$__CodeName" == "freebsd" ]]; then

‎eng/common/generate-locproject.ps1‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
Param(
2+
[Parameter(Mandatory=$true)][string] $SourcesDirectory, # Directory where source files live; if using a Localize directory it should live in here
3+
[string] $LanguageSet = 'VS_Main_Languages', # Language set to be used in the LocProject.json
4+
[switch] $UseCheckedInLocProjectJson, # When set, generates a LocProject.json and compares it to one that already exists in the repo; otherwise just generates one
5+
[switch] $CreateNeutralXlfs # Creates neutral xlf files. Only set to false when running locally
6+
)
7+
8+
# Generates LocProject.json files for the OneLocBuild task. OneLocBuildTask is described here:
9+
# https://ceapex.visualstudio.com/CEINTL/_wiki/wikis/CEINTL.wiki/107/Localization-with-OneLocBuild-Task
10+
11+
Set-StrictMode -Version 2.0
12+
$ErrorActionPreference = "Stop"
13+
. $PSScriptRoot\tools.ps1
14+
15+
Import-Module -Name (Join-Path $PSScriptRoot 'native\CommonLibrary.psm1')
16+
17+
$exclusionsFilePath = "$SourcesDirectory\Localize\LocExclusions.json"
18+
$exclusions = @{ Exclusions = @() }
19+
if (Test-Path -Path $exclusionsFilePath)
20+
{
21+
$exclusions = Get-Content "$exclusionsFilePath" | ConvertFrom-Json
22+
}
23+
24+
Push-Location "$SourcesDirectory" # push location for Resolve-Path -Relative to work
25+
26+
# Template files
27+
$jsonFiles = @()
28+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\.template\.config\\localize\\en\..+\.json" } # .NET templating pattern
29+
$jsonFiles += Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern
30+
31+
$xlfFiles = @()
32+
33+
$allXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.xlf"
34+
$langXlfFiles = @()
35+
if ($allXlfFiles) {
36+
$null = $allXlfFiles[0].FullName -Match "\.([\w-]+)\.xlf" # matches '[langcode].xlf'
37+
$firstLangCode = $Matches.1
38+
$langXlfFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory\*\*.$firstLangCode.xlf"
39+
}
40+
$langXlfFiles | ForEach-Object {
41+
$null = $_.Name -Match "([^.]+)\.[\w-]+\.xlf" # matches '[filename].[langcode].xlf'
42+
43+
$destinationFile = "$($_.Directory.FullName)\$($Matches.1).xlf"
44+
$xlfFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru
45+
}
46+
47+
$locFiles = $jsonFiles + $xlfFiles
48+
49+
$locJson = @{
50+
Projects = @(
51+
@{
52+
LanguageSet = $LanguageSet
53+
LocItems = @(
54+
$locFiles | ForEach-Object {
55+
$outputPath = "Localize\$(($_.DirectoryName | Resolve-Path -Relative) + "\")"
56+
$continue = $true
57+
foreach ($exclusion in $exclusions.Exclusions) {
58+
if ($outputPath.Contains($exclusion))
59+
{
60+
$continue = $false
61+
}
62+
}
63+
$sourceFile = ($_.FullName | Resolve-Path -Relative)
64+
if (!$CreateNeutralXlfs -and $_.Extension -eq '.xlf') {
65+
Remove-Item -Path $sourceFile
66+
}
67+
if ($continue)
68+
{
69+
return @{
70+
SourceFile = $sourceFile
71+
CopyOption = "LangIDOnName"
72+
OutputPath = $outputPath
73+
}
74+
}
75+
}
76+
)
77+
}
78+
)
79+
}
80+
81+
$json = ConvertTo-Json $locJson -Depth 5
82+
Write-Host "(NETCORE_ENGINEERING_TELEMETRY=Build) LocProject.json generated:`n`n$json`n`n"
83+
Pop-Location
84+
85+
if (!$UseCheckedInLocProjectJson) {
86+
New-Item "$SourcesDirectory\Localize\LocProject.json" -Force # Need this to make sure the Localize directory is created
87+
Set-Content "$SourcesDirectory\Localize\LocProject.json" $json
88+
}
89+
else {
90+
New-Item "$SourcesDirectory\Localize\LocProject-generated.json" -Force # Need this to make sure the Localize directory is created
91+
Set-Content "$SourcesDirectory\Localize\LocProject-generated.json" $json
92+
93+
if ((Get-FileHash "$SourcesDirectory\Localize\LocProject-generated.json").Hash -ne (Get-FileHash "$SourcesDirectory\Localize\LocProject.json").Hash) {
94+
Write-PipelineTaskError -Type "warning" -Message "Existing LocProject.json differs from generated LocProject.json. Download LocProject-generated.json and compare them."
95+
96+
exit 1
97+
}
98+
else {
99+
Write-Host "Generated LocProject.json and current LocProject.json are identical."
100+
}
101+
}

‎eng/common/native/install-tool.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ try {
105105
Write-Error "There are multiple copies of $ToolName in $($ToolInstallDirectory): `n$(@($ToolFilePath | out-string))"
106106
exit 1
107107
} elseif (@($ToolFilePath).Length -Lt 1) {
108-
Write-Host "$ToolName was not found in $ToolFilePath."
108+
Write-Host "$ToolName was not found in $ToolInstallDirectory."
109109
exit 1
110110
}
111111

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

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ Param(
1818
[switch] $Internal,
1919
[switch] $Compare,
2020
[string] $MonoDotnet="",
21-
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind"
21+
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind",
22+
[string] $LogicalMachine=""
2223
)
2324

2425
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")
@@ -33,26 +34,23 @@ $Creator = $env:BUILD_DEFINITIONNAME
3334
$PerfLabArguments = ""
3435
$HelixSourcePrefix = "pr"
3536

36-
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
37-
38-
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
39-
if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
40-
$Queue = "Windows.10.Amd64.ClientRS5.Open"
41-
}
42-
43-
if ($Compare) {
44-
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf.Open"
45-
$PerfLabArguments = ""
46-
$ExtraBenchmarkDotNetArguments = ""
47-
}
37+
$Queue = ""
4838

4939
if ($Internal) {
50-
$Queue = "Windows.10.Amd64.19H1.Tiger.Perf"
40+
switch ($LogicalMachine) {
41+
"perftiger" { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
42+
"perfowl" { $Queue = "Windows.10.Amd64.20H2.Owl.Perf" }
43+
"perfsurf" { $Queue = "Windows.10.Arm64.Perf.Surf" }
44+
Default { $Queue = "Windows.10.Amd64.19H1.Tiger.Perf" }
45+
}
5146
$PerfLabArguments = "--upload-to-perflab-container"
5247
$ExtraBenchmarkDotNetArguments = ""
5348
$Creator = ""
5449
$HelixSourcePrefix = "official"
5550
}
51+
else {
52+
$Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
53+
}
5654

5755
if($MonoInterpreter)
5856
{
@@ -79,14 +77,6 @@ $CommonSetupArguments="--channel master --queue $Queue --build-number $BuildNumb
7977
$SetupArguments = "--repository https://github.com/$Repository --branch $Branch --get-perf-hash --commit-sha $CommitSha $CommonSetupArguments"
8078

8179

82-
#This grabs the LKG version number of dotnet and passes it to our scripts
83-
$VersionJSON = Get-Content global.json | ConvertFrom-Json
84-
$DotNetVersion = $VersionJSON.tools.dotnet
85-
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
86-
# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
87-
$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments"
88-
89-
9080
if ($RunFromPerformanceRepo) {
9181
$SetupArguments = "--perf-hash $CommitSha $CommonSetupArguments"
9282

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ using_mono=false
2727
wasm_runtime_loc=
2828
using_wasm=false
2929
use_latest_dotnet=false
30+
logical_machine=
3031

3132
while (($# > 0)); do
3233
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -55,6 +56,10 @@ while (($# > 0)); do
5556
compilation_mode=$2
5657
shift 2
5758
;;
59+
--logicalmachine)
60+
logical_machine=$2
61+
shift 2
62+
;;
5863
--repository)
5964
repository=$2
6065
shift 2
@@ -88,6 +93,10 @@ while (($# > 0)); do
8893
internal=true
8994
shift 1
9095
;;
96+
--alpine)
97+
alpine=true
98+
shift 1
99+
;;
91100
--llvm)
92101
llvm=true
93102
shift 1
@@ -143,6 +152,7 @@ while (($# > 0)); do
143152
echo " --monodotnet Pass the path to the mono dotnet for mono performance testing."
144153
echo " --wasm Path to the unpacked wasm runtime pack."
145154
echo " --latestdotnet --dotnet-versions will not be specified. --dotnet-versions defaults to LKG version in global.json "
155+
echo " --alpine Set for runs on Alpine"
146156
echo ""
147157
exit 0
148158
;;
@@ -174,19 +184,6 @@ queue=Ubuntu.1804.Amd64.Open
174184
creator=$BUILD_DEFINITIONNAME
175185
helix_source_prefix="pr"
176186

177-
if [[ "$compare" == true ]]; then
178-
extra_benchmark_dotnet_arguments=
179-
perflab_arguments=
180-
181-
# No open queues for arm64
182-
if [[ "$architecture" = "arm64" ]]; then
183-
echo "Compare not available for arm64"
184-
exit 1
185-
fi
186-
187-
queue=Ubuntu.1804.Amd64.Tiger.Perf.Open
188-
fi
189-
190187
if [[ "$internal" == true ]]; then
191188
perflab_arguments="--upload-to-perflab-container"
192189
helix_source_prefix="official"
@@ -196,14 +193,26 @@ if [[ "$internal" == true ]]; then
196193
if [[ "$architecture" = "arm64" ]]; then
197194
queue=Ubuntu.1804.Arm64.Perf
198195
else
199-
queue=Ubuntu.1804.Amd64.Tiger.Perf
196+
if [[ "$logical_machine" = "perfowl" ]]; then
197+
queue=Ubuntu.1804.Amd64.Owl.Perf
198+
else
199+
queue=Ubuntu.1804.Amd64.Tiger.Perf
200+
fi
201+
fi
202+
203+
if [[ "$alpine" = "true" ]]; then
204+
queue=alpine.amd64.tiger.perf
200205
fi
201206
else
202207
if [[ "$architecture" = "arm64" ]]; then
203208
queue=ubuntu.1804.armarch.open
204209
else
205210
queue=Ubuntu.1804.Amd64.Open
206211
fi
212+
213+
if [[ "$alpine" = "true" ]]; then
214+
queue=alpine.amd64.tiger.perf
215+
fi
207216
fi
208217

209218
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
@@ -224,16 +233,6 @@ fi
224233
common_setup_arguments="--channel master --queue $queue --build-number $build_number --build-configs $configurations --architecture $architecture"
225234
setup_arguments="--repository https://github.com/$repository --branch $branch --get-perf-hash --commit-sha $commit_sha $common_setup_arguments"
226235

227-
228-
if [[ "$use_latest_dotnet" = false ]]; then
229-
# Get the tools section from the global.json.
230-
# This grabs the LKG version number of dotnet and passes it to our scripts
231-
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
232-
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
233-
# setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
234-
setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments"
235-
fi
236-
237236
if [[ "$run_from_perf_repo" = true ]]; then
238237
payload_directory=
239238
workitem_directory=$source_directory

‎eng/common/post-build/publish-using-darc.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ try {
6060
--id $buildId `
6161
--publishing-infra-version $PublishingInfraVersion `
6262
--default-channels `
63-
--source-branch master `
63+
--source-branch main `
6464
--azdev-pat $AzdoToken `
6565
--bar-uri $MaestroApiEndPoint `
6666
--password $MaestroToken `

‎eng/common/sdl/execute-all-sdl-tools.ps1‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ try {
8787
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') -GuardianCliLocation $guardianCliLocation -WorkingDirectory $workingDirectory -TargetDirectory $SourceDirectory -GdnFolder $gdnFolder -ToolsList $SourceToolsList -AzureDevOpsAccessToken $AzureDevOpsAccessToken -UpdateBaseline $UpdateBaseline -GuardianLoggerLevel $GuardianLoggerLevel -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams
8888
}
8989

90-
if ($UpdateBaseline) {
91-
& (Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $RepoName -BranchName $BranchName -GdnFolder $GdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Update baseline'
92-
}
93-
9490
if ($TsaPublish) {
9591
if ($TsaBranchName -and $BuildNumber) {
9692
if (-not $TsaRepositoryName) {

‎eng/common/sdl/init-sdl.ps1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ try {
4646
Write-PipelineTelemetryError -Force -Category 'Build' -Message "Guardian baseline failed with exit code $LASTEXITCODE."
4747
ExitWithExitCode $LASTEXITCODE
4848
}
49-
& $(Join-Path $PSScriptRoot 'push-gdn.ps1') -Repository $Repository -BranchName $BranchName -GdnFolder $gdnFolder -AzureDevOpsAccessToken $AzureDevOpsAccessToken -PushReason 'Initialize gdn folder'
5049
ExitWithExitCode 0
5150
}
5251
catch {

0 commit comments

Comments
 (0)