From af881c5690cfac141969ea37c36d793cc3003351 Mon Sep 17 00:00:00 2001
From: Derek Bekoe <debekoe@microsoft.com>
Date: Tue, 17 Oct 2017 10:51:31 -0700
Subject: [PATCH] Remove +dev from versions (#4684)

---
 doc/authoring_command_modules/README.md       | 12 ++++-------
 scripts/batch/build_all.sh                    |  2 +-
 scripts/ci/test_automation.sh                 |  6 +++++-
 scripts/ci/test_integration.sh                |  6 +++++-
 scripts/ci/test_static.sh                     |  6 +++++-
 scripts/ci/version.sh                         |  8 +++----
 .../HISTORY.rst                               |  5 +++--
 src/azure-cli-command_modules-nspkg/setup.py  |  2 +-
 src/azure-cli-core/HISTORY.rst                |  8 +++++--
 src/azure-cli-core/azure/cli/core/__init__.py |  2 +-
 src/azure-cli-core/setup.py                   |  2 +-
 src/azure-cli-nspkg/HISTORY.rst               |  5 +++--
 src/azure-cli-nspkg/setup.py                  |  2 +-
 src/azure-cli-testsdk/HISTORY.rst             |  3 +++
 .../azure/cli/testsdk/__init__.py             |  2 +-
 src/azure-cli-testsdk/setup.py                |  2 +-
 src/azure-cli/HISTORY.rst                     |  4 ++++
 src/azure-cli/azure/cli/__init__.py           |  2 +-
 src/azure-cli/setup.py                        |  2 +-
 src/command_modules/azure-cli-acr/HISTORY.rst |  4 ++--
 src/command_modules/azure-cli-acr/setup.py    |  2 +-
 src/command_modules/azure-cli-acs/HISTORY.rst |  5 +++--
 src/command_modules/azure-cli-acs/setup.py    |  2 +-
 .../azure-cli-appservice/HISTORY.rst          |  5 +++--
 .../azure-cli-appservice/setup.py             |  2 +-
 .../azure-cli-backup/HISTORY.rst              |  5 +++++
 src/command_modules/azure-cli-backup/setup.py |  2 +-
 .../azure-cli-batch/HISTORY.rst               |  5 +++++
 src/command_modules/azure-cli-batch/setup.py  |  2 +-
 .../azure-cli-batchai/HISTORY.rst             |  4 ++++
 .../azure-cli-batchai/setup.py                |  2 +-
 .../azure-cli-billing/HISTORY.rst             |  5 +++++
 .../azure-cli-billing/setup.py                |  2 +-
 src/command_modules/azure-cli-cdn/HISTORY.rst |  5 +++++
 src/command_modules/azure-cli-cdn/setup.py    |  2 +-
 .../azure-cli-cloud/HISTORY.rst               |  5 +++++
 src/command_modules/azure-cli-cloud/setup.py  |  2 +-
 .../azure-cli-cognitiveservices/HISTORY.rst   |  5 +++++
 .../azure-cli-cognitiveservices/setup.py      |  2 +-
 .../azure-cli-component/HISTORY.rst           |  4 ++++
 .../cli/command_modules/component/custom.py   | 11 ----------
 .../azure-cli-component/setup.py              |  2 +-
 .../azure-cli-configure/HISTORY.rst           |  5 +++++
 .../azure-cli-configure/setup.py              |  2 +-
 .../azure-cli-consumption/HISTORY.rst         |  5 +++++
 .../azure-cli-consumption/setup.py            |  2 +-
 .../azure-cli-container/HISTORY.rst           |  5 +++++
 .../azure-cli-container/setup.py              |  2 +-
 .../azure-cli-cosmosdb/HISTORY.rst            |  5 +++++
 .../azure-cli-cosmosdb/setup.py               |  2 +-
 src/command_modules/azure-cli-dla/HISTORY.rst |  5 +++++
 src/command_modules/azure-cli-dla/setup.py    |  2 +-
 src/command_modules/azure-cli-dls/HISTORY.rst |  5 +++++
 src/command_modules/azure-cli-dls/setup.py    |  2 +-
 .../azure-cli-eventgrid/HISTORY.rst           |  5 +++++
 .../azure-cli-eventgrid/setup.py              |  2 +-
 .../azure-cli-extension/HISTORY.rst           |  5 +++++
 .../azure-cli-extension/setup.py              |  2 +-
 .../azure-cli-feedback/HISTORY.rst            |  5 +++--
 .../azure-cli-feedback/setup.py               |  2 +-
 .../azure-cli-find/HISTORY.rst                |  5 +++--
 src/command_modules/azure-cli-find/setup.py   |  2 +-
 .../azure-cli-interactive/HISTORY.rst         |  5 +++++
 .../azure-cli-interactive/setup.py            |  2 +-
 src/command_modules/azure-cli-iot/HISTORY.rst |  6 ++++++
 src/command_modules/azure-cli-iot/setup.py    |  2 +-
 .../azure-cli-keyvault/HISTORY.rst            |  5 +++++
 .../azure-cli-keyvault/setup.py               |  2 +-
 src/command_modules/azure-cli-lab/HISTORY.rst |  5 +++++
 src/command_modules/azure-cli-lab/setup.py    |  2 +-
 .../azure-cli-monitor/HISTORY.rst             |  4 ++--
 .../azure-cli-monitor/setup.py                |  2 +-
 .../azure-cli-network/HISTORY.rst             |  4 ++++
 .../azure-cli-network/setup.py                |  2 +-
 .../azure-cli-profile/HISTORY.rst             |  5 +++++
 .../azure-cli-profile/setup.py                |  2 +-
 .../azure-cli-rdbms/HISTORY.rst               |  5 +++++
 src/command_modules/azure-cli-rdbms/setup.py  |  2 +-
 .../azure-cli-redis/HISTORY.rst               |  5 +++++
 src/command_modules/azure-cli-redis/setup.py  |  2 +-
 .../azure-cli-resource/HISTORY.rst            |  4 ++--
 .../azure-cli-resource/setup.py               |  2 +-
 .../azure-cli-role/HISTORY.rst                |  5 +++++
 src/command_modules/azure-cli-role/setup.py   |  2 +-
 .../azure-cli-servicefabric/HISTORY.rst       |  5 +++++
 .../azure-cli-servicefabric/setup.py          |  2 +-
 src/command_modules/azure-cli-sql/HISTORY.rst |  4 ++++
 src/command_modules/azure-cli-sql/setup.py    |  2 +-
 .../azure-cli-storage/HISTORY.rst             |  4 ++++
 .../azure-cli-storage/setup.py                |  2 +-
 src/command_modules/azure-cli-vm/HISTORY.rst  |  5 +++--
 src/command_modules/azure-cli-vm/setup.py     |  2 +-
 .../automation/tests/verify_readme_history.py | 21 ++++++++++++++++---
 93 files changed, 262 insertions(+), 96 deletions(-)

diff --git a/doc/authoring_command_modules/README.md b/doc/authoring_command_modules/README.md
index 15ee5866d..5a4f80100 100644
--- a/doc/authoring_command_modules/README.md
+++ b/doc/authoring_command_modules/README.md
@@ -170,10 +170,6 @@ Submitting Pull Requests
 
 Modify the `HISTORY.rst` for all changed modules.
 
-Add your change log to the 'unreleased' heading in the file.
-
-If that heading doesn't exist yet, create it.
-
 This will be the release notes for the next release.
 
 e.g.:  
@@ -183,13 +179,13 @@ e.g.:
 Release History
 ===============
 
-unreleased
-++++++++++
+0.0.2
++++++
 
 * This is my change.
 
-0.0.1 (YYYY-MM-DD)
-++++++++++++++++++
+0.0.1
++++++
 
 * This is the changelog from a prev. release.
 
diff --git a/scripts/batch/build_all.sh b/scripts/batch/build_all.sh
index 7370c7538..d222f237f 100755
--- a/scripts/batch/build_all.sh
+++ b/scripts/batch/build_all.sh
@@ -90,7 +90,7 @@ cat >$testsrc_dir/setup.py <<EOL
 
 from setuptools import setup
 
-VERSION = "1.0.0+dev"
+VERSION = "1.0.0"
 
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
diff --git a/scripts/ci/test_automation.sh b/scripts/ci/test_automation.sh
index 0b0303789..0aad310a0 100755
--- a/scripts/ci/test_automation.sh
+++ b/scripts/ci/test_automation.sh
@@ -4,9 +4,13 @@ set -e
 
 . $(cd $(dirname $0); pwd)/artifacts.sh
 
+ls -la $share_folder/build
+
+ALL_MODULES=`find $share_folder/build/ -name "*.whl"`
+
 pip install -qqq -e ./tools
 pip install -qqq coverage codecov
-pip install -qqq azure-cli-fulltest -f $share_folder/build
+pip install -qqq $ALL_MODULES
 
 echo '=== List installed packages'
 pip freeze
diff --git a/scripts/ci/test_integration.sh b/scripts/ci/test_integration.sh
index 666dfd82c..7f0e38532 100755
--- a/scripts/ci/test_integration.sh
+++ b/scripts/ci/test_integration.sh
@@ -4,8 +4,12 @@ set -e
 
 . $(cd $(dirname $0); pwd)/artifacts.sh
 
+ls -la $share_folder/build
+
+ALL_MODULES=`find $share_folder/build/ -name "*.whl"`
+
 pip install -e ./tools
-pip install azure-cli -f $share_folder/build
+pip install $ALL_MODULES
 
 echo '=== List installed packages'
 pip freeze
diff --git a/scripts/ci/test_static.sh b/scripts/ci/test_static.sh
index ab2adc389..f9299ed9a 100755
--- a/scripts/ci/test_static.sh
+++ b/scripts/ci/test_static.sh
@@ -4,8 +4,12 @@ set -e
 
 . $(cd $(dirname $0); pwd)/artifacts.sh
 
+ls -la $share_folder/build
+
+ALL_MODULES=`find $share_folder/build/ -name "*.whl"`
+
 pip install pylint flake8
-pip install azure-cli-fulltest -f $share_folder/build
+pip install $ALL_MODULES
 
 echo '=== List installed packages'
 pip freeze
diff --git a/scripts/ci/version.sh b/scripts/ci/version.sh
index 2f616ce94..c7974e319 100755
--- a/scripts/ci/version.sh
+++ b/scripts/ci/version.sh
@@ -22,17 +22,17 @@ platform=`uname`
 
 for each in $(find src -name __init__.py); do
     if [ "$platform" == "Darwin" ]; then
-        sed -i "" "s/^__version__ = [\"']\(.*\)+dev[\"']/__version__ = \"\1+dev.$version\"/" $each
+        sed -i "" "s/^__version__ = [\"']\(.*\)[\"']/__version__ = \"\1.dev$version\"/" $each
     else
-        sed -i "s/^__version__ = [\"']\(.*\)+dev[\"']/__version__ = \"\1+dev.$version\"/" $each
+        sed -i "s/^__version__ = [\"']\(.*\)[\"']/__version__ = \"\1.dev$version\"/" $each
     fi
 done
 
 for each in $(find src -name setup.py); do
     if [ "$platform" == "Darwin" ]; then
-        sed -i "" "s/^VERSION = [\"']\(.*\)+dev[\"']/VERSION = \"\1+dev.$version\"/" $each
+        sed -i "" "s/^VERSION = [\"']\(.*\)[\"']/VERSION = \"\1.dev$version\"/" $each
     else
-        sed -i "s/^VERSION = [\"']\(.*\)+dev[\"']/VERSION = \"\1+dev.$version\"/" $each
+        sed -i "s/^VERSION = [\"']\(.*\)[\"']/VERSION = \"\1.dev$version\"/" $each
     fi
 done
 
diff --git a/src/azure-cli-command_modules-nspkg/HISTORY.rst b/src/azure-cli-command_modules-nspkg/HISTORY.rst
index b43d298d6..8295cb946 100644
--- a/src/azure-cli-command_modules-nspkg/HISTORY.rst
+++ b/src/azure-cli-command_modules-nspkg/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-2.0.1 (2017-07-07)
-++++++++++++++++++
+
+2.0.1
++++++
 * minor fixes
 
 2.0.0 (2017-04-28)
diff --git a/src/azure-cli-command_modules-nspkg/setup.py b/src/azure-cli-command_modules-nspkg/setup.py
index 3e3f223f1..f435261a8 100644
--- a/src/azure-cli-command_modules-nspkg/setup.py
+++ b/src/azure-cli-command_modules-nspkg/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = "2.0.1+dev"
+VERSION = "2.0.1"
 
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
diff --git a/src/azure-cli-core/HISTORY.rst b/src/azure-cli-core/HISTORY.rst
index 0befef314..a9a57aae3 100644
--- a/src/azure-cli-core/HISTORY.rst
+++ b/src/azure-cli-core/HISTORY.rst
@@ -3,10 +3,14 @@
 Release History
 ===============
 
-unreleased
-+++++++++++++++++++
+2.0.20
+++++++
 * 2017-03-09-profile is updated to consume MGMT_STORAGE API version '2016-01-01'
 
+2.0.19
+++++++
+* skipped version to align package versions with azure-cli
+
 2.0.18 (2017-10-09)
 +++++++++++++++++++
 * Azure Stack: handle adfs authority url with a trailing slash
diff --git a/src/azure-cli-core/azure/cli/core/__init__.py b/src/azure-cli-core/azure/cli/core/__init__.py
index c1b6a552f..05b471900 100644
--- a/src/azure-cli-core/azure/cli/core/__init__.py
+++ b/src/azure-cli-core/azure/cli/core/__init__.py
@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-__version__ = "2.0.18+dev"
+__version__ = "2.0.20"
 
 # pylint: disable=unused-import
 # The names are imported here to shorten the name references to core utilities in azure.cli.core package.
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index c547e4bba..bf83dc842 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.18+dev"
+VERSION = "2.0.20"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:
diff --git a/src/azure-cli-nspkg/HISTORY.rst b/src/azure-cli-nspkg/HISTORY.rst
index 86d9c0046..aa08e6ec9 100644
--- a/src/azure-cli-nspkg/HISTORY.rst
+++ b/src/azure-cli-nspkg/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-3.0.1 (2017-07-07)
-++++++++++++++++++
+
+3.0.1
++++++
 * minor fixes
 
 3.0.0 (2016-04-28)
diff --git a/src/azure-cli-nspkg/setup.py b/src/azure-cli-nspkg/setup.py
index 5ef98f3b6..4e0a28aac 100644
--- a/src/azure-cli-nspkg/setup.py
+++ b/src/azure-cli-nspkg/setup.py
@@ -8,7 +8,7 @@
 from codecs import open
 from setuptools import setup
 
-VERSION = "3.0.1+dev"
+VERSION = "3.0.1"
 
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
diff --git a/src/azure-cli-testsdk/HISTORY.rst b/src/azure-cli-testsdk/HISTORY.rst
index df5defb7f..c0f1401b1 100644
--- a/src/azure-cli-testsdk/HISTORY.rst
+++ b/src/azure-cli-testsdk/HISTORY.rst
@@ -3,3 +3,6 @@
 Release History
 ===============
 
+0.1.0
++++++++++
+* Initial release
diff --git a/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py b/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py
index b809ead67..462ae1068 100644
--- a/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py
+++ b/src/azure-cli-testsdk/azure/cli/testsdk/__init__.py
@@ -19,4 +19,4 @@ __all__ = ['ScenarioTest', 'LiveScenarioTest', 'ResourceGroupPreparer', 'Storage
            'live_only', 'record_only', 'StringCheck', 'StringContainCheck', 'get_sha1_hash', 'KeyVaultPreparer',
            'JMESPathCheckGreaterThan', 'api_version_constraint', 'get_active_api_profile', 'create_random_name']
 
-__version__ = '0.1.0+dev'
+__version__ = '0.1.0'
diff --git a/src/azure-cli-testsdk/setup.py b/src/azure-cli-testsdk/setup.py
index 137af4d95..8857145dc 100644
--- a/src/azure-cli-testsdk/setup.py
+++ b/src/azure-cli-testsdk/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.0+dev"
+VERSION = "0.1.0"
 
 CLASSIFIERS = [
     'Development Status :: 3 - Alpha',
diff --git a/src/azure-cli/HISTORY.rst b/src/azure-cli/HISTORY.rst
index 4327967db..a65b2ff2a 100644
--- a/src/azure-cli/HISTORY.rst
+++ b/src/azure-cli/HISTORY.rst
@@ -2,6 +2,10 @@
 
 Release History
 ===============
+
+2.0.20
+++++++
+
 2.0.19 (2017-10-09)
 +++++++++++++++++++
 * no changes
diff --git a/src/azure-cli/azure/cli/__init__.py b/src/azure-cli/azure/cli/__init__.py
index 498c14684..5795a2fa7 100644
--- a/src/azure-cli/azure/cli/__init__.py
+++ b/src/azure-cli/azure/cli/__init__.py
@@ -11,4 +11,4 @@ import pkg_resources
 pkg_resources.declare_namespace(__name__)
 
 __author__ = "Microsoft Corporation <python@microsoft.com>"
-__version__ = "2.0.19+dev"
+__version__ = "2.0.20"
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index 211bca27b..50cfabd18 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.19+dev"
+VERSION = "2.0.20"
 # If we have source, validate that our version numbers match
 # This should prevent uploading releases with mismatched versions.
 try:
diff --git a/src/command_modules/azure-cli-acr/HISTORY.rst b/src/command_modules/azure-cli-acr/HISTORY.rst
index 8a0a5a4a9..0508b39b5 100644
--- a/src/command_modules/azure-cli-acr/HISTORY.rst
+++ b/src/command_modules/azure-cli-acr/HISTORY.rst
@@ -3,8 +3,8 @@
 Release History
 ===============
 
-unreleased
-++++++++++
+2.0.14
+++++++
 * All resource management now points to 2017-10-01 api-version.
 * Bring your own storage SKU is now Classic.
 * Managed registry SKUs are now Basic, Standard, and Premium.
diff --git a/src/command_modules/azure-cli-acr/setup.py b/src/command_modules/azure-cli-acr/setup.py
index c83f6edb6..8560953f0 100644
--- a/src/command_modules/azure-cli-acr/setup.py
+++ b/src/command_modules/azure-cli-acr/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.13+dev"
+VERSION = "2.0.14"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-acs/HISTORY.rst b/src/command_modules/azure-cli-acs/HISTORY.rst
index d9fa9f110..d73329b0d 100644
--- a/src/command_modules/azure-cli-acs/HISTORY.rst
+++ b/src/command_modules/azure-cli-acs/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-unreleased
-+++++++++++++++++++
+
+2.0.18
+++++++
 * fix kubernetes get-credentials
 
 2.0.17 (2017-10-09)
diff --git a/src/command_modules/azure-cli-acs/setup.py b/src/command_modules/azure-cli-acs/setup.py
index 5c07fb284..2c36a875b 100644
--- a/src/command_modules/azure-cli-acs/setup.py
+++ b/src/command_modules/azure-cli-acs/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.17+dev"
+VERSION = "2.0.18"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-appservice/HISTORY.rst b/src/command_modules/azure-cli-appservice/HISTORY.rst
index e6e80490e..5a64b9364 100644
--- a/src/command_modules/azure-cli-appservice/HISTORY.rst
+++ b/src/command_modules/azure-cli-appservice/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-(unreleased)
-+++++++++++++++++++
+
+0.1.19
+++++++
 * webapp: fix a bug that downloaded log file might be invalid
 
 0.1.18 (2017-10-09)
diff --git a/src/command_modules/azure-cli-appservice/setup.py b/src/command_modules/azure-cli-appservice/setup.py
index c6da2ed98..10818e423 100644
--- a/src/command_modules/azure-cli-appservice/setup.py
+++ b/src/command_modules/azure-cli-appservice/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.18+dev"
+VERSION = "0.1.19"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-backup/HISTORY.rst b/src/command_modules/azure-cli-backup/HISTORY.rst
index a979f775b..6b1ee958b 100644
--- a/src/command_modules/azure-cli-backup/HISTORY.rst
+++ b/src/command_modules/azure-cli-backup/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+1.0.2
++++++
+* no changes
+
 1.0.1 (2017-09-22)
 ++++++++++++++++++
 * Preview release.
diff --git a/src/command_modules/azure-cli-backup/setup.py b/src/command_modules/azure-cli-backup/setup.py
index 36a35cc1b..48d629388 100644
--- a/src/command_modules/azure-cli-backup/setup.py
+++ b/src/command_modules/azure-cli-backup/setup.py
@@ -13,7 +13,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "1.0.1+dev"
+VERSION = "1.0.2"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-batch/HISTORY.rst b/src/command_modules/azure-cli-batch/HISTORY.rst
index 023284693..73cb71e4d 100644
--- a/src/command_modules/azure-cli-batch/HISTORY.rst
+++ b/src/command_modules/azure-cli-batch/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+3.1.6
++++++
+* minor fixes
+
+
 3.1.5 (2017-10-09)
 ++++++++++++++++++
 * Updated to Batch SDK 4.0.0.
diff --git a/src/command_modules/azure-cli-batch/setup.py b/src/command_modules/azure-cli-batch/setup.py
index b4d9309f6..3caf713d6 100644
--- a/src/command_modules/azure-cli-batch/setup.py
+++ b/src/command_modules/azure-cli-batch/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "3.1.5+dev"
+VERSION = "3.1.6"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-batchai/HISTORY.rst b/src/command_modules/azure-cli-batchai/HISTORY.rst
index b96468d81..e22fed152 100644
--- a/src/command_modules/azure-cli-batchai/HISTORY.rst
+++ b/src/command_modules/azure-cli-batchai/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+0.1.2
++++++
+* minor fixes
+
 0.1.1 (2017-10-09)
 ++++++++++++++++++
 
diff --git a/src/command_modules/azure-cli-batchai/setup.py b/src/command_modules/azure-cli-batchai/setup.py
index 2777190e4..d97eb3bac 100644
--- a/src/command_modules/azure-cli-batchai/setup.py
+++ b/src/command_modules/azure-cli-batchai/setup.py
@@ -13,7 +13,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.1+dev"
+VERSION = "0.1.2"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-billing/HISTORY.rst b/src/command_modules/azure-cli-billing/HISTORY.rst
index 25e2e01ef..ddb9148ee 100644
--- a/src/command_modules/azure-cli-billing/HISTORY.rst
+++ b/src/command_modules/azure-cli-billing/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.6
++++++
+* minor fixes
+
 0.1.5 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-billing/setup.py b/src/command_modules/azure-cli-billing/setup.py
index 588f8660d..16592e348 100644
--- a/src/command_modules/azure-cli-billing/setup.py
+++ b/src/command_modules/azure-cli-billing/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.1.5+dev"
+VERSION = "0.1.6"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-cdn/HISTORY.rst b/src/command_modules/azure-cli-cdn/HISTORY.rst
index ada006fdd..933c54340 100644
--- a/src/command_modules/azure-cli-cdn/HISTORY.rst
+++ b/src/command_modules/azure-cli-cdn/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.10
+++++++
+* minor fixes
+
 0.0.9 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-cdn/setup.py b/src/command_modules/azure-cli-cdn/setup.py
index a262314ba..cfa7a4f95 100644
--- a/src/command_modules/azure-cli-cdn/setup.py
+++ b/src/command_modules/azure-cli-cdn/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.0.9+dev"
+VERSION = "0.0.10"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-cloud/HISTORY.rst b/src/command_modules/azure-cli-cloud/HISTORY.rst
index e75b4c536..0bab983b4 100644
--- a/src/command_modules/azure-cli-cloud/HISTORY.rst
+++ b/src/command_modules/azure-cli-cloud/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+2.0.9
++++++
+* minor fixes
+
 2.0.8 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-cloud/setup.py b/src/command_modules/azure-cli-cloud/setup.py
index 5dc9f6ab5..68086437c 100644
--- a/src/command_modules/azure-cli-cloud/setup.py
+++ b/src/command_modules/azure-cli-cloud/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.8+dev"
+VERSION = "2.0.9"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-cognitiveservices/HISTORY.rst b/src/command_modules/azure-cli-cognitiveservices/HISTORY.rst
index 402446c8e..2bd5122f5 100644
--- a/src/command_modules/azure-cli-cognitiveservices/HISTORY.rst
+++ b/src/command_modules/azure-cli-cognitiveservices/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.9
++++++
+* minor fixes
+
 0.1.8 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-cognitiveservices/setup.py b/src/command_modules/azure-cli-cognitiveservices/setup.py
index 61c6be9f8..9e826802d 100644
--- a/src/command_modules/azure-cli-cognitiveservices/setup.py
+++ b/src/command_modules/azure-cli-cognitiveservices/setup.py
@@ -13,7 +13,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.8+dev"
+VERSION = "0.1.9"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-component/HISTORY.rst b/src/command_modules/azure-cli-component/HISTORY.rst
index 08a695a52..7aa509928 100644
--- a/src/command_modules/azure-cli-component/HISTORY.rst
+++ b/src/command_modules/azure-cli-component/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.8
++++++
+* minor fixes
+
 2.0.7 (2017-08-11)
 ++++++++++++++++++
 
diff --git a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
index 516e476ab..81a4bef69 100644
--- a/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
+++ b/src/command_modules/azure-cli-component/azure/cli/command_modules/component/custom.py
@@ -28,17 +28,9 @@ def _deprecate_warning():
         pass
 
 
-def _verify_not_dev():
-    from azure.cli.core import __version__ as core_version
-    dev_version = core_version.endswith('+dev')
-    if dev_version:
-        raise CLIError('This operation is not available in the developer version of the CLI.')
-
-
 def list_components():
     """ List the installed components """
     _deprecate_warning()
-    _verify_not_dev()
     import pip
     return sorted([{'name': dist.key.replace(COMPONENT_PREFIX, ''), 'version': dist.version}
                    for dist in pip.get_installed_distributions(local_only=True)
@@ -67,7 +59,6 @@ def _get_first_party_pypi_command_modules():
 def list_available_components():
     """ List publicly available components that can be installed """
     _deprecate_warning()
-    _verify_not_dev()
     import pip
     available_components = []
     installed_component_names = [dist.key.replace(COMPONENT_PREFIX, '') for dist in
@@ -89,7 +80,6 @@ def list_available_components():
 def remove(component_name):
     """ Remove a component """
     _deprecate_warning()
-    _verify_not_dev()
     if component_name in ['nspkg', 'core']:
         raise CLIError("This component cannot be removed, it is required for the CLI to function.")
     import pip
@@ -182,7 +172,6 @@ def update(private=False,
            allow_third_party=False):
     """ Update the CLI and all installed components """
     _deprecate_warning()
-    _verify_not_dev()
     import pip
     # Update the CLI itself
     package_list = [CLI_PACKAGE_NAME]
diff --git a/src/command_modules/azure-cli-component/setup.py b/src/command_modules/azure-cli-component/setup.py
index 03a65ce3e..a77ebff18 100644
--- a/src/command_modules/azure-cli-component/setup.py
+++ b/src/command_modules/azure-cli-component/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.7+dev"
+VERSION = "2.0.8"
 
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
diff --git a/src/command_modules/azure-cli-configure/HISTORY.rst b/src/command_modules/azure-cli-configure/HISTORY.rst
index 1b0ecb94c..7710c312c 100644
--- a/src/command_modules/azure-cli-configure/HISTORY.rst
+++ b/src/command_modules/azure-cli-configure/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+2.0.12
+++++++
+* minor fixes
+
 2.0.11 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-configure/setup.py b/src/command_modules/azure-cli-configure/setup.py
index 68481eb7e..be01a78c7 100644
--- a/src/command_modules/azure-cli-configure/setup.py
+++ b/src/command_modules/azure-cli-configure/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "2.0.11+dev"
+VERSION = "2.0.12"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-consumption/HISTORY.rst b/src/command_modules/azure-cli-consumption/HISTORY.rst
index 25e2e01ef..ddb9148ee 100644
--- a/src/command_modules/azure-cli-consumption/HISTORY.rst
+++ b/src/command_modules/azure-cli-consumption/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.6
++++++
+* minor fixes
+
 0.1.5 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-consumption/setup.py b/src/command_modules/azure-cli-consumption/setup.py
index d705dbf6a..bcdf3f9a5 100644
--- a/src/command_modules/azure-cli-consumption/setup.py
+++ b/src/command_modules/azure-cli-consumption/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.1.5+dev"
+VERSION = "0.1.6"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-container/HISTORY.rst b/src/command_modules/azure-cli-container/HISTORY.rst
index feb819757..f5da8ddc6 100644
--- a/src/command_modules/azure-cli-container/HISTORY.rst
+++ b/src/command_modules/azure-cli-container/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.12
+++++++
+* minor fixes
+
 0.1.11 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-container/setup.py b/src/command_modules/azure-cli-container/setup.py
index 3af79cd2c..d0bc46c12 100644
--- a/src/command_modules/azure-cli-container/setup.py
+++ b/src/command_modules/azure-cli-container/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.11+dev"
+VERSION = "0.1.12"
 
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
diff --git a/src/command_modules/azure-cli-cosmosdb/HISTORY.rst b/src/command_modules/azure-cli-cosmosdb/HISTORY.rst
index e0323f9cc..cd2357b85 100644
--- a/src/command_modules/azure-cli-cosmosdb/HISTORY.rst
+++ b/src/command_modules/azure-cli-cosmosdb/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.14
+++++++
+* minor fixes
+
 0.1.13 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-cosmosdb/setup.py b/src/command_modules/azure-cli-cosmosdb/setup.py
index 17f73e294..4985af344 100644
--- a/src/command_modules/azure-cli-cosmosdb/setup.py
+++ b/src/command_modules/azure-cli-cosmosdb/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.1.13+dev"
+VERSION = "0.1.14"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-dla/HISTORY.rst b/src/command_modules/azure-cli-dla/HISTORY.rst
index 5541e46ff..cfbb09e84 100644
--- a/src/command_modules/azure-cli-dla/HISTORY.rst
+++ b/src/command_modules/azure-cli-dla/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.13
+++++++
+* minor fixes
+
 0.0.12 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-dla/setup.py b/src/command_modules/azure-cli-dla/setup.py
index b725245c7..b3ab12b61 100644
--- a/src/command_modules/azure-cli-dla/setup.py
+++ b/src/command_modules/azure-cli-dla/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.0.12+dev"
+VERSION = "0.0.13"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-dls/HISTORY.rst b/src/command_modules/azure-cli-dls/HISTORY.rst
index e661e961d..d158bfcf1 100644
--- a/src/command_modules/azure-cli-dls/HISTORY.rst
+++ b/src/command_modules/azure-cli-dls/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.16
+++++++
+* minor fixes
+
 0.0.15 (2017-10-09)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-dls/setup.py b/src/command_modules/azure-cli-dls/setup.py
index a23f8a30d..9d88c97e6 100644
--- a/src/command_modules/azure-cli-dls/setup.py
+++ b/src/command_modules/azure-cli-dls/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.0.15+dev"
+VERSION = "0.0.16"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-eventgrid/HISTORY.rst b/src/command_modules/azure-cli-eventgrid/HISTORY.rst
index 674c6a8dc..8741c5dea 100644
--- a/src/command_modules/azure-cli-eventgrid/HISTORY.rst
+++ b/src/command_modules/azure-cli-eventgrid/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.1.5
++++++
+* minor fixes
+
 0.1.4 (2017-09-22)
 ++++++++++++++++++
 
diff --git a/src/command_modules/azure-cli-eventgrid/setup.py b/src/command_modules/azure-cli-eventgrid/setup.py
index 0ba4eef0c..c02abb6fd 100644
--- a/src/command_modules/azure-cli-eventgrid/setup.py
+++ b/src/command_modules/azure-cli-eventgrid/setup.py
@@ -13,7 +13,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.4+dev"
+VERSION = "0.1.5"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-extension/HISTORY.rst b/src/command_modules/azure-cli-extension/HISTORY.rst
index b843f69a9..cbb02cebb 100644
--- a/src/command_modules/azure-cli-extension/HISTORY.rst
+++ b/src/command_modules/azure-cli-extension/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.5
++++++
+* minor fixes
+
 0.0.4 (2017-10-09)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-extension/setup.py b/src/command_modules/azure-cli-extension/setup.py
index fa8091010..38a498471 100644
--- a/src/command_modules/azure-cli-extension/setup.py
+++ b/src/command_modules/azure-cli-extension/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.0.4+dev"
+VERSION = "0.0.5"
 
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
diff --git a/src/command_modules/azure-cli-feedback/HISTORY.rst b/src/command_modules/azure-cli-feedback/HISTORY.rst
index ef57c3804..61331a74d 100644
--- a/src/command_modules/azure-cli-feedback/HISTORY.rst
+++ b/src/command_modules/azure-cli-feedback/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-2.0.6 (2017-07-07)
-++++++++++++++++++
+
+2.0.6
++++++
 * minor fixes
 
 2.0.5 (2017-06-21)
diff --git a/src/command_modules/azure-cli-feedback/setup.py b/src/command_modules/azure-cli-feedback/setup.py
index 3cab3f49f..60fc93715 100644
--- a/src/command_modules/azure-cli-feedback/setup.py
+++ b/src/command_modules/azure-cli-feedback/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "2.0.6+dev"
+VERSION = "2.0.6"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-find/HISTORY.rst b/src/command_modules/azure-cli-find/HISTORY.rst
index 17f81028d..ea9fdc8b9 100644
--- a/src/command_modules/azure-cli-find/HISTORY.rst
+++ b/src/command_modules/azure-cli-find/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-0.2.7 (2017-09-22)
-++++++++++++++++++
+
+0.2.7
++++++
 * minor fixes
 
 0.2.6 (2017-07-07)
diff --git a/src/command_modules/azure-cli-find/setup.py b/src/command_modules/azure-cli-find/setup.py
index d5f71151e..09b5ab3dd 100644
--- a/src/command_modules/azure-cli-find/setup.py
+++ b/src/command_modules/azure-cli-find/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "0.2.7+dev"
+VERSION = "0.2.7"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-interactive/HISTORY.rst b/src/command_modules/azure-cli-interactive/HISTORY.rst
index c350f167c..3b21a6de4 100644
--- a/src/command_modules/azure-cli-interactive/HISTORY.rst
+++ b/src/command_modules/azure-cli-interactive/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.3.11
+++++++
+* minor fixes
+
 0.3.10 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-interactive/setup.py b/src/command_modules/azure-cli-interactive/setup.py
index 34769fec6..bb7e87345 100644
--- a/src/command_modules/azure-cli-interactive/setup.py
+++ b/src/command_modules/azure-cli-interactive/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     cmdclass = {}
 
 # Version is also defined in azclishell.__init__.py.
-VERSION = "0.3.10+dev"
+VERSION = "0.3.11"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-iot/HISTORY.rst b/src/command_modules/azure-cli-iot/HISTORY.rst
index 8dbc3e664..3e5f02083 100644
--- a/src/command_modules/azure-cli-iot/HISTORY.rst
+++ b/src/command_modules/azure-cli-iot/HISTORY.rst
@@ -2,6 +2,12 @@
 
 Release History
 ===============
+
+0.1.13
+++++++
+* minor fixes
+
+
 0.1.12 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-iot/setup.py b/src/command_modules/azure-cli-iot/setup.py
index 2750874f6..46393acea 100644
--- a/src/command_modules/azure-cli-iot/setup.py
+++ b/src/command_modules/azure-cli-iot/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.1.12+dev"
+VERSION = "0.1.13"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-keyvault/HISTORY.rst b/src/command_modules/azure-cli-keyvault/HISTORY.rst
index 3603a8bd1..0d59d7d5c 100644
--- a/src/command_modules/azure-cli-keyvault/HISTORY.rst
+++ b/src/command_modules/azure-cli-keyvault/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+2.0.13
+++++++
+* minor fixes
+
 2.0.12 (2017-10-09)
 +++++++++++++++++++
 * Fixed Key Vault authentication issue when using ADFS on Azure Stack. https://github.com/Azure/azure-cli/issues/4448
diff --git a/src/command_modules/azure-cli-keyvault/setup.py b/src/command_modules/azure-cli-keyvault/setup.py
index 8e59ee937..9e2e883db 100644
--- a/src/command_modules/azure-cli-keyvault/setup.py
+++ b/src/command_modules/azure-cli-keyvault/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.12+dev"
+VERSION = "2.0.13"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-lab/HISTORY.rst b/src/command_modules/azure-cli-lab/HISTORY.rst
index 284a71687..9625140f3 100644
--- a/src/command_modules/azure-cli-lab/HISTORY.rst
+++ b/src/command_modules/azure-cli-lab/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.12
+++++++
+* minor fixes
+
 0.0.11 (2017-09-22)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-lab/setup.py b/src/command_modules/azure-cli-lab/setup.py
index a2c6baebc..2af82375c 100644
--- a/src/command_modules/azure-cli-lab/setup.py
+++ b/src/command_modules/azure-cli-lab/setup.py
@@ -12,7 +12,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.0.11+dev"
+VERSION = "0.0.12"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-monitor/HISTORY.rst b/src/command_modules/azure-cli-monitor/HISTORY.rst
index 2ed5b38a0..7562eef7b 100644
--- a/src/command_modules/azure-cli-monitor/HISTORY.rst
+++ b/src/command_modules/azure-cli-monitor/HISTORY.rst
@@ -3,8 +3,8 @@
 Release History
 ===============
 
-unreleased
-++++++++++
+0.0.11
+++++++
 * Add action-group commands
 
 0.0.10 (2017-09-22)
diff --git a/src/command_modules/azure-cli-monitor/setup.py b/src/command_modules/azure-cli-monitor/setup.py
index 81daeabcc..22cf5be3c 100644
--- a/src/command_modules/azure-cli-monitor/setup.py
+++ b/src/command_modules/azure-cli-monitor/setup.py
@@ -12,7 +12,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.0.10+dev"
+VERSION = "0.0.11"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-network/HISTORY.rst b/src/command_modules/azure-cli-network/HISTORY.rst
index 12b2b26bc..c2989504e 100644
--- a/src/command_modules/azure-cli-network/HISTORY.rst
+++ b/src/command_modules/azure-cli-network/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.17
+++++++
+* minor fixes
+
 2.0.16 (2017-10-09)
 +++++++++++++++++++
 * `application-gateway address-pool create`: `--server` argument is not optional to allow creation of empty address pools.
diff --git a/src/command_modules/azure-cli-network/setup.py b/src/command_modules/azure-cli-network/setup.py
index c65e2fd5f..1f26ccb3a 100644
--- a/src/command_modules/azure-cli-network/setup.py
+++ b/src/command_modules/azure-cli-network/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.16+dev"
+VERSION = "2.0.17"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-profile/HISTORY.rst b/src/command_modules/azure-cli-profile/HISTORY.rst
index 635a2f2d8..a76186055 100644
--- a/src/command_modules/azure-cli-profile/HISTORY.rst
+++ b/src/command_modules/azure-cli-profile/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+2.0.15
+++++++
+* minor fixes
+
 2.0.14 (2017-10-09)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-profile/setup.py b/src/command_modules/azure-cli-profile/setup.py
index c8ee5fc0f..323d41221 100644
--- a/src/command_modules/azure-cli-profile/setup.py
+++ b/src/command_modules/azure-cli-profile/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.14+dev"
+VERSION = "2.0.15"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-rdbms/HISTORY.rst b/src/command_modules/azure-cli-rdbms/HISTORY.rst
index b770c2d01..759b371a0 100644
--- a/src/command_modules/azure-cli-rdbms/HISTORY.rst
+++ b/src/command_modules/azure-cli-rdbms/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.8
+++++++
+* minor fixes
+
 0.0.7 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-rdbms/setup.py b/src/command_modules/azure-cli-rdbms/setup.py
index febf130e4..af2bd7a29 100644
--- a/src/command_modules/azure-cli-rdbms/setup.py
+++ b/src/command_modules/azure-cli-rdbms/setup.py
@@ -12,7 +12,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.0.7+dev"
+VERSION = "0.0.8"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-redis/HISTORY.rst b/src/command_modules/azure-cli-redis/HISTORY.rst
index d5d827137..015e30626 100644
--- a/src/command_modules/azure-cli-redis/HISTORY.rst
+++ b/src/command_modules/azure-cli-redis/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.2.10
+++++++
+* minor fixes
+
 0.2.9 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-redis/setup.py b/src/command_modules/azure-cli-redis/setup.py
index 52c0d3d93..3fae79bf5 100644
--- a/src/command_modules/azure-cli-redis/setup.py
+++ b/src/command_modules/azure-cli-redis/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.2.9+dev"
+VERSION = "0.2.10"
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
 CLASSIFIERS = [
diff --git a/src/command_modules/azure-cli-resource/HISTORY.rst b/src/command_modules/azure-cli-resource/HISTORY.rst
index 671712690..b8cd5408f 100644
--- a/src/command_modules/azure-cli-resource/HISTORY.rst
+++ b/src/command_modules/azure-cli-resource/HISTORY.rst
@@ -3,8 +3,8 @@
 Release History
 ===============
 
-unreleased
-+++++++++++++++++++
+2.0.17
+++++++
 * `group export`: Fixed incompatibility with most recent version of msrest dependency.
 * `az policy assignment create`: policy assignment create command to work with built in policy definitions and policy set definitions.
 
diff --git a/src/command_modules/azure-cli-resource/setup.py b/src/command_modules/azure-cli-resource/setup.py
index fb13ceba5..3f083aaae 100644
--- a/src/command_modules/azure-cli-resource/setup.py
+++ b/src/command_modules/azure-cli-resource/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.16+dev"
+VERSION = "2.0.17"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-role/HISTORY.rst b/src/command_modules/azure-cli-role/HISTORY.rst
index d6a4b837a..a8795d90a 100644
--- a/src/command_modules/azure-cli-role/HISTORY.rst
+++ b/src/command_modules/azure-cli-role/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+2.0.14
+++++++
+* minor fixes
+
 2.0.13 (2017-10-09)
 +++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-role/setup.py b/src/command_modules/azure-cli-role/setup.py
index fa65ba4a7..482aa125d 100644
--- a/src/command_modules/azure-cli-role/setup.py
+++ b/src/command_modules/azure-cli-role/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.13+dev"
+VERSION = "2.0.14"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-servicefabric/HISTORY.rst b/src/command_modules/azure-cli-servicefabric/HISTORY.rst
index 1438886b4..78b353e58 100644
--- a/src/command_modules/azure-cli-servicefabric/HISTORY.rst
+++ b/src/command_modules/azure-cli-servicefabric/HISTORY.rst
@@ -2,6 +2,11 @@
 
 Release History
 ===============
+
+0.0.5
++++++
+* minor fixes
+
 0.0.4 (2017-09-22)
 ++++++++++++++++++
 * minor fixes
diff --git a/src/command_modules/azure-cli-servicefabric/setup.py b/src/command_modules/azure-cli-servicefabric/setup.py
index e5f6375ad..ddc901cad 100644
--- a/src/command_modules/azure-cli-servicefabric/setup.py
+++ b/src/command_modules/azure-cli-servicefabric/setup.py
@@ -16,7 +16,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "0.0.4+dev"
+VERSION = "0.0.5"
 
 # The full list of classifiers is available at
 # https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --git a/src/command_modules/azure-cli-sql/HISTORY.rst b/src/command_modules/azure-cli-sql/HISTORY.rst
index 7d40ff1ee..c5a3c03e8 100644
--- a/src/command_modules/azure-cli-sql/HISTORY.rst
+++ b/src/command_modules/azure-cli-sql/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.14
+++++++
+* Minor fixes
+
 2.0.13 (2017-10-09)
 +++++++++++++++++++
 * Adding support for SQL Transparent Data Encryption (TDE) and TDE with Bring Your Own Key
diff --git a/src/command_modules/azure-cli-sql/setup.py b/src/command_modules/azure-cli-sql/setup.py
index beffbcf40..e7c867389 100644
--- a/src/command_modules/azure-cli-sql/setup.py
+++ b/src/command_modules/azure-cli-sql/setup.py
@@ -12,7 +12,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.13+dev"
+VERSION = "2.0.14"
 CLASSIFIERS = [
     'Development Status :: 4 - Beta',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-storage/HISTORY.rst b/src/command_modules/azure-cli-storage/HISTORY.rst
index 421a99ceb..983c7ecbb 100644
--- a/src/command_modules/azure-cli-storage/HISTORY.rst
+++ b/src/command_modules/azure-cli-storage/HISTORY.rst
@@ -3,6 +3,10 @@
 Release History
 ===============
 
+2.0.18
+++++++
+* Minor fixes
+
 2.0.17 (2017-10-09)
 +++++++++++++++++++
 * File share snapshot
diff --git a/src/command_modules/azure-cli-storage/setup.py b/src/command_modules/azure-cli-storage/setup.py
index f92402b31..241f75f27 100644
--- a/src/command_modules/azure-cli-storage/setup.py
+++ b/src/command_modules/azure-cli-storage/setup.py
@@ -14,7 +14,7 @@ except ImportError:
     logger.warn("Wheel is not available, disabling bdist_wheel hook")
     cmdclass = {}
 
-VERSION = "2.0.17+dev"
+VERSION = "2.0.18"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/src/command_modules/azure-cli-vm/HISTORY.rst b/src/command_modules/azure-cli-vm/HISTORY.rst
index 579806782..b64466f9a 100644
--- a/src/command_modules/azure-cli-vm/HISTORY.rst
+++ b/src/command_modules/azure-cli-vm/HISTORY.rst
@@ -2,8 +2,9 @@
 
 Release History
 ===============
-(unreleased)
-+++++++++++++++++++
+
+2.0.17
+++++++
 * `vmss create`: expose '--accelerated-networking'
 
 2.0.16 (2017-10-09)
diff --git a/src/command_modules/azure-cli-vm/setup.py b/src/command_modules/azure-cli-vm/setup.py
index 2887a5478..f900677eb 100644
--- a/src/command_modules/azure-cli-vm/setup.py
+++ b/src/command_modules/azure-cli-vm/setup.py
@@ -15,7 +15,7 @@ except ImportError:
     cmdclass = {}
 
 
-VERSION = "2.0.16+dev"
+VERSION = "2.0.17"
 CLASSIFIERS = [
     'Development Status :: 5 - Production/Stable',
     'Intended Audience :: Developers',
diff --git a/tools/automation/tests/verify_readme_history.py b/tools/automation/tests/verify_readme_history.py
index e07f7aef4..2db698177 100644
--- a/tools/automation/tests/verify_readme_history.py
+++ b/tools/automation/tests/verify_readme_history.py
@@ -51,11 +51,26 @@ def check_history_headings(mod_path):
             writer=None, writer_name='null',
             settings=None, settings_spec=None, settings_overrides={},
             config_section=None, enable_exit_status=None)
-        if pub.writer.document.children[0].rawsource == RELEASE_HISTORY_TITLE:
-            return True
-        else:
+        # Check first heading is Release History
+        if pub.writer.document.children[0].rawsource != RELEASE_HISTORY_TITLE:
             print("Expected '{}' as first heading in HISTORY.rst".format(RELEASE_HISTORY_TITLE))
             return False
+        all_versions = [t['names'][0] for t in pub.writer.document.children if t['names']]
+        # Check that no headings contain 'unreleased'. We don't require it any more
+        if any('unreleased' in v.lower() for v in all_versions):
+            print("We no longer require 'unreleased' in headings. Use the appropriate version number instead.")
+            return False
+        # Check that the current package version has a history entry
+        if not all_versions:
+            print("Unable to get versions from {}. Check formatting. e.g. there should be a new line after the 'Release History' heading.".format(history_path))
+            return False
+        first_version_history = all_versions[0]
+        actual_version = subprocess.check_output('python setup.py --version'.split(), cwd=mod_path, universal_newlines=True)
+        actual_version = actual_version.strip()
+        if first_version_history != actual_version:
+            print("No heading for version {} in {}".format(actual_version, history_path))
+            return False
+        return True
 
 
 def check_readme_render(mod_path):