Skip to content

Commit 25099af

Browse files
fix logging verbosity and added fixed sdk version
1 parent c157a60 commit 25099af

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

.azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ resources:
2020
variables:
2121
Configuration: Release
2222
Verbosity: Normal
23-
DotNetVersion: "3.1.x"
23+
DotNetVersion: "3.1.101"
2424
CakeVersion: "0.32.1"
2525
NuGetVersion: "5.4.0"
2626
Coverage: "$(Agent.BuildDirectory)/c"

build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Param(
4242
[ValidateSet("Release", "Debug")]
4343
[string]$Configuration = "Release",
4444
[ValidateSet("Quiet", "Minimal", "Normal", "Verbose", "Diagnostic")]
45-
[string]$Verbosity = "Verbose",
45+
[string]$Verbosity = "Normal",
4646
[Alias("DryRun","Noop")]
4747
[switch]$WhatIf,
4848
[switch]$SkipToolPackageRestore,

build.sh

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
##########################################################################
88

99
# Define directories.
10-
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
10+
SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
1111
TOOLS_DIR=$SCRIPT_DIR/tools
1212
NUGET_EXE=$TOOLS_DIR/nuget.exe
1313
CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe
@@ -26,29 +26,45 @@ fi
2626
SCRIPT="build.cake"
2727
TARGET="Default"
2828
CONFIGURATION="Release"
29-
VERBOSITY="verbose"
29+
VERBOSITY="normal"
3030
DRYRUN=
3131
SHOW_VERSION=false
3232
SCRIPT_ARGUMENTS=()
3333

3434
# Parse arguments.
3535
for i in "$@"; do
3636
case $1 in
37-
-s|--script) SCRIPT="$2"; shift ;;
38-
-t|--target) TARGET="$2"; shift ;;
39-
-c|--configuration) CONFIGURATION="$2"; shift ;;
40-
-v|--verbosity) VERBOSITY="$2"; shift ;;
41-
-d|--dryrun) DRYRUN="-dryrun" ;;
42-
--version) SHOW_VERSION=true ;;
43-
--) shift; SCRIPT_ARGUMENTS+=("$@"); break ;;
44-
*) SCRIPT_ARGUMENTS+=("$1") ;;
37+
-s | --script)
38+
SCRIPT="$2"
39+
shift
40+
;;
41+
-t | --target)
42+
TARGET="$2"
43+
shift
44+
;;
45+
-c | --configuration)
46+
CONFIGURATION="$2"
47+
shift
48+
;;
49+
-v | --verbosity)
50+
VERBOSITY="$2"
51+
shift
52+
;;
53+
-d | --dryrun) DRYRUN="-dryrun" ;;
54+
--version) SHOW_VERSION=true ;;
55+
--)
56+
shift
57+
SCRIPT_ARGUMENTS+=("$@")
58+
break
59+
;;
60+
*) SCRIPT_ARGUMENTS+=("$1") ;;
4561
esac
4662
shift
4763
done
4864

4965
# Make sure the tools folder exist.
5066
if [ ! -d "$TOOLS_DIR" ]; then
51-
mkdir "$TOOLS_DIR"
67+
mkdir "$TOOLS_DIR"
5268
fi
5369

5470
# Make sure that packages.config exist.
@@ -73,7 +89,7 @@ fi
7389

7490
# Restore tools from NuGet.
7591
pushd "$TOOLS_DIR" >/dev/null
76-
if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$( cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//' )" != "$( $MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' )" ]; then
92+
if [ ! -f $PACKAGES_CONFIG_MD5 ] || [ "$(cat $PACKAGES_CONFIG_MD5 | sed 's/\r$//')" != "$($MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }')" ]; then
7793
find . -type d ! -name . | xargs rm -rf
7894
fi
7995

@@ -83,7 +99,7 @@ if [ $? -ne 0 ]; then
8399
exit 1
84100
fi
85101

86-
$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >| $PACKAGES_CONFIG_MD5
102+
$MD5_EXE $PACKAGES_CONFIG | awk '{ print $1 }' >|$PACKAGES_CONFIG_MD5
87103

88104
popd >/dev/null
89105

0 commit comments

Comments
 (0)