diff --git a/azure-cli2017.pyproj b/azure-cli2017.pyproj
new file mode 100644
index 00000000000..60bcd4ad1f1
--- /dev/null
+++ b/azure-cli2017.pyproj
@@ -0,0 +1,657 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{938454f7-93bd-41a7-84b2-3c89d64b969d}</ProjectGuid>
+    <ProjectHome>src\</ProjectHome>
+    <StartupFile>azure-cli\azure\cli\__main__.py</StartupFile>
+    <SearchPath>.</SearchPath>
+    <WorkingDirectory>
+    </WorkingDirectory>
+    <OutputPath>.</OutputPath>
+    <ProjectTypeGuids>{888888a0-9f3d-457c-b088-3a5042f75d52}</ProjectTypeGuids>
+    <LaunchProvider>Standard Python launcher</LaunchProvider>
+    <InterpreterId>MSBuild|{54f4b6dc-0859-46dc-99bb-b275c9d0aca3}|$(MSBuildProjectFullPath)</InterpreterId>
+    <EnableNativeCodeDebugging>False</EnableNativeCodeDebugging>
+    <CommandLineArguments>
+    </CommandLineArguments>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'" />
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'" />
+  <PropertyGroup>
+    <VisualStudioVersion Condition=" '$(VisualStudioVersion)' == '' ">10.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="azure-cli-core\azure\cli\core\adal_authentication.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\application.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\azlogging.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\cloud.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\arm.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\client_factory.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\parameters.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\template_create.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\validators.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\_introspection.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\commands\__init__.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\decorators.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\extensions\experimental.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\extensions\query.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\extensions\transform.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\extensions\__init__.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\help_files.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\parser.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\prompting.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\telemetry_upload.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\test_utils\vcr_test_base.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\test_utils\__init__.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_config.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_debug.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_environment.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_help.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_output.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_pkg_util.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_profile.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_session.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\telemetry.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\_util.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\__init__.py" />
+    <Compile Include="azure-cli-core\setup.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\base.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\checkers.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\const.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\exceptions.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\patches.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\preparers.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\recording_processors.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\utilities.py" />
+    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\__init__.py" />
+    <Compile Include="azure-cli-testsdk\setup.py" />
+    <Compile Include="azure-cli\azure\cli\main.py" />
+    <Compile Include="azure-cli\azure\cli\__init__.py" />
+    <Compile Include="azure-cli\azure\cli\__main__.py" />
+    <Compile Include="azure-cli\setup.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\commands.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\credential.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\custom.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\repository.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_constants.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_factory.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_format.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_help.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_params.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_utils.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\_validators.py" />
+    <Compile Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acr\setup.py" />
+    <Compile Include="command_modules\azure-cli-acr\tests\test_acr_commands.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\acs_client.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\custom.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\commands.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\acs_creation_client.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\acs_creation_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\basic_dependency.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\dependency.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_acs.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_extended.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\deployment_properties_extended.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\parameters_link.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\provider.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\provider_resource_type.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\template_link.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\acs_operations.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\proxy.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\test_acs_client.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\test_custom.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\test_service_principals.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\win_proxy.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_actions.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_help.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\_params.py" />
+    <Compile Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\__init__.py" />
+    <Compile Include="command_modules\azure-cli-acs\setup.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\commands.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\custom.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_help.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\_params.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\__init__.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\command_modules\__init__.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\cli\__init__.py" />
+    <Compile Include="command_modules\azure-cli-appservice\azure\__init__.py" />
+    <Compile Include="command_modules\azure-cli-appservice\setup.py" />
+    <Compile Include="command_modules\azure-cli-appservice\tests\test_webapp_commands.py" />
+    <Compile Include="command_modules\azure-cli-appservice\tests\test_webapp_commands_thru_mock.py" />
+    <Compile Include="command_modules\azure-cli-appservice\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_data_plane_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_data_plane_command_base.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_job_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_pool_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_command_type.py" />
+    <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\commands.py" />
+    <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\custom.py" />
+    <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\_help.py" />
+    <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\_params.py" />
+    <Compile Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\__init__.py" />
+    <Compile Include="command_modules\azure-cli-cloud\setup.py" />
+    <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\commands.py" />
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\custom.py" />
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_consts.py" />
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_help.py" />
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\_utils.py" />
+    <Compile Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\__init__.py" />
+    <Compile Include="command_modules\azure-cli-configure\setup.py" />
+    <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\commands.py" />
+    <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\custom.py" />
+    <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\_help.py" />
+    <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\_params.py" />
+    <Compile Include="command_modules\azure-cli-container\azure\cli\command_modules\container\__init__.py" />
+    <Compile Include="command_modules\azure-cli-container\setup.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\commands.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\custom.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_help.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\_params.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\__init__.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\setup.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\setup.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\tests\test_documentdb_params.py" />
+    <Compile Include="command_modules\azure-cli-documentdb\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\commands.py" />
+    <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\custom.py" />
+    <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\__init__.py" />
+    <Compile Include="command_modules\azure-cli-feedback\setup.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\custom.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\commands.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\iot_hub_device_client.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\authentication.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\device_description.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\error_details.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\symmetric_key.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\x509_thumbprint.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\iot_hub_devices_operations.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\sas_token_auth.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_factory.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_help.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_params.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_utils.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\_validators.py" />
+    <Compile Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\__init__.py" />
+    <Compile Include="command_modules\azure-cli-iot\setup.py" />
+    <Compile Include="command_modules\azure-cli-iot\tests\test_iot_commands.py" />
+    <Compile Include="command_modules\azure-cli-iot\tests\test_sas_token_auth.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\custom.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\commands.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_command_type.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_help.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_params.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\_validators.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\__init__.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\setup.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\custom.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\test_batch_mgmt_commands.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_help.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_params.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\_validators.py" />
+    <Compile Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\__init__.py" />
+    <Compile Include="command_modules\azure-cli-batch\setup.py" />
+    <Compile Include="command_modules\azure-cli-keyvault\tests\test_keyvault_commands.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\app_gateway_creation_client.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\app_gateway_creation_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\basic_dependency.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\dependency.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_app_gateway.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_extended.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_properties_extended.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\parameters_link.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\provider.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\provider_resource_type.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\template_link.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\app_gateway_operations.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\configs.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\make_zone_file.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\parse_zone_file.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\record_processors.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_format.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_template_builder.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_util.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_validators.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_dns_zone_import.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_network_commands.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\test_network_unit_tests.py" />
+    <Compile Include="command_modules\azure-cli-network\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\custom.py" />
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\commands.py" />
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\_params.py" />
+    <Compile Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\__init__.py" />
+    <Compile Include="command_modules\azure-cli-redis\setup.py" />
+    <Compile Include="command_modules\azure-cli-redis\tests\test_redis_params.py" />
+    <Compile Include="command_modules\azure-cli-redis\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-resource\tests\test_api_check.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource_list_odata_filter.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\test_resource_validators.py" />
+    <Compile Include="command_modules\azure-cli-resource\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\custom.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-role\tests\test_graph.py" />
+    <Compile Include="command_modules\azure-cli-role\tests\test_role.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\commands.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\custom.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\help.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\params.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\tests\test_sql_commands.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\validators.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\_util.py" />
+    <Compile Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\__init__.py" />
+    <Compile Include="command_modules\azure-cli-sql\setup.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\blob.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\file.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\storage_url_helpers.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\util.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_command_type.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_factory.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_format.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_base.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_blob_download.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_blob_upload.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_copy.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_download.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\integration_test_file_upload.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\test_storage.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\test_validators.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\unittest_storage_url_helpers.py" />
+    <Compile Include="command_modules\azure-cli-storage\tests\__init__.py" />
+    <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\_help.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\custom.py" />
+    <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\commands.py" />
+    <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\_params.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\custom.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\commands.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\credentials.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\exceptions.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\lb_creation_client.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\basic_dependency.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\dependency.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_extended.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_lb.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_properties_extended.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\lb_creation_client_enums.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\parameters_link.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\provider.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\provider_resource_type.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\template_link.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\lb_operations.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\version.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_params.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\custom.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\commands.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_params.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\custom.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\commands.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_params.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_validators.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\commands.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\_params.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\__init__.py" />
+    <Compile Include="command_modules\azure-cli-role\setup.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\custom.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\commands.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_params.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\_validators.py" />
+    <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\custom.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\commands.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\__init__.py" />
+    <Compile Include="command_modules\azure-cli-component\setup.py" />
+    <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\__init__.py" />
+    <Compile Include="command_modules\azure-cli-network\setup.py" />
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\__init__.py" />
+    <Compile Include="command_modules\azure-cli-profile\setup.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\__init__.py" />
+    <Compile Include="command_modules\azure-cli-resource\setup.py" />
+    <Compile Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\__init__.py" />
+    <Compile Include="command_modules\azure-cli-storage\setup.py" />
+    <Compile Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\__init__.py" />
+    <Compile Include="command_modules\azure-cli-taskhelp\setup.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\custom.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_actions.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_client_factory.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_help.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_template_builder.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_validators.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_params.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_vm_diagnostics_templates.py" />
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\_vm_utils.py">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\__init__.py" />
+    <Compile Include="command_modules\azure-cli-vm\setup.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_custom_vm_commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_actions.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_commands.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_defaults.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_image.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\test_vm_parameters.py" />
+    <Compile Include="command_modules\azure-cli-vm\tests\__init__.py" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="azure-cli-core\" />
+    <Folder Include="azure-cli-core\azure\" />
+    <Folder Include="azure-cli-core\azure\cli\" />
+    <Folder Include="azure-cli-core\azure\cli\core\" />
+    <Folder Include="azure-cli-core\azure\cli\core\commands\" />
+    <Folder Include="azure-cli-core\azure\cli\core\extensions\" />
+    <Folder Include="azure-cli-core\azure\cli\core\test_utils\" />
+    <Folder Include="azure-cli-core\azure\cli\core\utils\" />
+    <Folder Include="azure-cli-testsdk\" />
+    <Folder Include="azure-cli-testsdk\azure\" />
+    <Folder Include="azure-cli-testsdk\azure\cli\" />
+    <Folder Include="azure-cli-testsdk\azure\cli\testsdk\" />
+    <Folder Include="azure-cli\" />
+    <Folder Include="azure-cli\azure\" />
+    <Folder Include="azure-cli\azure\cli\" />
+    <Folder Include="azure-cli\azure\cli\command_modules\" />
+    <Folder Include="azure-cli\azure\cli\tests\" />
+    <Folder Include="command_modules\" />
+    <Folder Include="command_modules\azure-cli-acr\" />
+    <Folder Include="command_modules\azure-cli-acr\azure\" />
+    <Folder Include="command_modules\azure-cli-acr\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\" />
+    <Folder Include="command_modules\azure-cli-acr\tests\" />
+    <Folder Include="command_modules\azure-cli-acs\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\models\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\tests\" />
+    <Folder Include="command_modules\azure-cli-appservice\" />
+    <Folder Include="command_modules\azure-cli-appservice\azure\" />
+    <Folder Include="command_modules\azure-cli-appservice\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-appservice\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-appservice\azure\cli\command_modules\appservice\" />
+    <Folder Include="command_modules\azure-cli-appservice\tests\" />
+    <Folder Include="command_modules\azure-cli-appservice\tests\sample_web\" />
+    <Folder Include="command_modules\azure-cli-cloud\" />
+    <Folder Include="command_modules\azure-cli-cloud\azure\" />
+    <Folder Include="command_modules\azure-cli-cloud\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-cloud\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-cloud\azure\cli\command_modules\cloud\" />
+    <Folder Include="command_modules\azure-cli-component\" />
+    <Folder Include="command_modules\azure-cli-component\azure\" />
+    <Folder Include="command_modules\azure-cli-component\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-component\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-component\azure\cli\command_modules\component\" />
+    <Folder Include="command_modules\azure-cli-configure\" />
+    <Folder Include="command_modules\azure-cli-configure\azure\" />
+    <Folder Include="command_modules\azure-cli-configure\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-configure\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-configure\azure\cli\command_modules\configure\" />
+    <Folder Include="command_modules\azure-cli-container\" />
+    <Folder Include="command_modules\azure-cli-container\azure\" />
+    <Folder Include="command_modules\azure-cli-container\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-container\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-container\azure\cli\command_modules\container\" />
+    <Folder Include="command_modules\azure-cli-documentdb\" />
+    <Folder Include="command_modules\azure-cli-documentdb\azure\" />
+    <Folder Include="command_modules\azure-cli-documentdb\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-documentdb\azure\cli\command_modules\documentdb\" />
+    <Folder Include="command_modules\azure-cli-documentdb\tests\" />
+    <Folder Include="command_modules\azure-cli-feedback\" />
+    <Folder Include="command_modules\azure-cli-feedback\azure\" />
+    <Folder Include="command_modules\azure-cli-feedback\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-feedback\azure\cli\command_modules\feedback\" />
+    <Folder Include="command_modules\azure-cli-iot\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\models\" />
+    <Folder Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-iot\tests\" />
+    <Folder Include="command_modules\azure-cli-keyvault\" />
+    <Folder Include="command_modules\azure-cli-keyvault\azure\" />
+    <Folder Include="command_modules\azure-cli-keyvault\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-keyvault\azure\cli\command_modules\keyvault\" />
+    <Folder Include="command_modules\azure-cli-batch\" />
+    <Folder Include="command_modules\azure-cli-batch\azure\" />
+    <Folder Include="command_modules\azure-cli-batch\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\" />
+    <Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\tests\" />
+    <Folder Include="command_modules\azure-cli-keyvault\tests\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\" />
+    <Folder Include="command_modules\azure-cli-network\tests\" />
+    <Folder Include="command_modules\azure-cli-network\tests\zone_files\" />
+    <Folder Include="command_modules\azure-cli-redis\" />
+    <Folder Include="command_modules\azure-cli-redis\azure\" />
+    <Folder Include="command_modules\azure-cli-redis\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-redis\azure\cli\command_modules\redis\" />
+    <Folder Include="command_modules\azure-cli-redis\tests\" />
+    <Folder Include="command_modules\azure-cli-resource\tests\" />
+    <Folder Include="command_modules\azure-cli-role\tests\" />
+    <Folder Include="command_modules\azure-cli-sql\" />
+    <Folder Include="command_modules\azure-cli-sql\azure\" />
+    <Folder Include="command_modules\azure-cli-sql\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\" />
+    <Folder Include="command_modules\azure-cli-sql\azure\cli\command_modules\sql\tests\" />
+    <Folder Include="command_modules\azure-cli-network\" />
+    <Folder Include="command_modules\azure-cli-network\azure\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\" />
+    <Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\" />
+    <Folder Include="command_modules\azure-cli-profile\" />
+    <Folder Include="command_modules\azure-cli-profile\azure\" />
+    <Folder Include="command_modules\azure-cli-profile\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-profile\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\" />
+    <Folder Include="command_modules\azure-cli-resource\" />
+    <Folder Include="command_modules\azure-cli-resource\azure\" />
+    <Folder Include="command_modules\azure-cli-resource\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\" />
+    <Folder Include="command_modules\azure-cli-role\" />
+    <Folder Include="command_modules\azure-cli-role\azure\" />
+    <Folder Include="command_modules\azure-cli-role\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-role\azure\cli\command_modules\role\" />
+    <Folder Include="command_modules\azure-cli-storage\" />
+    <Folder Include="command_modules\azure-cli-storage\azure\" />
+    <Folder Include="command_modules\azure-cli-storage\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-storage\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-storage\azure\cli\command_modules\storage\" />
+    <Folder Include="command_modules\azure-cli-storage\tests\" />
+    <Folder Include="command_modules\azure-cli-storage\tests\scripts\" />
+    <Folder Include="command_modules\azure-cli-taskhelp\" />
+    <Folder Include="command_modules\azure-cli-taskhelp\azure\" />
+    <Folder Include="command_modules\azure-cli-taskhelp\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-taskhelp\azure\cli\command_modules\taskhelp\" />
+    <Folder Include="command_modules\azure-cli-vm\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\" />
+    <Folder Include="command_modules\azure-cli-vm\azure\cli\command_modules\vm\" />
+    <Folder Include="command_modules\azure-cli-vm\tests\" />
+    <Folder Include="command_modules\azure-cli-vm\tests\keyvault\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="azure-cli-core\setup.cfg" />
+    <Content Include="azure-cli-testsdk\HISTORY.rst" />
+    <Content Include="azure-cli-testsdk\MANIFEST.in" />
+    <Content Include="azure-cli-testsdk\README.rst" />
+    <Content Include="azure-cli-testsdk\setup.cfg" />
+    <Content Include="azure-cli\az.completion.sh" />
+    <Content Include="azure-cli\setup.cfg" />
+    <Content Include="command_modules\azure-cli-acr\azure\cli\command_modules\acr\template.json" />
+    <Content Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\azuredeploy.json" />
+    <Content Include="command_modules\azure-cli-acs\azure\cli\command_modules\acs\mgmt_acs\swagger_create_acs.json" />
+    <Content Include="command_modules\azure-cli-appservice\README.rst" />
+    <Content Include="command_modules\azure-cli-appservice\setup.cfg" />
+    <Content Include="command_modules\azure-cli-appservice\tests\sample_web\.gitignore" />
+    <Content Include="command_modules\azure-cli-appservice\tests\sample_web\package.json" />
+    <Content Include="command_modules\azure-cli-appservice\tests\sample_web\server.js" />
+    <Content Include="command_modules\azure-cli-appservice\tests\server.pfx" />
+    <Content Include="command_modules\azure-cli-iot\azure\cli\command_modules\iot\mgmt_iot_hub_device\swagger_iot_hub_device_identity.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\policy.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\policy2.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\policy_import_pem.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\policy_import_pfx.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\policy_pending.json" />
+    <Content Include="command_modules\azure-cli-keyvault\tests\test_secret.txt" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy.json" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy_tests.md">
+      <SubType>Code</SubType>
+    </Content>
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\swagger_create_app_gateway.json" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy_empty.json" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy_test.md" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\swagger_create_lb.json" />
+    <Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy.json" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail1.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail2.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail3.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail4.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\fail5.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone1.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone2.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone3.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone4.txt" />
+    <Content Include="command_modules\azure-cli-network\tests\zone_files\zone5.txt" />
+    <Content Include="command_modules\azure-cli-resource\tests\sample_policy_rule.json" />
+    <Content Include="command_modules\azure-cli-resource\tests\simple_deploy.json" />
+    <Content Include="command_modules\azure-cli-resource\tests\simple_deploy_parameters.json" />
+    <Content Include="command_modules\azure-cli-storage\tests\.gitignore" />
+    <Content Include="command_modules\azure-cli-storage\tests\Readme.md" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\purge_test_sample.sh" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\run_integration.sh" />
+    <Content Include="command_modules\azure-cli-storage\tests\scripts\set_test_env.sh" />
+    <Content Include="command_modules\azure-cli-storage\tests\testfile.rst" />
+    <Content Include="command_modules\azure-cli-storage\tests\testpage.rst" />
+    <Content Include="command_modules\azure-cli-vm\tests\aliases.json" />
+    <Content Include="command_modules\azure-cli-vm\tests\keyvault\policy.json" />
+    <Content Include="command_modules\azure-cli-vm\tests\sample-public.json" />
+    <Content Include="command_modules\azure-cli-vm\tests\vmss_create_test_plan.md" />
+    <Content Include="command_modules\azure-cli-vm\tests\vm_create_test_plan.md" />
+  </ItemGroup>
+  <ItemGroup>
+    <Interpreter Include="..\env\">
+      <Id>{54f4b6dc-0859-46dc-99bb-b275c9d0aca3}</Id>
+      <BaseInterpreter>Global|PythonCore|3.5-32</BaseInterpreter>
+      <Version>3.5</Version>
+      <Description>env (Python 3.5)</Description>
+      <InterpreterPath>Scripts\python.exe</InterpreterPath>
+      <WindowsInterpreterPath>Scripts\pythonw.exe</WindowsInterpreterPath>
+      <LibraryPath>Lib\</LibraryPath>
+      <PathEnvironmentVariable>PYTHONPATH</PathEnvironmentVariable>
+      <Architecture>X86</Architecture>
+    </Interpreter>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
+</Project>
\ No newline at end of file
diff --git a/azure-cli2017.sln b/azure-cli2017.sln
new file mode 100644
index 00000000000..30c9f6b5f4d
--- /dev/null
+++ b/azure-cli2017.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "azure-cli", "azure-cli2017.pyproj", "{938454F7-93BD-41A7-84B2-3C89D64B969D}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{938454F7-93BD-41A7-84B2-3C89D64B969D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{938454F7-93BD-41A7-84B2-3C89D64B969D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal