Skip to content

Commit eb4bf70

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#100811)
* Update dependencies from https://github.com/dotnet/arcade build 20240408.8 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24207.1 -> To Version 9.0.0-beta.24208.8 * Update dependencies from https://github.com/dotnet/arcade build 20240409.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24207.1 -> To Version 9.0.0-beta.24209.3 * Update dependencies from https://github.com/dotnet/arcade build 20240410.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitAssert , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24207.1 -> To Version 9.0.0-beta.24210.4 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 1794d65 commit eb4bf70

File tree

8 files changed

+105
-91
lines changed

8 files changed

+105
-91
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -92,87 +92,87 @@
9292
</Dependency>
9393
</ProductDependencies>
9494
<ToolsetDependencies>
95-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
95+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24210.4">
9696
<Uri>https://github.com/dotnet/arcade</Uri>
97-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
97+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
9898
</Dependency>
9999
<!-- Intermediate is necessary for source build. -->
100-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
100+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24210.4">
101101
<Uri>https://github.com/dotnet/arcade</Uri>
102-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
102+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
103103
<SourceBuild RepoName="arcade" ManagedOnly="true" />
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24207.1">
105+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24210.4">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
107+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24207.1">
109+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24210.4">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
111+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24207.1">
113+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24210.4">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
115+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24207.1">
117+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24210.4">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
119+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24207.1">
121+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24210.4">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
123+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24207.1">
125+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24210.4">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
127+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24207.1">
129+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24210.4">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
131+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24207.1">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24210.4">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
135+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24207.1">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24210.4">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
139+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24210.4">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
143+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24207.1">
145+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24210.4">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
147+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24207.1">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24210.4">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
151+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24207.1">
153+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24210.4">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
155+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24207.1">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24210.4">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
159+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24207.1">
161+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24210.4">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
163+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24207.1">
165+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24210.4">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
167+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
168168
</Dependency>
169-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24207.1">
169+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24210.4">
170170
<Uri>https://github.com/dotnet/arcade</Uri>
171-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
171+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
172172
</Dependency>
173-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24207.1">
173+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24210.4">
174174
<Uri>https://github.com/dotnet/arcade</Uri>
175-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
175+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
176176
</Dependency>
177177
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24205.1">
178178
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -332,9 +332,9 @@
332332
<Uri>https://github.com/dotnet/xharness</Uri>
333333
<Sha>28af9496b0e260f7e66ec549b39f1410ee9743d1</Sha>
334334
</Dependency>
335-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24207.1">
335+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24210.4">
336336
<Uri>https://github.com/dotnet/arcade</Uri>
337-
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
337+
<Sha>a26575045adf694ecd7af6b1a310d2324ef5682b</Sha>
338338
</Dependency>
339339
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24106.4">
340340
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@
8383
<!-- SDK dependencies -->
8484
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.4.24175.4</MicrosoftDotNetApiCompatTaskVersion>
8585
<!-- Arcade dependencies -->
86-
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksFeedVersion>
87-
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24207.1</MicrosoftDotNetCodeAnalysisVersion>
88-
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24207.1</MicrosoftDotNetGenAPIVersion>
89-
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24207.1</MicrosoftDotNetGenFacadesVersion>
90-
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24207.1</MicrosoftDotNetXUnitAssertVersion>
91-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24207.1</MicrosoftDotNetXUnitExtensionsVersion>
92-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24207.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
93-
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksArchivesVersion>
94-
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersVersion>
95-
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksPackagingVersion>
96-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTemplatingVersion>
98-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99-
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24207.1</MicrosoftDotNetRemoteExecutorVersion>
100-
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24207.1</MicrosoftDotNetVersionToolsTasksVersion>
101-
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24207.1</MicrosoftDotNetPackageTestingVersion>
86+
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksFeedVersion>
87+
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24210.4</MicrosoftDotNetCodeAnalysisVersion>
88+
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24210.4</MicrosoftDotNetGenAPIVersion>
89+
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24210.4</MicrosoftDotNetGenFacadesVersion>
90+
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24210.4</MicrosoftDotNetXUnitAssertVersion>
91+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24210.4</MicrosoftDotNetXUnitExtensionsVersion>
92+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24210.4</MicrosoftDotNetXUnitConsoleRunnerVersion>
93+
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksArchivesVersion>
94+
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksInstallersVersion>
95+
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksPackagingVersion>
96+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
97+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksTemplatingVersion>
98+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24210.4</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
99+
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24210.4</MicrosoftDotNetRemoteExecutorVersion>
100+
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24210.4</MicrosoftDotNetVersionToolsTasksVersion>
101+
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24210.4</MicrosoftDotNetPackageTestingVersion>
102102
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
103103
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
104104
<!-- NuGet dependencies -->

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

Lines changed: 39 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ while :; do
142142
case $lowerI in
143143
-\?|-h|--help)
144144
usage
145-
exit 1
146145
;;
147146
arm)
148147
__BuildArch=arm
@@ -229,12 +228,19 @@ while :; do
229228
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
230229
;;
231230
lldb*)
232-
version="${lowerI/lldb/}"
233-
parts=(${version//./ })
231+
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
232+
majorVersion="${version%%.*}"
233+
234+
[ -z "${version##*.*}" ] && minorVersion="${version#*.}"
235+
if [ -z "$minorVersion" ]; then
236+
minorVersion=0
237+
fi
234238

235239
# for versions > 6.0, lldb has dropped the minor version
236-
if [[ "${parts[0]}" -gt 6 ]]; then
237-
version="${parts[0]}"
240+
if [ "$majorVersion" -le 6 ]; then
241+
version="$majorVersion.$minorVersion"
242+
else
243+
version="$majorVersion"
238244
fi
239245

240246
__LLDB_Package="liblldb-${version}-dev"
@@ -243,15 +249,19 @@ while :; do
243249
unset __LLDB_Package
244250
;;
245251
llvm*)
246-
version="${lowerI/llvm/}"
247-
parts=(${version//./ })
248-
__LLVM_MajorVersion="${parts[0]}"
249-
__LLVM_MinorVersion="${parts[1]}"
250-
251-
# for versions > 6.0, llvm has dropped the minor version
252-
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
253-
__LLVM_MinorVersion=0;
252+
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
253+
__LLVM_MajorVersion="${version%%.*}"
254+
255+
[ -z "${version##*.*}" ] && __LLVM_MinorVersion="${version#*.}"
256+
if [ -z "$__LLVM_MinorVersion" ]; then
257+
__LLVM_MinorVersion=0
254258
fi
259+
260+
# for versions > 6.0, lldb has dropped the minor version
261+
if [ "$__LLVM_MajorVersion" -gt 6 ]; then
262+
__LLVM_MinorVersion=
263+
fi
264+
255265
;;
256266
xenial) # Ubuntu 16.04
257267
if [[ "$__CodeName" != "jessie" ]]; then
@@ -323,15 +333,14 @@ while :; do
323333
alpine*)
324334
__CodeName=alpine
325335
__UbuntuRepo=
326-
version="${lowerI/alpine/}"
327336

328-
if [[ "$version" == "edge" ]]; then
337+
if [[ "$lowerI" == "alpineedge" ]]; then
329338
__AlpineVersion=edge
330339
else
331-
parts=(${version//./ })
332-
__AlpineMajorVersion="${parts[0]}"
333-
__AlpineMinoVersion="${parts[1]}"
334-
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
340+
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
341+
__AlpineMajorVersion="${version%%.*}"
342+
__AlpineMinorVersion="${version#*.}"
343+
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion"
335344
fi
336345
;;
337346
freebsd13)
@@ -454,7 +463,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
454463
elif [[ "$arch" == "aarch64" ]]; then
455464
__ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0"
456465
else
457-
echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`"
466+
echo "WARNING: add missing hash for your host architecture. To find the value, use: 'find /tmp -name apk.static -exec sha512sum {} \;'"
458467
fi
459468
echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
460469
chmod +x "$__ApkToolsDir/apk.static"
@@ -484,12 +493,14 @@ if [[ "$__CodeName" == "alpine" ]]; then
484493
fi
485494

486495
# initialize DB
496+
# shellcheck disable=SC2086
487497
"$__ApkToolsDir/apk.static" \
488498
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
489499
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
490500
-U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add
491501

492502
if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then
503+
# shellcheck disable=SC2086
493504
__AlpinePackages+=" $("$__ApkToolsDir/apk.static" \
494505
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
495506
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
@@ -498,6 +509,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
498509
fi
499510

500511
# install all packages in one go
512+
# shellcheck disable=SC2086
501513
"$__ApkToolsDir/apk.static" \
502514
-X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \
503515
-X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \
@@ -521,6 +533,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then
521533
rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}"
522534
# install packages we need.
523535
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update
536+
# shellcheck disable=SC2086
524537
INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages
525538
elif [[ "$__CodeName" == "illumos" ]]; then
526539
mkdir "$__RootfsDir/tmp"
@@ -582,8 +595,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then
582595
mkdir "$__RootfsDir/tmp/download"
583596

584597
echo "Downloading Haiku package tool"
585-
git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 $__RootfsDir/tmp/script
586-
wget -O "$__RootfsDir/tmp/download/hosttools.zip" $($__RootfsDir/tmp/script/fetch.sh --hosttools)
598+
git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script"
599+
wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
587600
unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
588601

589602
DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg"
@@ -616,7 +629,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then
616629

617630
# Download buildtools
618631
echo "Downloading Haiku buildtools"
619-
wget -O "$__RootfsDir/tmp/download/buildtools.zip" $($__RootfsDir/tmp/script/fetch.sh --buildtools --arch=$__HaikuArch)
632+
wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)"
620633
unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir"
621634

622635
# Cleaning up temporary files
@@ -629,10 +642,12 @@ elif [[ -n "$__CodeName" ]]; then
629642
__Keyring="$__Keyring --force-check-gpg"
630643
fi
631644

645+
# shellcheck disable=SC2086
632646
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
633647
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
634648
chroot "$__RootfsDir" apt-get update
635649
chroot "$__RootfsDir" apt-get -f -y install
650+
# shellcheck disable=SC2086
636651
chroot "$__RootfsDir" apt-get -y install $__UbuntuPackages
637652
chroot "$__RootfsDir" symlinks -cr /usr
638653
chroot "$__RootfsDir" apt-get clean
@@ -650,6 +665,5 @@ elif [[ "$__Tizen" == "tizen" ]]; then
650665
ROOTFS_DIR="$__RootfsDir" "$__CrossDir/tizen-build-rootfs.sh" "$__BuildArch"
651666
else
652667
echo "Unsupported target platform."
653-
usage;
654-
exit 1
668+
usage
655669
fi

‎eng/common/templates-official/job/source-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
pool:
4949
${{ if eq(variables['System.TeamProject'], 'public') }}:
5050
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')]
51-
demands: ImageOverride -equals build.ubuntu.1804.amd64
51+
demands: ImageOverride -equals build.ubuntu.2004.amd64
5252

5353
${{ if eq(variables['System.TeamProject'], 'internal') }}:
5454
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]

0 commit comments

Comments
 (0)