Skip to content

Commit fc36b04

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20240923.2 (#9834)
[main] Update dependencies from dotnet/arcade
1 parent 31c3978 commit fc36b04

File tree

4 files changed

+40
-32
lines changed

4 files changed

+40
-32
lines changed

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,25 +165,25 @@
165165
</Dependency>
166166
</ProductDependencies>
167167
<ToolsetDependencies>
168-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24467.1">
168+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24473.2">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
170+
<Sha>3dadfa71b6645da4db9e2643bd6c3642339af72e</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24467.1">
172+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.24473.2">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
174+
<Sha>3dadfa71b6645da4db9e2643bd6c3642339af72e</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24467.1">
176+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24473.2">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
178+
<Sha>3dadfa71b6645da4db9e2643bd6c3642339af72e</Sha>
179179
</Dependency>
180180
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182182
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24467.1">
184+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24473.2">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>34138f08e2c9c3c41a0ac8af583a57ea953e3821</Sha>
186+
<Sha>3dadfa71b6645da4db9e2643bd6c3642339af72e</Sha>
187187
</Dependency>
188188
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
189189
<Uri>https://github.com/dotnet/sourcelink</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<!-- Packages that come from https://github.com/dotnet/arcade -->
5252
<PropertyGroup>
5353
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
54-
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24467.1</MicrosoftDotNetCodeAnalysisPackageVersion>
54+
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.24473.2</MicrosoftDotNetCodeAnalysisPackageVersion>
5555
</PropertyGroup>
5656
<!-- Sourcelink -->
5757
<PropertyGroup>

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

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@ __HaikuPackages="gcc_syslibs"
9191
__HaikuPackages+=" gcc_syslibs_devel"
9292
__HaikuPackages+=" gmp"
9393
__HaikuPackages+=" gmp_devel"
94-
__HaikuPackages+=" icu66"
95-
__HaikuPackages+=" icu66_devel"
94+
__HaikuPackages+=" icu[0-9]+"
95+
__HaikuPackages+=" icu[0-9]*_devel"
9696
__HaikuPackages+=" krb5"
9797
__HaikuPackages+=" krb5_devel"
9898
__HaikuPackages+=" libiconv"
9999
__HaikuPackages+=" libiconv_devel"
100-
__HaikuPackages+=" llvm12_libunwind"
101-
__HaikuPackages+=" llvm12_libunwind_devel"
100+
__HaikuPackages+=" llvm[0-9]*_libunwind"
101+
__HaikuPackages+=" llvm[0-9]*_libunwind_devel"
102102
__HaikuPackages+=" mpfr"
103103
__HaikuPackages+=" mpfr_devel"
104-
__HaikuPackages+=" openssl"
105-
__HaikuPackages+=" openssl_devel"
104+
__HaikuPackages+=" openssl3"
105+
__HaikuPackages+=" openssl3_devel"
106106
__HaikuPackages+=" zlib"
107107
__HaikuPackages+=" zlib_devel"
108108

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

498498
ensureDownloadTool
499-
499+
500500
if [[ "$__hasWget" == 1 ]]; then
501501
wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static"
502502
else
@@ -681,7 +681,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then
681681

682682
ensureDownloadTool
683683

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

692692
unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin"
693693

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

697-
# Download Haiku packages
698704
echo "Downloading Haiku packages"
699705
read -ra array <<<"$__HaikuPackages"
700706
for package in "${array[@]}"; do
701707
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
708+
hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" |
709+
grep -E "${package}-" | sort -V | tail -n 1 | xargs)"
710+
if [ -z "$hpkgFilename" ]; then
711+
>&2 echo "ERROR: package $package missing."
712+
exit 1
713+
fi
714+
echo "Resolved filename: $hpkgFilename..."
715+
hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename"
704716
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')"
707717
wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
708718
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')"
711719
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl"
712720
fi
713721
done
714722
for package in haiku haiku_devel; do
715723
echo "Downloading $package..."
716724
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"
725+
hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
726+
wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
719727
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"
728+
hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')"
729+
curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg"
722730
fi
723731
done
724732

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
}
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24467.1",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24467.1"
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24473.2",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24473.2"
1717
},
1818
"sdk": {
1919
"version": "9.0.100-rc.1.24452.12"

0 commit comments

Comments
 (0)