File tree 3 files changed +26
-21
lines changed
3 files changed +26
-21
lines changed Original file line number Diff line number Diff line change 3
3
<ProductDependencies >
4
4
</ProductDependencies >
5
5
<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 " >
7
7
<Uri >https://github.com/dotnet/arcade</Uri >
8
- <Sha >0db07252ccb18afdf94820ba6125da6de729ec04 </Sha >
8
+ <Sha >14df52bae2c74fc850a8c40fe68ea5be5cd30116 </Sha >
9
9
</Dependency >
10
10
</ToolsetDependencies >
11
11
</Dependencies >
Original file line number Diff line number Diff line change @@ -186,32 +186,27 @@ while :; do
186
186
__UbuntuArch=i386
187
187
__UbuntuRepo=" http://archive.ubuntu.com/ubuntu/"
188
188
;;
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"
206
199
;;
207
200
no-lldb)
208
201
unset __LLDB_Package
209
202
;;
210
203
llvm* )
211
- version=" $( echo " $ lowerI" | tr -d ' [:alpha:]-= ' ) "
204
+ version=" ${ lowerI/ llvm / } "
212
205
parts=(${version// ./ } )
213
206
__LLVM_MajorVersion=" ${parts[0]} "
214
207
__LLVM_MinorVersion=" ${parts[1]} "
208
+
209
+ # for versions > 6.0, llvm has dropped the minor version
215
210
if [[ -z " $__LLVM_MinorVersion " && " $__LLVM_MajorVersion " -le 6 ]]; then
216
211
__LLVM_MinorVersion=0;
217
212
fi
@@ -231,6 +226,16 @@ while :; do
231
226
__CodeName=bionic
232
227
fi
233
228
;;
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
+ ;;
234
239
jessie) # Debian 8
235
240
__CodeName=jessie
236
241
__UbuntuRepo=" http://ftp.debian.org/debian/"
Original file line number Diff line number Diff line change 14
14
}
15
15
},
16
16
"msbuild-sdks" : {
17
- "Microsoft.DotNet.Arcade.Sdk" : " 7.0.0-beta.22423.2 "
17
+ "Microsoft.DotNet.Arcade.Sdk" : " 7.0.0-beta.22426.8 "
18
18
}
19
19
}
You can’t perform that action at this time.
0 commit comments