Skip to content

Commit 62f52b0

Browse files
atbaggaatbagga
authored
Merge pull request #257 from Microsoft/dev
Version 0.1.4 changes from dev to master
2 parents ca44bc3 + 11638c8 commit 62f52b0

File tree

45 files changed

+697
-57
lines changed

Some content is hidden

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

45 files changed

+697
-57
lines changed

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,3 +295,9 @@ paket-files/
295295
*.btm.cs
296296
*.odx.cs
297297
*.xsd.cs
298+
299+
# Except for the release folders which contains vsts release code
300+
!src/common_modules/vsts-cli-release-common/vsts/cli/release/
301+
src/common_modules/vsts-cli-release-common/vsts/cli/release/*/_pycache
302+
!src/command_modules/vsts-cli-release/vsts/cli/release/
303+
src/command_modules/vsts-cli-release/vsts/cli/release/*/_pycache

‎packaged_releases/windows/scripts/build-packages.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,14 @@ def build_packages(clone_root, dist_dir):
5454
os.path.join(clone_root, 'src/common_modules/vsts-cli-common'),
5555
os.path.join(clone_root, 'src/common_modules/vsts-cli-admin-common'),
5656
os.path.join(clone_root, 'src/common_modules/vsts-cli-build-common'),
57+
os.path.join(clone_root, 'src/common_modules/vsts-cli-release-common'),
5758
os.path.join(clone_root, 'src/common_modules/vsts-cli-code-common'),
5859
os.path.join(clone_root, 'src/common_modules/vsts-cli-package-common'),
5960
os.path.join(clone_root, 'src/common_modules/vsts-cli-team-common'),
6061
os.path.join(clone_root, 'src/common_modules/vsts-cli-work-common'),
6162
os.path.join(clone_root, 'src/command_modules/vsts-cli-admin'),
6263
os.path.join(clone_root, 'src/command_modules/vsts-cli-build'),
64+
os.path.join(clone_root, 'src/command_modules/vsts-cli-release'),
6365
os.path.join(clone_root, 'src/command_modules/vsts-cli-code'),
6466
os.path.join(clone_root, 'src/command_modules/vsts-cli-package'),
6567
os.path.join(clone_root, 'src/command_modules/vsts-cli-team'),

‎packaged_releases/windows/scripts/build_local.cmd‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ set "PATH=%PATH%;%ProgramFiles%\Git\bin;%ProgramFiles%\Git\usr\bin"
1010

1111
if "%CLIVERSION%"=="" (
1212
if "%BUILD_BUILDID%" == "" (
13-
set CLIVERSION=0.1.3
13+
set CLIVERSION=0.1.4
1414
) else (
15-
set CLIVERSION=0.1.3.%BUILD_BUILDID%
15+
set CLIVERSION=0.1.4.%BUILD_BUILDID%
1616
)
1717
)
1818
set PYTHON_VERSION=3.6.3
1919

20-
set WIX_DOWNLOAD_URL="https://vstscli.blob.core.windows.net/msi/wix311-binaries-mirror.zip"
20+
set WIX_DOWNLOAD_URL="https://vstsclitool.blob.core.windows.net/msi/wix311-binaries-mirror.zip"
2121

2222
:: Set up the output directory and temp. directories
2323
echo *** Cleaning previous build artifacts...
@@ -123,6 +123,8 @@ if %errorlevel% neq 0 goto ERROR
123123
if %errorlevel% neq 0 goto ERROR
124124
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\common_modules\vsts-cli-build-common"
125125
if %errorlevel% neq 0 goto ERROR
126+
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\common_modules\vsts-cli-release-common"
127+
if %errorlevel% neq 0 goto ERROR
126128
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\common_modules\vsts-cli-code-common"
127129
if %errorlevel% neq 0 goto ERROR
128130
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\common_modules\vsts-cli-package-common"
@@ -135,6 +137,8 @@ if %errorlevel% neq 0 goto ERROR
135137
if %errorlevel% neq 0 goto ERROR
136138
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\command_modules\vsts-cli-build"
137139
if %errorlevel% neq 0 goto ERROR
140+
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\command_modules\vsts-cli-release"
141+
if %errorlevel% neq 0 goto ERROR
138142
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\command_modules\vsts-cli-code"
139143
if %errorlevel% neq 0 goto ERROR
140144
"%BUILDING_DIR%\python.exe" -m pip install -f "%TEMP_SCRATCH_FOLDER%" --no-cache-dir "%REPO_ROOT%\src\command_modules\vsts-cli-package"

‎scripts/curl_install/README.md‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,24 @@ Curl Install Script Information
33

44
The scripts in this directory are used for installing through curl and they point to the packages on PyPI.
55

6-
curl -L https://aka.ms/vsts-cli-curl-install | bash
6+
curl -L https://aka.ms/install-vsts-cli | bash
77

88
To update these scripts, submit a PR.
99

10-
To calculate hash for install.py
10+
To calculate hash for install script before running.
1111

12-
```
13-
import hashlib
12+
Download the script:
1413

15-
f = open('install.py', 'r', encoding='utf-8')
16-
data = f.read().encode('utf-8')
17-
m = hashlib.sha256(data)
18-
m.hexdigest()
19-
```
14+
curl -L https://aka.ms/install-vsts-cli >cli-install
15+
16+
Make it executable:
17+
18+
chmod 775 cli-install
19+
20+
To calculate hash for cli-install (SHA256: a72dbb33fcc4356ba4f8cd6b29fe2cad9d7b0f932e332cf6874498a7082c676b)
21+
22+
Linux:
23+
sha256sum cli-install
24+
25+
Mac:
26+
shasum -a 256 cli-install

‎scripts/curl_install/install‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
# Bash script to install the VSTS CLI
1010
#
1111

12-
INSTALL_SCRIPT_URL="https://vstscli.blob.core.windows.net/install/install.py"
13-
INSTALL_SCRIPT_SHA256=264f6e73cd46052b0a0e494dbe304c0ea89926c1762cf6e80bca69be3d805c06
12+
INSTALL_SCRIPT_URL="https://vstsclitool.blob.core.windows.net/install/install.py"
13+
INSTALL_SCRIPT_SHA256=30616e61ce89f84e1f4617d757374b8dd33da953fed7e63bad2ca5c0c6161948
14+
1415
_TTY=/dev/tty
1516

1617
install_script=$(mktemp -t vsts_cli_install_tmp_XXXX) || exit
@@ -19,26 +20,26 @@ echo "Downloading Microsoft VSTS CLI install script from $INSTALL_SCRIPT_URL to
1920

2021
curl -# $INSTALL_SCRIPT_URL > $install_script || exit
2122

22-
# Check validity of the script (temporarily turned off)
23-
24-
#if command -v sha256sum >/dev/null 2>&1
25-
#then
26-
# echo "$INSTALL_SCRIPT_SHA256 $install_script" | sha256sum -c - || exit
27-
#elif command -v shasum >/dev/null 2>&1
28-
#then
29-
# echo "$INSTALL_SCRIPT_SHA256 $install_script" | shasum -a 256 -c - || exit
30-
#fi
31-
#if ! command -v python >/dev/null 2>&1
32-
#then
33-
# echo "ERROR: Python not found. 'command -v python' returned failure."
34-
# echo "If python is available on the system, add it to PATH. For example 'sudo ln -s /usr/bin/python3 /usr/bin/python'"
35-
# exit 1
36-
#fi
23+
# Check validity of the script
24+
25+
if command -v sha256sum >/dev/null 2>&1
26+
then
27+
echo "$INSTALL_SCRIPT_SHA256 $install_script" | sha256sum -c - || exit
28+
elif command -v shasum >/dev/null 2>&1
29+
then
30+
echo "$INSTALL_SCRIPT_SHA256 $install_script" | shasum -a 256 -c - || exit
31+
fi
32+
if ! command -v python >/dev/null 2>&1
33+
then
34+
echo "ERROR: Python not found. 'command -v python' returned failure."
35+
echo "If python is available on the system, add it to PATH. For example 'sudo ln -s /usr/bin/python3 /usr/bin/python'"
36+
exit 1
37+
fi
3738

3839
chmod 775 $install_script
3940

4041
if command -v python 2>/dev/null; then
4142
python $install_script < $_TTY
4243
else
4344
python3 $install_script < $_TTY
44-
fi
45+
fi

‎scripts/docgen/doc_source_map.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"build": "src/command_modules/vsts-cli-build/vsts/cli/build/_help.py",
3-
"code": "src/command_modules/vsts-cli-code/vsts/cli/code/_help.py",
3+
"release": "src/command_modules/vsts-cli-release/vsts/cli/release/_help.py",
4+
"code": "src/command_modules/vsts-cli-code/vsts/cli/code/_help.py",
45
"team": "src/command_modules/vsts-cli-team/vsts/cli/team/_help.py",
56
"work": "src/command_modules/vsts-cli-work/vsts/cli/work/_help.py",
67
"admin": "src/command_modules/vsts-cli-admin/vsts/cli/admin/_help.py",

‎src/command_modules/vsts-cli-admin/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup, find_packages
77

88
NAME = 'vsts-cli-admin'
9-
VERSION = '0.1.3'
9+
VERSION = '0.1.4'
1010

1111
# To install the library, run the following
1212
#

‎src/command_modules/vsts-cli-build/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup, find_packages
77

88
NAME = 'vsts-cli-build'
9-
VERSION = '0.1.3'
9+
VERSION = '0.1.4'
1010

1111
# To install the library, run the following
1212
#

‎src/command_modules/vsts-cli-build/vsts/cli/build/arguments.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,8 @@ def load_build_arguments(cli_command_loader):
3030
with ArgumentsContext(cli_command_loader, 'build definition show') as ac:
3131
ac.argument('definition_id', options_list='--id', type=int)
3232

33+
with ArgumentsContext(cli_command_loader, 'build definition list') as ac:
34+
ac.argument('repository_type', choices=['tfsversioncontrol', 'tfsgit', 'git', 'github', 'githubenterprise', 'bitbucket', 'svn'], type=str.lower)
35+
3336
with ArgumentsContext(cli_command_loader, 'build task') as ac:
3437
ac.argument('task_id', options_list='--id', type=str)

‎src/command_modules/vsts-cli-code/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from setuptools import setup, find_packages
77

88
NAME = 'vsts-cli-code'
9-
VERSION = '0.1.3'
9+
VERSION = '0.1.4'
1010

1111
# To install the library, run the following
1212
#

0 commit comments

Comments
 (0)