8000 update to .NET 6 SDK · dotnet/command-line-api@c48e572 · GitHub
[go: up one dir, main page]
Skip to content

Commit c48e572

Browse files
brettfobrettfo
committed
update to .NET 6 SDK
1 parent 27d86d3 commit c48e572

File tree

55 files changed

+287
-596
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+287
-596
lines changed

‎.vsts-ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ trigger:
1010
branches:
1111
include:
1212
- main
13+
- release/*
1314

1415
pr:
1516
autoCancel: false
@@ -94,6 +95,7 @@ stages:
9495
- script: eng\common\cibuild.cmd
9596
-configuration $(_BuildConfig)
9697
-prepareMachine
98+
/p:Projects=System.CommandLine.sln
9799
$(_BuildArgs)
98100
displayName: Build and Publish
99101
- task: PublishBuildArtifacts@1
@@ -132,6 +134,7 @@ stages:
132134
- script: eng/common/cibuild.sh
133135
--configuration $(_BuildConfig)
134136
--prepareMachine
137+
/p:Projects=System.CommandLine.sln
135138
displayName: Build
136139

137140
- job: MacOS
@@ -155,6 +158,7 @@ stages:
155158
- script: eng/common/cibuild.sh
156159
--configuration $(_BuildConfig)
157160< 10000 /code>
--prepareMachine
161+
/p:Projects=System.CommandLine.sln
158162
displayName: Build
159163

160164
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass %~dp0eng\common\build.ps1 -build -restore %*
2+
powershell -NoLogo -NoProfile -ExecutionPolicy ByPass %~dp0eng\common\build.ps1 -build -restore -msbuildEngine dotnet %*
33
exit /b %ErrorLevel%

‎docs/src/Binding/Binding.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<LangVersion>9</LangVersion>
77
</PropertyGroup>
88

‎eng/common/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ runtime_source_feed_key=''
8181

8282
properties=''
8383
while [[ $# > 0 ]]; do
84-
opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")"
84+
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
8585
case "$opt" in
8686
-help|-h)
8787
usage

‎eng/common/cross/armel/tizen-fetch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ fetch_tizen_pkgs()
157157
Inform "Initialize arm base"
158158
fetch_tizen_pkgs_init standard base
159159
Inform "fetch common packages"
160-
fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
160+
fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel
161161
Inform "fetch coreclr packages"
162162
fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
163163
Inform "fetch corefx packages"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ __AndroidToolchain=aarch64-linux-android
2727

2828
for i in "$@"
2929
do
30-
lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")"
30+
lowerI="$(echo $i | awk '{print tolower($0)}')"
3131
case $lowerI in
3232
-?|-h|--help)
3333
usage

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

Lines changed: 12 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ usage()
66
{
77
echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [--skipunmount] --rootfsdir <directory>]"
88
echo "BuildArch can be: arm(default), armel, arm64, x86"
9-
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine, alpine3.9 or alpine3.13. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
9+
echo "CodeName - optional, Code name for Linux, can be: trusty, xenial(default), zesty, bionic, alpine. If BuildArch is armel, LinuxCodeName is jessie(default) or tizen."
1010
echo " for FreeBSD can be: freebsd11 or freebsd12."
1111
echo " for illumos can be: illumos."
1212
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FReeBSD"
@@ -82,7 +82,7 @@ while :; do
8282
break
8383
fi
8484

85-
lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
85+
lowerI="$(echo $1 | awk '{print tolower($0)}')"
8686
case $lowerI in
8787
-?|-h|--help)
8888
usage
@@ -183,20 +183,9 @@ while :; do
183183
__UbuntuRepo=
184184
__Tizen=tizen
185185
;;
186-
alpine|alpine3.9)
186+
alpine)
187187
__CodeName=alpine
188188
__UbuntuRepo=
189-
__AlpineVersion=3.9
190-
;;
191-
alpine3.13)
192-
__CodeName=alpine
193-
__UbuntuRepo=
194-
__AlpineVersion=3.13
195-
# Alpine 3.13 has all the packages we need in the 3.13 repository
196-
__AlpinePackages+=$__AlpinePackagesEdgeCommunity
197-
__AlpinePackagesEdgeCommunity=
198-
__AlpinePackages+=$__AlpinePackagesEdgeMain
199-
__AlpinePackagesEdgeMain=
200189
;;
201190
freebsd11)
202191
__FreeBSDBase="11.3-RELEASE"
@@ -254,6 +243,7 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )"
254243

255244
if [[ "$__CodeName" == "alpine" ]]; then
256245
__ApkToolsVersion=2.9.1
246+
__AlpineVersion=3.9
257247
__ApkToolsDir=$(mktemp -d)
258248
wget https://github.com/alpinelinux/apk-tools/releases/download/v$__ApkToolsVersion/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -P $__ApkToolsDir
259249
tar -xf $__ApkToolsDir/apk-tools-$__ApkToolsVersion-x86_64-linux.tar.gz -C $__ApkToolsDir
@@ -266,19 +256,15 @@ if [[ "$__CodeName" == "alpine" ]]; then
266256
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
267257
add $__AlpinePackages
268258

269-
if [[ -n "$__AlpinePackagesEdgeMain" ]]; then
270-
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
271-
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
272-
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
273-
add $__AlpinePackagesEdgeMain
274-
fi
259+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
260+
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
261+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
262+
add $__AlpinePackagesEdgeMain
275263

276-
if [[ -n "$__AlpinePackagesEdgeCommunity" ]]; then
277-
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
278-
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
279-
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
280-
add $__AlpinePackagesEdgeCommunity
281-
fi
264+
$__ApkToolsDir/apk-tools-$__ApkToolsVersion/apk \
265+
-X http://dl-cdn.alpinelinux.org/alpine/edge/community \
266+
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
267+
add $__AlpinePackagesEdgeCommunity
282268

283269
rm -r $__ApkToolsDir
284270
elif [[ "$__CodeName" == "freebsd" ]]; then

‎eng/common/darc-init.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc
66
verbosity='minimal'
77

88
while [[ $# > 0 ]]; do
9-
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
9+
opt="$(echo "$1" | awk '{print tolower($0)}')"
1010
case "$opt" in
1111
--darcversion)
1212
darcVersion=$2

‎eng/common/dotnet-install.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runtime='dotnet'
1919
runtimeSourceFeed=''
2020
runtimeSourceFeedKey=''
2121
while [[ $# > 0 ]]; do
22-
opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")"
22+
opt="$(echo "$1" | awk '{print tolower($0)}')"
2323
case "$opt" in
2424
-version|-v)
2525
shift
@@ -49,8 +49,13 @@ while [[ $# > 0 ]]; do
4949
shift
5050
done
5151

52-
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
53-
cpuname=$(uname -m)
52+
# Use uname to determine what the CPU is.
53+
cpuname=$(uname -p)
54+
# Some Linux platforms report unknown for platform, but the arch for machine.
55+
if [[ "$cpuname" == "unknown" ]]; then
56+
cpuname=$(uname -m)
57+
fi
58+
5459
case $cpuname in
5560
aarch64)
5661
buildarch=arm64

‎eng/common/generate-locproject.ps1

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0