Skip to content

Commit ce57613

Browse files
michaelgsharpmichaelgsharp
authored
Updated arcade to the latest version (dotnet#5783)
* updated arcade to the latest version * updated eng/common correctly * Fixed benchmark test.
1 parent 43c49f6 commit ce57613

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1329
-3420
lines changed

Diff for: ‎build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build -warnAsError 0 %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\build.ps1""" -restore -build -warnAsError 0 %*"
33
exit /b %ErrorLevel%

Diff for: ‎eng/Version.Details.xml

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.145102">
4+
<Dependency Name="Microsoft.SymbolUploader.Build.Task" Version="1.1.225302">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-symuploader</Uri>
6-
<Sha>9bdfdb0af37d2e93bdecf238a8a51c0a965444d6</Sha>
6+
<Sha>8a3aaf73bc04edffd49429f44e35a70d2ba9e9c9</Sha>
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20461.7">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21253.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
12+
<Sha>e9fd640e1ec1890489ea66ad0f59e733448056da</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20461.7">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21253.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
16+
<Sha>e9fd640e1ec1890489ea66ad0f59e733448056da</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20461.7">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21253.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
20+
<Sha>e9fd640e1ec1890489ea66ad0f59e733448056da</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20461.7">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21253.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
24+
<Sha>e9fd640e1ec1890489ea66ad0f59e733448056da</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="5.0.0-beta.20461.7">
26+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21253.2">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>a81e6e87cf21837abfde2da6eb9b057bea9f49fc</Sha>
28+
<Sha>e9fd640e1ec1890489ea66ad0f59e733448056da</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
30+
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20074.1">
3131
<Uri>https://github.com/dotnet/arcade-services</Uri>
32-
<Sha>869869342f1ec338de96adcea6e003b61f195256</Sha>
32+
<Sha>cd705029f2675970b42f9273ae359d0926c5e815</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.20461.2">
34+
<Dependency Name="Microsoft.DotNet.Maestro.Tasks" Version="1.1.0-beta.20074.1">
3535
<Uri>https://github.com/dotnet/arcade-services</Uri>
36-
<Sha>592654f4a6855d7738a7c7c780355ac54457fdae</Sha>
36+
<Sha>cd705029f2675970b42f9273ae359d0926c5e815</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20457.1">
38+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21254.2">
3939
<Uri>https://github.com/dotnet/xharness</Uri>
40-
<Sha>3b64ab7ab565cfd19fe7102e3d76271f16f0fc6d</Sha>
40+
<Sha>89cb4b1d368e0f15b4df8e02a176dd1f1c33958b</Sha>
4141
</Dependency>
4242
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-3.20460.2">
4343
<Uri>https://github.com/dotnet/roslyn</Uri>
@@ -59,9 +59,9 @@
5959
<Uri>https://github.com/dotnet/symreader-converter</Uri>
6060
<Sha>c5ba7c88f92e2dde156c324a8c8edc04d9fa4fe0</Sha>
6161
</Dependency>
62-
<Dependency Name="XliffTasks" Version="1.0.0-beta.20420.1">
62+
<Dependency Name="XliffTasks" Version="1.0.0-beta.21254.1">
6363
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
64-
<Sha>975065e08307a459dc2649b1c852f5c4cafd2f91</Sha>
64+
<Sha>2739f40a72dec8100f99be106ae6b7d640e6fe69</Sha>
6565
</Dependency>
6666
</ToolsetDependencies>
6767
</Dependencies>

Diff for: ‎eng/Versions.props

+9-14
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
<VersionPrefix>1.5.6</VersionPrefix>
1313
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
1414
<AssemblyVersion>1.0.0.0</AssemblyVersion>
15-
1615
<!--ML.NET Core dependencies-->
1716
<NewtonsoftJsonPackageVersion>10.0.3</NewtonsoftJsonPackageVersion>
1817
<SystemCodeDomPackageVersion>4.4.0</SystemCodeDomPackageVersion>
1918
<SystemReflectionEmitLightweightPackageVersion>4.3.0</SystemReflectionEmitLightweightPackageVersion>
2019
<SystemThreadingChannelsPackageVersion>4.7.1</SystemThreadingChannelsPackageVersion>
21-
2220
<!-- Other/External dependencies -->
2321
<GoogleProtobufPackageVersion>3.10.1</GoogleProtobufPackageVersion>
2422
<LightGBMPackageVersion>2.2.3</LightGBMPackageVersion>
@@ -39,16 +37,14 @@
3937
<SystemTextEncodingVersion>4.3.0</SystemTextEncodingVersion>
4038
<MicrosoftCSharpVersion>4.5.0</MicrosoftCSharpVersion>
4139
<SystemCompositionVersion>1.2.0</SystemCompositionVersion>
42-
43-
<!-- Build/infrastructure Dependencies -->
40+
<!-- Build/infrastructure Dependencies -->
4441
<PublishSymbolsPackageVersion>1.0.0-beta-62824-02</PublishSymbolsPackageVersion>
4542
<CodecovVersion>1.9.0</CodecovVersion>
4643
<CoverletCollectorVersion>1.2.1</CoverletCollectorVersion>
4744
<ReportGeneratorVersion>4.3.6</ReportGeneratorVersion>
4845
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19225.5</MicrosoftDotNetApiCompatPackageVersion>
4946
<MicrosoftSourceLinkVersion>1.1.0-beta-20206-02</MicrosoftSourceLinkVersion>
5047
<BuildToolsPackageVersion>3.0.0-preview4-04926-01</BuildToolsPackageVersion>
51-
5248
<!-- Test-only Dependencies -->
5349
<BenchmarkDotNetVersion>0.12.0</BenchmarkDotNetVersion>
5450
<MicrosoftCodeAnalysisTestingVersion>1.0.1-beta1.20374.2</MicrosoftCodeAnalysisTestingVersion>
@@ -60,7 +56,6 @@
6056
<SystemDataSqlClientVersion>4.6.1</SystemDataSqlClientVersion>
6157
<XunitCombinatorialVersion>1.2.7</XunitCombinatorialVersion>
6258
<SystemDataSQLiteCoreVersion>1.0.112.2</SystemDataSQLiteCoreVersion>
63-
6459
<!-- Opt-out repo features -->
6560
<UsingToolXliff>false</UsingToolXliff>
6661
<UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies>
@@ -118,8 +113,8 @@
118113
<XUnitVersion>2.4.0</XUnitVersion>
119114
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
120115
<XUnitVSRunnerVersion>2.4.0</XUnitVSRunnerVersion>
121-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20461.7</MicrosoftDotNetBuildTasksFeedVersion>
122-
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20461.7</MicrosoftDotNetSignToolVersion>
116+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21253.2</MicrosoftDotNetBuildTasksFeedVersion>
117+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21253.2</MicrosoftDotNetSignToolVersion>
123118
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
124119
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
125120
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -129,13 +124,13 @@
129124
<MicrosoftDiaSymReaderConverterVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterVersion>
130125
<MicrosoftDiaSymReaderPdb2PdbVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbVersion>
131126
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
132-
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
127+
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroClientVersion>
133128
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-20464-02</MicrosoftSourceLinkGitHubVersion>
134129
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-20464-02</MicrosoftSourceLinkAzureReposGitVersion>
135-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>5.0.0-beta.20461.7</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
136-
<XliffTasksVersion>1.0.0-beta.20420.1</XliffTasksVersion>
137-
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.20461.2</MicrosoftDotNetMaestroTasksVersion>
138-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20457.1</MicrosoftDotNetXHarnessCLIVersion>
139-
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.145102</MicrosoftSymbolUploaderBuildTaskVersion>
130+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21253.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
131+
<XliffTasksVersion>1.0.0-beta.21254.1</XliffTasksVersion>
132+
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.20074.1</MicrosoftDotNetMaestroTasksVersion>
133+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21254.2</MicrosoftDotNetXHarnessCLIVersion>
134+
<MicrosoftSymbolUploaderBuildTaskVersion>1.1.225302</MicrosoftSymbolUploaderBuildTaskVersion>
140135
</PropertyGroup>
141136
</Project>

Diff for: ‎eng/common/SetupNugetSources.ps1

+3-2
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

Diff for: ‎eng/common/SetupNugetSources.sh

+2-2
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

Diff for: ‎eng/common/build.ps1

-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ Param(
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
99
[bool] $nodeReuse = $true,
10-
[bool] $useDefaultDotnetInstall = $false,
1110
[switch][Alias('r')]$restore,
1211
[switch] $deployDeps,
1312
[switch][Alias('b')]$build,
@@ -66,7 +65,6 @@ function Print-Usage() {
6665
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
6766
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
6867
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
69-
Write-Host " -useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
7068
Write-Host ""
7169

7270
Write-Host "Command line arguments not listed above are passed thru to msbuild."

Diff for: ‎eng/common/build.sh

+2-9
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ usage()
3636
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
3737
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
3838
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
39-
echo " --useDefaultDotnetInstall <value> Use dotnet-install.* scripts from public location as opposed to from eng common folder"
40-
4139
echo ""
4240
echo "Command line arguments not listed above are passed thru to msbuild."
4341
echo "Arguments can also be passed in with a single hyphen."
@@ -80,11 +78,10 @@ prepare_machine=false
8078
verbosity='minimal'
8179
runtime_source_feed=''
8280
runtime_source_feed_key=''
83-
use_default_dotnet_install=false
8481

8582
properties=''
8683
while [[ $# > 0 ]]; do
87-
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
84+
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
8885
case "$opt" in
8986
-help|-h)
9087
usage
@@ -159,14 +156,10 @@ while [[ $# > 0 ]]; do
159156
runtime_source_feed=$2
160157
shift
161158
;;
162-
-runtimesourcefeedkey)
159+
-runtimesourcefeedkey)
163160
runtime_source_feed_key=$2
164161
shift
165162
;;
166-
-usedefaultdotnetinstall)
167-
use_default_dotnet_install=$2
168-
shift
169-
;;
170163
*)
171164
properties="$properties $1"
172165
;;

Diff for: ‎eng/common/cross/arm64/tizen-fetch.sh

+1-1
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 aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
160+
fetch_tizen_pkgs aarch64 gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
161161
Inform "fetch coreclr packages"
162162
fetch_tizen_pkgs aarch64 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"

Diff for: ‎eng/common/cross/armel/armel.jessie.patch

+43
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);

Diff for: ‎eng/common/cross/armel/tizen-fetch.sh

+1-1
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"

Diff for: ‎eng/common/cross/build-android-rootfs.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __AndroidToolchain=aarch64-linux-android
2727

2828
for i in "$@"
2929
do
30-
lowerI="$(echo $i | awk '{print tolower($0)}')"
30+
lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
3131
case $lowerI in
3232
-?|-h|--help)
3333
usage
@@ -106,6 +106,7 @@ __AndroidPackages+=" libandroid-glob"
106106
__AndroidPackages+=" liblzma"
107107
__AndroidPackages+=" krb5"
108108
__AndroidPackages+=" openssl"
109+
__AndroidPackages+=" openldap"
109110

110111
for path in $(wget -qO- http://termux.net/dists/stable/main/binary-$__AndroidArch/Packages |\
111112
grep -A15 "Package: \(${__AndroidPackages// /\\|}\)" | grep -v "static\|tool" | grep Filename); do

0 commit comments

Comments
 (0)