Skip to content

Commit ed08e32

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20220826.8 (#180)
[main] Update dependencies from dotnet/arcade
1 parent 15c1952 commit ed08e32

File tree

3 files changed

+26
-21
lines changed

3 files changed

+26
-21
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22423.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22426.8">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>0db07252ccb18afdf94820ba6125da6de729ec04</Sha>
8+
<Sha>14df52bae2c74fc850a8c40fe68ea5be5cd30116</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/cross/build-rootfs.sh

+23-18
Original file line numberDiff line numberDiff line change
@@ -186,32 +186,27 @@ while :; do
186186
__UbuntuArch=i386
187187
__UbuntuRepo="http://archive.ubuntu.com/ubuntu/"
188188
;;
189-
lldb3.6)
190-
__LLDB_Package="lldb-3.6-dev"
191-
;;
192-
lldb3.8)
193-
__LLDB_Package="lldb-3.8-dev"
194-
;;
195-
lldb3.9)
196-
__LLDB_Package="liblldb-3.9-dev"
197-
;;
198-
lldb4.0)
199-
__LLDB_Package="liblldb-4.0-dev"
200-
;;
201-
lldb5.0)
202-
__LLDB_Package="liblldb-5.0-dev"
203-
;;
204-
lldb6.0)
205-
__LLDB_Package="liblldb-6.0-dev"
189+
lldb*)
190+
version="${lowerI/lldb/}"
191+
parts=(${version//./ })
192+
193+
# for versions > 6.0, lldb has dropped the minor version
194+
if [[ "${parts[0]}" -gt 6 ]]; then
195+
version="${parts[0]}"
196+
fi
197+
198+
__LLDB_Package="liblldb-${version}-dev"
206199
;;
207200
no-lldb)
208201
unset __LLDB_Package
209202
;;
210203
llvm*)
211-
version="$(echo "$lowerI" | tr -d '[:alpha:]-=')"
204+
version="${lowerI/llvm/}"
212205
parts=(${version//./ })
213206
__LLVM_MajorVersion="${parts[0]}"
214207
__LLVM_MinorVersion="${parts[1]}"
208+
209+
# for versions > 6.0, llvm has dropped the minor version
215210
if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then
216211
__LLVM_MinorVersion=0;
217212
fi
@@ -231,6 +226,16 @@ while :; do
231226
__CodeName=bionic
232227
fi
233228
;;
229+
focal) # Ubuntu 20.04
230+
if [[ "$__CodeName" != "jessie" ]]; then
231+
__CodeName=focal
232+
fi
233+
;;
234+
jammy) # Ubuntu 22.04
235+
if [[ "$__CodeName" != "jessie" ]]; then
236+
__CodeName=jammy
237+
fi
238+
;;
234239
jessie) # Debian 8
235240
__CodeName=jessie
236241
__UbuntuRepo="http://ftp.debian.org/debian/"

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22423.2"
17+
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22426.8"
1818
}
1919
}

0 commit comments

Comments
 (0)