Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit e27cda2

Browse files
dotnet-maestro[bot]brettfo
authored and
nosami
committed
[main] Update dependencies from dotnet/arcade (dotnet#10455)
* Update dependencies from https://github.com/dotnet/arcade build 20201111.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20561.5 * Update dependencies from https://github.com/dotnet/arcade build 20201113.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20563.2 * Update dependencies from https://github.com/dotnet/arcade build 20201116.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20566.3 * Update dependencies from https://github.com/dotnet/arcade build 20201117.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20567.7 * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain older sdk * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain 3.1 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 5d0b983 commit e27cda2

File tree

13 files changed

+87
-90
lines changed

13 files changed

+87
-90
lines changed

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20552.5">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
8+
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
9999
function EnablePrivatePackageSources($DisabledPackageSources) {
100100
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
101101
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
102-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
103-
$DisabledPackageSource.SetAttribute("value", "false")
102+
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
103+
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
104+
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
104105
}
105106
}
106107

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then
158158
for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
159159
if [[ $DisabledSourceName == darc-int* ]]
160160
then
161-
OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
162-
NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
161+
OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
162+
NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
163163
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
164164
echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
165165
fi

‎eng/common/cross/armel/armel.jessie.patch‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h
2+
--- a/usr/include/urcu/uatomic/generic.h 2014-10-22 15:00:58.000000000 -0700
3+
+++ b/usr/include/urcu/uatomic/generic.h 2020-10-30 21:38:28.550000000 -0700
4+
@@ -69,10 +69,10 @@
5+
#endif
6+
#ifdef UATOMIC_HAS_ATOMIC_SHORT
7+
case 2:
8+
- return __sync_val_compare_and_swap_2(addr, old, _new);
9+
+ return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new);
10+
#endif
11+
case 4:
12+
- return __sync_val_compare_and_swap_4(addr, old, _new);
13+
+ return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new);
14+
#if (CAA_BITS_PER_LONG == 64)
15+
case 8:
16+
return __sync_val_compare_and_swap_8(addr, old, _new);
17+
@@ -109,7 +109,7 @@
18+
return;
19+
#endif
20+
case 4:
21+
- __sync_and_and_fetch_4(addr, val);
22+
+ __sync_and_and_fetch_4((uint32_t*) addr, val);
23+
return;
24+
#if (CAA_BITS_PER_LONG == 64)
25+
case 8:
26+
@@ -148,7 +148,7 @@
27+
return;
28+
#endif
29+
case 4:
30+
- __sync_or_and_fetch_4(addr, val);
31+
+ __sync_or_and_fetch_4((uint32_t*) addr, val);
32+
return;
33+
#if (CAA_BITS_PER_LONG == 64)
34+
case 8:
35+
@@ -187,7 +187,7 @@
36+
return __sync_add_and_fetch_2(addr, val);
37+
#endif
38+
case 4:
39+
- return __sync_add_and_fetch_4(addr, val);
40+
+ return __sync_add_and_fetch_4((uint32_t*) addr, val);
41+
#if (CAA_BITS_PER_LONG == 64)
42+
case 8:
43+
return __sync_add_and_fetch_8(addr, val);

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ elif [[ -n $__CodeName ]]; then
336336
chroot $__RootfsDir apt-get -f -y install
337337
chroot $__RootfsDir apt-get -y install $__UbuntuPackages
338338
chroot $__RootfsDir symlinks -cr /usr
339-
chroot $__RootfsDir apt clean
339+
chroot $__RootfsDir apt-get clean
340340

341341
if [ $__SkipUnmount == 0 ]; then
342342
umount $__RootfsDir/* || true
@@ -348,6 +348,12 @@ elif [[ -n $__CodeName ]]; then
348348
patch -p1 < $__CrossDir/$__BuildArch/trusty-lttng-2.4.patch
349349
popd
350350
fi
351+
352+
if [[ "$__BuildArch" == "armel" && "$__CodeName" == "jessie" ]]; then
353+
pushd $__RootfsDir
354+
patch -p1 < $__CrossDir/$__BuildArch/armel.jessie.patch
355+
popd
356+
fi
351357
elif [[ "$__Tizen" == "tizen" ]]; then
352358
ROOTFS_DIR=$__RootfsDir $__CrossDir/$__BuildArch/tizen-build-rootfs.sh
353359
else

‎eng/common/performance/crossgen_perf.proj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
2121
<Python>python3</Python>
22-
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update</HelixPreCommands>
22+
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
2323
<CoreRoot>$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot>
2424
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
2525
<CrossgenDirectory>$(ScenarioDirectory)crossgen/</CrossgenDirectory>
@@ -68,18 +68,18 @@
6868
<ItemGroup>
6969
<CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
7070
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
71-
<PreCommands>$(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
72-
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
73-
<PostCommands>$(Python) post.py</PostCommands>
71+
<PreCommands>$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
72+
<Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
73+
<PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
7474
</CrossgenSizeOnDiskWorkItem>
7575
</ItemGroup>
7676

7777
<ItemGroup>
7878
<Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
7979
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
8080
<PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
81-
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
82-
<PostCommands>$(Python) post.py</PostCommands>
81+
<Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen.out/</Command>
82+
<PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
8383
</Crossgen2SizeOnDiskWorkItem>
8484
</ItemGroup>
8585

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch
8282
#This grabs the LKG version number of dotnet and passes it to our scripts
8383
$VersionJSON = Get-Content global.json | ConvertFrom-Json
8484
$DotNetVersion = $VersionJSON.tools.dotnet
85-
$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
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"
8688

8789

8890
if ($RunFromPerformanceRepo) {

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
198198
else
199199
queue=Ubuntu.1804.Amd64.Tiger.Perf
200200
fi
201+
else
202+
if [[ "$architecture" = "arm64" ]]; then
203+
queue=ubuntu.1804.armarch.open
204+
else
205+
queue=Ubuntu.1804.Amd64.Open
206+
fi
201207
fi
202208

203209
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
@@ -223,7 +229,9 @@ if [[ "$use_latest_dotnet" = false ]]; then
223229
# Get the tools section from the global.json.
224230
# This grabs the LKG version number of dotnet and passes it to our scripts
225231
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
226-
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
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"
227235
fi
228236

229237
if [[ "$run_from_perf_repo" = true ]]; then

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ param(
1010
[Parameter(Mandatory=$false)][string] $EnableNugetValidation,
1111
[Parameter(Mandatory=$false)][string] $PublishInstallersAndChecksums,
1212
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
13+
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
1314
[Parameter(Mandatory=$false)][string] $SigningValidationAdditionalParameters
1415
)
1516

@@ -25,6 +26,11 @@ try {
2526
$optionalParams.Add($ArtifactsPublishingAdditionalParameters) | Out-Null
2627
}
2728

29+
if ("" -ne $SymbolPublishingAdditionalParameters) {
30+
$optionalParams.Add("symbol-publishing-parameters") | Out-Null
31+
$optionalParams.Add($SymbolPublishingAdditionalParameters) | Out-Null
32+
}
33+
2834
if ("false" -eq $WaitPublishingFinish) {
2935
$optionalParams.Add("--no-wait") | Out-Null
3036
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ function CheckJobResult(
164164
[ref]$ValidationFailures,
165165
[switch]$logErrors) {
166166
if ($result -ne '0') {
167-
if ($logError) {
167+
if ($logErrors) {
168168
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
169169
}
170170
$ValidationFailures.Value++

0 commit comments

Comments
 (0)