Skip to content

Commit 03906e1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240926.2 (dotnet#2619)
[main] Update dependencies from dotnet/arcade
1 parent 181efd3 commit 03906e1

File tree

5 files changed

+69
-32
lines changed

5 files changed

+69
-32
lines changed

‎eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24467.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24476.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
8+
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24467.1">
10+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24476.2">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
12+
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24467.1">
14+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24476.2">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
16+
<Sha>7e8b8f4f321c8671aa01b53567d31aaa4950706f</Sha>
1717
</Dependency>
1818
</ToolsetDependencies>
1919
</Dependencies>

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
<SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
1616
<SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
1717
<MicrosoftBclTimeProviderVersion>8.0.0</MicrosoftBclTimeProviderVersion>
18-
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24467.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
18+
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
1919
</PropertyGroup>
2020
</Project>

‎eng/common/core-templates/job/job.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ parameters:
1919
# publishing defaults
2020
artifacts: ''
2121
enableMicrobuild: false
22+
enableMicrobuildForMacAndLinux: false
2223
enablePublishBuildArtifacts: false
2324
enablePublishBuildAssets: false
2425
enablePublishTestResults: false
@@ -134,11 +135,26 @@ jobs:
134135
signType: $(_SignType)
135136
zipSources: false
136137
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
138+
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
139+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
137140
env:
138141
TeamName: $(_TeamName)
139142
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
143+
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
140144
continueOnError: ${{ parameters.continueOnError }}
141-
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
145+
condition: and(
146+
succeeded(),
147+
or(
148+
and(
149+
eq(variables['Agent.Os'], 'Windows_NT'),
150+
in(variables['_SignType'], 'real', 'test')
151+
),
152+
and(
153+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
154+
ne(variables['Agent.Os'], 'Windows_NT'),
155+
eq(variables['_SignType'], 'real')
156+
)
157+
))
142158

143159
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
144160
- task: NuGetAuthenticate@1
@@ -171,7 +187,19 @@ jobs:
171187
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
172188
- task: MicroBuildCleanup@1
173189
displayName: Execute Microbuild cleanup tasks
174-
condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
190+
condition: and(
191+
always(),
192+
or(
193+
and(
194+
eq(variables['Agent.Os'], 'Windows_NT'),
195+
in(variables['_SignType'], 'real', 'test')
196+
),
197+
and(
198+
${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }},
199+
ne(variables['Agent.Os'], 'Windows_NT'),
200+
eq(variables['_SignType'], 'real')
201+
)
202+
))
175203
continueOnError: ${{ parameters.continueOnError }}
176204
env:
177205
TeamName: $(_TeamName)

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

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ __UbuntuPackages+=" libcurl4-openssl-dev"
6666
__UbuntuPackages+=" libkrb5-dev"
6767
__UbuntuPackages+=" libssl-dev"
6868
__UbuntuPackages+=" zlib1g-dev"
69+
__UbuntuPackages+=" libbrotli-dev"
6970

7071
__AlpinePackages+=" curl-dev"
7172
__AlpinePackages+=" krb5-dev"
@@ -91,18 +92,18 @@ __HaikuPackages="gcc_syslibs"
9192
__HaikuPackages+=" gcc_syslibs_devel"
9293
__HaikuPackages+=" gmp"
9394
__HaikuPackages+=" gmp_devel"
94-
__HaikuPackages+=" icu66"
95-
__HaikuPackages+=" icu66_devel"
95+
__HaikuPackages+=" icu[0-9]+"
96+
__HaikuPackages+=" icu[0-9]*_devel"
9697
__HaikuPackages+=" krb5"
9798
__HaikuPackages+=" krb5_devel"
9899
__HaikuPackages+=" libiconv"
99100
__HaikuPackages+=" libiconv_devel"
100-
__HaikuPackages+=" llvm12_libunwind"
101-
__HaikuPackages+=" llvm12_libunwind_devel"
101+
__HaikuPackages+=" llvm[0-9]*_libunwind"
102+
__HaikuPackages+=" llvm[0-9]*_libunwind_devel"
102103
__HaikuPackages+=" mpfr"
103104
__HaikuPackages+=" mpfr_devel"
104-
__HaikuPackages+=" openssl"
105-
__HaikuPackages+=" openssl_devel"
105+
__HaikuPackages+=" openssl3"
106+
__HaikuPackages+=" openssl3_devel"
106107
__HaikuPackages+=" zlib"
107108
__HaikuPackages+=" zlib_devel"
108109

@@ -496,7 +497,7 @@ if [[ "$__CodeName" == "alpine" ]]; then
496497
arch="$(uname -m)"
497498

498499
ensureDownloadTool
499-
500+
500501
if [[ "$__hasWget" == 1 ]]; then
501502
wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
502503
else
@@ -681,7 +682,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then
681682

682683
ensureDownloadTool
683684

684-
echo "Downloading Haiku package tool"
685+
echo "Downloading Haiku package tools"
685686
git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script"
686687
if [[ "$__hasWget" == 1 ]]; then
687688
wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)"
@@ -691,34 +692,42 @@ elif [[ "$__CodeName" == "haiku" ]]; then
691692

692693
unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
693694

694-
DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg"
695-
HpkgBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
695+
HaikuBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current"
696+
HaikuPortsBaseUrl="https://eu.hpkg.haiku-os.org/haikuports/master/$__HaikuArch/current"
697+
698+
echo "Downloading HaikuPorts package repository index..."
699+
if [[ "$__hasWget" == 1 ]]; then
700+
wget -P "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
701+
else
702+
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo"
703+
fi
696704

697-
# Download Haiku packages
698705
echo "Downloading Haiku packages"
699706
read -ra array <<<"$__HaikuPackages"
700707
for package in "${array[@]}"; do
701708
echo "Downloading $package..."
702-
# API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60
703-
# The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598
709+
hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" |
710+
grep -E "${package}-" | sort -V | tail -n 1 | xargs)"
711+
if [ -z "$hpkgFilename" ]; then
712+
>&2 echo "ERROR: package $package missing."
713+
exit 1
714+
fi
715+
echo "Resolved filename: $hpkgFilename..."
716+
hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename"
704717
if [[ "$__hasWget" == 1 ]]; then
705-
hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
706-
--header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
707718
wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
708719
else
709-
hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \
710-
--header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')"
711720
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
712721
fi
713722
done
714723
for package in haiku haiku_devel; do
715724
echo "Downloading $package..."
716725
if [[ "$__hasWget" == 1 ]]; then
717-
hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
718-
wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
726+
hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
727+
wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
719728
else
720-
hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
721-
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
729+
hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
730+
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
722731
fi
723732
done
724733

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919
},
2020
"msbuild-sdks": {
21-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24467.1",
22-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24467.1"
21+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24476.2",
22+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24476.2"
2323
}
2424
}

0 commit comments

Comments
 (0)