Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20230113.7 (#1518)

[main] Update dependencies from dotnet/arcade
main
dotnet-maestro[bot] 4 years ago
committed by GitHub
parent
commit
daa4c320c3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 18
      eng/common/cross/build-rootfs.sh
  3. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23062.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.23063.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
<Sha>1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23062.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.23063.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
<Sha>1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23062.3">
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.23063.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
<Sha>1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23062.3">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.23063.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
<Sha>1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23062.3">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.23063.7">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>12b42d0d77948889890ef2f35af8c46438d3f2d2</Sha>
<Sha>1b04d6de502c4108ada6ea8e5ccefdc2ddc3ee7b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

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

@ -48,12 +48,14 @@ __UbuntuPackages+=" symlinks"
__UbuntuPackages+=" libicu-dev"
__UbuntuPackages+=" liblttng-ust-dev"
__UbuntuPackages+=" libunwind8-dev"
__UbuntuPackages+=" libnuma-dev"
__AlpinePackages+=" gettext-dev"
__AlpinePackages+=" icu-dev"
__AlpinePackages+=" libunwind-dev"
__AlpinePackages+=" lttng-ust-dev"
__AlpinePackages+=" compiler-rt-static"
__AlpinePackages+=" numactl-dev"
# runtime libraries' dependencies
__UbuntuPackages+=" libcurl4-openssl-dev"
@ -147,9 +149,9 @@ while :; do
__BuildArch=ppc64le
__UbuntuArch=ppc64el
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
unset __LLDB_Package
;;
riscv64)
@ -157,7 +159,7 @@ while :; do
__UbuntuArch=riscv64
__UbuntuRepo="http://deb.debian.org/debian-ports"
__CodeName=sid
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
unset __LLDB_Package
if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then
@ -168,9 +170,9 @@ while :; do
__BuildArch=s390x
__UbuntuArch=s390x
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
__UbuntuPackages="${__UbuntuPackages// libomp-dev/}"
__UbuntuPackages="${__UbuntuPackages// libomp5/}"
unset __LLDB_Package
;;
x64)
@ -310,6 +312,8 @@ done
if [[ "$__BuildArch" == "armel" ]]; then
__LLDB_Package="lldb-3.5-dev"
elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then
__AlpinePackages="${__AlpinePackages//numactl-dev/}"
fi
__UbuntuPackages+=" ${__LLDB_Package:-}"

2
global.json

@ -14,6 +14,6 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23062.3"
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23063.7"
}
}

Loading…
Cancel
Save