Skip to content

Commit 88f5732

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#499)
[main] Update dependencies from dotnet/arcade - Merge remote-tracking branch 'origin/main' into darc-main-37ceeb7c-81af-4535-a6eb-96fcd2db6c28 - Merge remote-tracking branch 'origin/main' into darc-main-37ceeb7c-81af-4535-a6eb-96fcd2db6c28 - Update unit tests project to net6.0
1 parent 47e38b5 commit 88f5732

File tree

22 files changed

+54
-48
lines changed

22 files changed

+54
-48
lines changed

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21125.5">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21160.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
8+
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21125.5">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21160.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>15246f4af00a1cb2e580783d32ec2937b1878a64</Sha>
12+
<Sha>7f13798e5f567b72ffe63205bf49839245f0f8c1</Sha>
1313
</Dependency>
1414
</ToolsetDependencies>
1515
</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/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 & 14 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
{

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

Lines changed: 10 additions & 14 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
@@ -179,19 +184,6 @@ queue=Ubuntu.1804.Amd64.Open
179184
creator=$BUILD_DEFINITIONNAME
180185
helix_source_prefix="pr"
181186

182-
if [[ "$compare" == true ]]; then
183-
extra_benchmark_dotnet_arguments=
184-
perflab_arguments=
185-
186-
# No open queues for arm64
187-
if [[ "$architecture" = "arm64" ]]; then
188-
echo "Compare not available for arm64"
189-
exit 1
190-
fi
191-
192-
queue=Ubuntu.1804.Amd64.Tiger.Perf.Open
193-
fi
194-
195187
if [[ "$internal" == true ]]; then
196188
perflab_arguments="--upload-to-perflab-container"
197189
helix_source_prefix="official"
@@ -201,7 +193,11 @@ if [[ "$internal" == true ]]; then
201193
if [[ "$architecture" = "arm64" ]]; then
202194
queue=Ubuntu.1804.Arm64.Perf
203195
else
204-
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
205201
fi
206202

207203
if [[ "$alpine" = "true" ]]; then

‎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/templates/job/execute-sdl.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ jobs:
4545
buildId: $(AzDOBuildId)
4646
artifactName: ${{ artifactName }}
4747
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
48+
checkDownloadedFiles: true
4849
- ${{ if eq(parameters.artifactNames, '') }}:
4950
- task: DownloadBuildArtifacts@0
5051
displayName: Download Build Artifacts
@@ -57,6 +58,7 @@ jobs:
5758
downloadType: specific files
5859
itemPattern: "**"
5960
downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
61+
checkDownloadedFiles: true
6062
- powershell: eng/common/sdl/extract-artifact-packages.ps1
6163
-InputPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts
6264
-ExtractPath $(Build.ArtifactStagingDirectory)\artifacts\BlobArtifacts

‎eng/common/templates/job/publish-build-assets.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ jobs:
5252
inputs:
5353
artifactName: AssetManifests
5454
downloadPath: '$(Build.StagingDirectory)/Download'
55+
checkDownloadedFiles: true
5556
condition: ${{ parameters.condition }}
5657
continueOnError: ${{ parameters.continueOnError }}
5758

‎eng/common/templates/phases/publish-build-assets.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ phases:
2020
inputs:
2121
artifactName: AssetManifests
2222
downloadPath: '$(Build.StagingDirectory)/Download'
23+
checkDownloadedFiles: true
2324
condition: ${{ parameters.condition }}
2425
continueOnError: ${{ parameters.continueOnError }}
2526
- task: AzureKeyVault@1

‎eng/common/templates/post-build/channels/generic-internal-channel.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ stages:
5858
PdbArtifacts/**
5959
BlobArtifacts/**
6060
downloadPath: '$(Build.ArtifactStagingDirectory)'
61+
checkDownloadedFiles: true
6162

6263
# This is necessary whenever we want to publish/restore to an AzDO private feed
6364
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -124,6 +125,7 @@ stages:
124125
BlobArtifacts/**
125126
AssetManifests/**
126127
downloadPath: '$(Build.ArtifactStagingDirectory)'
128+
checkDownloadedFiles: true
127129

128130
- task: NuGetToolInstaller@1
129131
displayName: 'Install NuGet.exe'

0 commit comments

Comments
 (0)