diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
index aaff65dc4fb9..003d7889f2b9 100644
--- a/AzurePowershell.Test.targets
+++ b/AzurePowershell.Test.targets
@@ -30,7 +30,7 @@
.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll
.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll
.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll
- .\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll
+ .\src\ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll
"!Functional&!Scenario&!AzureRTScenario&!Sequential&!PIRTest&!Preview&!ADDomain&!Network&!AzureRTUpload&!AzureRTCleanUp"
All
"OneSDK&CIT"
@@ -59,7 +59,7 @@
-
+
diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
index 17df73468539..4997b28a3907 100644
--- a/setup/azurecmdfiles.wxi
+++ b/setup/azurecmdfiles.wxi
@@ -7,3768 +7,1974 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -3814,15 +2020,6 @@
-
-
-
-
-
-
-
-
-
@@ -3875,166 +2072,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4042,503 +2079,604 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4553,9 +2691,6 @@
-
-
-
@@ -4573,685 +2708,15 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -5266,9 +2731,6 @@
-
-
-
@@ -5286,58 +2748,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Common/Commands.ResourceManager.Profile.Test/Commands.ResourceManager.Profile.Test.csproj b/src/Common/Commands.ResourceManager.Profile.Test/Commands.Profile.Test.csproj
similarity index 99%
rename from src/Common/Commands.ResourceManager.Profile.Test/Commands.ResourceManager.Profile.Test.csproj
rename to src/Common/Commands.ResourceManager.Profile.Test/Commands.Profile.Test.csproj
index 7e2a51bdd196..bea778c370e9 100644
--- a/src/Common/Commands.ResourceManager.Profile.Test/Commands.ResourceManager.Profile.Test.csproj
+++ b/src/Common/Commands.ResourceManager.Profile.Test/Commands.Profile.Test.csproj
@@ -208,9 +208,9 @@
{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}
Commands.ResourceManager.Common
-
+
{142d7b0b-388a-4ceb-a228-7f6d423c5c2e}
- Commands.ResourceManager.Profile
+ Commands.Profile
{3436a126-edc9-4060-8952-9a1be34cdd95}
diff --git a/src/Common/Commands.ResourceManager.Profile/Commands.ResourceManager.Profile.csproj b/src/Common/Commands.ResourceManager.Profile/Commands.Profile.csproj
similarity index 98%
rename from src/Common/Commands.ResourceManager.Profile/Commands.ResourceManager.Profile.csproj
rename to src/Common/Commands.ResourceManager.Profile/Commands.Profile.csproj
index 48cf8b4c98fb..228276fd5952 100644
--- a/src/Common/Commands.ResourceManager.Profile/Commands.ResourceManager.Profile.csproj
+++ b/src/Common/Commands.ResourceManager.Profile/Commands.Profile.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\Package\Debug\ResourceManager\AzureResourceManager\Resources
+ ..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\
DEBUG;TRACE
prompt
4
@@ -28,7 +28,7 @@
false
- ..\..\Package\Release\ResourceManager\AzureResourceManager\Resources
+ ..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln
index 3ef450e2e4cb..497f9e08e36d 100644
--- a/src/ResourceManager.sln
+++ b/src/ResourceManager.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+VisualStudioVersion = 12.0.30723.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
ProjectSection(SolutionItems) = preProject
@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup", "Res
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch", "ResourceManager\AzureBatch\Commands.Batch\Commands.Batch.csproj", "{D470E50A-9607-48D6-A924-4F9F86502704}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\Commerce\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\UsageAggregates\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute", "ResourceManager\Compute\Commands.Compute\Commands.Compute.csproj", "{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}"
EndProject
@@ -107,11 +107,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Profile", "Common\Commands.ResourceManager.Profile\Commands.ResourceManager.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "Common\Commands.ResourceManager.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Profile.Test", "Common\Commands.ResourceManager.Profile.Test\Commands.ResourceManager.Profile.Test.csproj", "{152D78F0-A642-4D0E-B3A8-2FC64FFA9714}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile.Test", "Common\Commands.ResourceManager.Profile.Test\Commands.Profile.Test.csproj", "{152D78F0-A642-4D0E-B3A8-2FC64FFA9714}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}"
EndProject
diff --git a/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1 b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
new file mode 100644
index 000000000000..e7fad28ac65f
--- /dev/null
+++ b/src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1
@@ -0,0 +1,89 @@
+#
+# Module manifest for module 'Microsoft.Azure.Commands.ApiManagement'
+#
+# Generated by: Microsoft Corporation
+#
+# Generated on: 5/17/2015
+#
+
+@{
+
+# Version number of this module.
+ModuleVersion = '0.9.8'
+
+# ID used to uniquely identify this module
+GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'
+
+# Author of this module
+Author = 'Microsoft Corporation'
+
+# Company or vendor of this module
+CompanyName = 'Microsoft Corporation'
+
+# Copyright statement for this module
+Copyright = '� Microsoft Corporation. All rights reserved.'
+
+# Description of the functionality provided by this module
+Description = 'Microsoft Azure PowerShell - Api Management'
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '3.0'
+
+# Name of the Windows PowerShell host required by this module
+PowerShellHostName = ''
+
+# Minimum version of the Windows PowerShell host required by this module
+PowerShellHostVersion = ''
+
+# Minimum version of the .NET Framework required by this module
+DotNetFrameworkVersion = '4.0'
+
+# Minimum version of the common language runtime (CLR) required by this module
+CLRVersion='4.0'
+
+# Processor architecture (None, X86, Amd64, IA64) required by this module
+ProcessorArchitecture = 'None'
+
+# Modules that must be imported into the global environment prior to importing this module
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.8' })
+
+# Assemblies that must be loaded prior to importing this module
+RequiredAssemblies = @()
+
+# Script files (.ps1) that are run in the caller's environment prior to importing this module
+ScriptsToProcess = @()
+
+# Type files (.ps1xml) to be loaded when importing this module
+TypesToProcess = @()
+
+# Format files (.ps1xml) to be loaded when importing this module
+FormatsToProcess = @()
+
+# Modules to import as nested modules of the module specified in ModuleToProcess
+NestedModules = @(
+ '.\Microsoft.Azure.Commands.ApiManagement.dll',
+ '.\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll'
+)
+
+# Functions to export from this module
+FunctionsToExport = '*'
+
+# Cmdlets to export from this module
+CmdletsToExport = '*'
+
+# Variables to export from this module
+VariablesToExport = '*'
+
+# Aliases to export from this module
+AliasesToExport = @()
+
+# List of all modules packaged with this module
+ModuleList = @()
+
+# List of all files packaged with this module
+FileList = @()
+
+# Private data to pass to the module specified in ModuleToProcess
+PrivateData = ''
+
+}
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj
index a373866a0fdf..83a0a385d827 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj
@@ -18,7 +18,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\ApiManagement\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\
TRACE;DEBUG;CODE_ANALYSIS
prompt
4
@@ -30,7 +30,7 @@
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\ApiManagement\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\
TRACE;SIGN
AnyCPU
bin\Release\Management.Automation.dll.CodeAnalysisLog.xml
@@ -246,6 +246,9 @@
PreserveNewest
+
+ AzureRM.ApiManagement.psd1
+
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj
index 05b75b4e1b0d..fa8910e8ac87 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj
@@ -51,7 +51,7 @@
False
- ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Gallery.dll
+ ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Gallery.dll
False
@@ -59,7 +59,7 @@
False
- ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.Authorization.dll
+ ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Management.Authorization.dll
..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj
index 708c83de9b5a..43132d099cb1 100644
--- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj
@@ -18,7 +18,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\ApiManagement\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\
TRACE;DEBUG;CODE_ANALYSIS
prompt
4
@@ -29,7 +29,7 @@
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\ApiManagement\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.ApiManagement\
TRACE;SIGN
AnyCPU
bin\Release\Management.Automation.dll.CodeAnalysisLog.xml
@@ -216,6 +216,9 @@
Designer
PreserveNewest
+
+ AzureRM.ApiManagement.psd1
+
Designer
diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj
index 7be08f2d4f96..d75ab95bf1c4 100644
--- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj
+++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj
@@ -51,7 +51,7 @@
False
- ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Gallery.dll
+ ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Gallery.dll
False
@@ -59,7 +59,7 @@
False
- ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\Resources\Microsoft.Azure.Management.Authorization.dll
+ ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Management.Authorization.dll
..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll
diff --git a/src/ResourceManager/Automation/Commands.Automation/Commands.ResourceManagement.Automation.csproj b/src/ResourceManager/Automation/Commands.Automation/Commands.ResourceManagement.Automation.csproj
index 4a9eee5e2461..3330fbbf62bb 100644
--- a/src/ResourceManager/Automation/Commands.Automation/Commands.ResourceManagement.Automation.csproj
+++ b/src/ResourceManager/Automation/Commands.Automation/Commands.ResourceManagement.Automation.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Automation\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Automation\
DEBUG;TRACE
prompt
4
@@ -33,7 +33,7 @@
OnBuildSuccess
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Automation\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Automation\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
index a91979be3e21..b17aaaff18ed 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureBackup\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.AzureBackup\
DEBUG;TRACE
prompt
4
@@ -30,7 +30,7 @@
MinimumRecommendedRules.ruleset
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureBackup\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.AzureBackup\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj
index ccc67aab8f93..5be941424bef 100644
--- a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj
+++ b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureBatch\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.AzureBatch\
TRACE;DEBUG;CODE_ANALYSIS
prompt
4
@@ -30,7 +30,7 @@
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureBatch\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.AzureBatch\
TRACE;SIGN
prompt
4
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1 b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1
deleted file mode 100644
index e20f473f93f8..000000000000
--- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1
+++ /dev/null
@@ -1,86 +0,0 @@
-#
-# Module manifest for module 'Azure'
-#
-# Generated by: Microsoft Corporation
-#
-# Generated on: 5/23/2012
-#
-
-@{
-
-# Version number of this module.
-ModuleVersion = '0.8.8'
-
-# ID used to uniquely identify this module
-GUID = '6F8303B1-9298-4E15-AE38-C923C665237A'
-
-# Author of this module
-Author = 'Microsoft Corporation'
-
-# Company or vendor of this module
-CompanyName = 'Microsoft Corporation'
-
-# Copyright statement for this module
-Copyright = '?Microsoft Corporation. All rights reserved.'
-
-# Description of the functionality provided by this module
-Description = ''
-
-# Minimum version of the Windows PowerShell engine required by this module
-PowerShellVersion = '3.0'
-
-# Name of the Windows PowerShell host required by this module
-PowerShellHostName = ''
-
-# Minimum version of the Windows PowerShell host required by this module
-PowerShellHostVersion = ''
-
-# Minimum version of the .NET Framework required by this module
-DotNetFrameworkVersion = '4.0'
-
-# Minimum version of the common language runtime (CLR) required by this module
-CLRVersion='4.0'
-
-# Processor architecture (None, X86, Amd64, IA64) required by this module
-ProcessorArchitecture = 'None'
-
-# Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @()
-
-# Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = @()
-
-# Script files (.ps1) that are run in the caller's environment prior to importing this module
-ScriptsToProcess = @()
-
-# Type files (.ps1xml) to be loaded when importing this module
-TypesToProcess = @()
-
-# Format files (.ps1xml) to be loaded when importing this module
-FormatsToProcess = @()
-
-# Modules to import as nested modules of the module specified in ModuleToProcess
-NestedModules = '..\..\..\Package\Debug\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll'
-
-# Functions to export from this module
-FunctionsToExport = '*'
-
-# Cmdlets to export from this module
-CmdletsToExport = '*'
-
-# Variables to export from this module
-VariablesToExport = '*'
-
-# Aliases to export from this module
-AliasesToExport = @()
-
-# List of all modules packaged with this module
-ModuleList = @()
-
-# List of all files packaged with this module
-FileList = @()
-
-# Private data to pass to the module specified in ModuleToProcess
-PrivateData = ''
-
-}
diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
index 365d91e90e61..e237da08726b 100644
--- a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
+++ b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Compute\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Compute\
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Compute
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Compute
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
index f29042ee0d5c..f68cf04aaed5 100644
--- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
+++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\DataFactories
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.DataFactories
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\DataFactories
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.DataFactories
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj
index a61fbfac5132..611f45790083 100644
--- a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj
+++ b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Dns
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Dns
DEBUG;TRACE
prompt
4
@@ -35,7 +35,7 @@
true
MSSharedLibKey.snk
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Dns\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Dns\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
index 97b2eba84866..43c0c4c72460 100644
--- a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
+++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
@@ -18,16 +18,16 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\HDInsight\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.HDInsight\
DEBUG;TRACE
prompt
4
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\HDInsight\Microsoft.Azure.Commands.HDInsight.xml
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Commands.HDInsight.xml
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\HDInsight\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.HDInsight\
TRACE
prompt
4
diff --git a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
index 6d8080e7aebd..86de0d3e3344 100644
--- a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
+++ b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Insights\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Insights\
DEBUG;TRACE
prompt
4
@@ -31,7 +31,7 @@
AnyCPU
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Insights\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Insights\
TRACE
prompt
4
diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
index 65cc16220757..72c9d836b4e5 100644
--- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
+++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\KeyVault
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.KeyVault
DEBUG;TRACE
prompt
4
@@ -30,7 +30,7 @@
true
MSSharedLibKey.snk
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\KeyVault
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.KeyVault
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
index e21cff0e4b2b..e7038fee374f 100644
--- a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
+++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Network\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Network\
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Network\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Network\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj
index 02c9e1e4f032..68d49a8341c9 100644
--- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj
+++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\OperationalInsights
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\OperationalInsights
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.OperationalInsights
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
index 432a685589c6..6d5ef77e9e5e 100644
--- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
+++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\RedisCache
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.RedisCache
TRACE;DEBUG;CODE_ANALYSIS
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\RedisCache
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.RedisCache
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj
index 15846f735b2c..0c38b6bcba2a 100644
--- a/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj
+++ b/src/ResourceManager/ResourceManager/Commands.ResourceManager/Cmdlets/Commands.ResourceManager.Cmdlets.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\ResourceManager
+ ..\..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.ResourceManager
DEBUG;TRACE
prompt
4
@@ -30,7 +30,7 @@
true
MSSharedLibKey.snk
true
- ..\..\..\..\Package\Release\ResourceManager\AzureResourceManager\ResourceManager
+ ..\..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.ResourceManager
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
index b0d98fe4a1a0..b55435dd5ada 100644
--- a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
+++ b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -1,5 +1,5 @@
#
-# Module manifest for module 'Microsoft.Azure.Commands.Resources'
+# Module manifest for module 'Azure Resource Manager'
#
# Generated by: Microsoft Corporation
#
@@ -24,7 +24,7 @@ CompanyName = 'Microsoft Corporation'
Copyright = '� Microsoft Corporation. All rights reserved.'
# Description of the functionality provided by this module
-Description = ''
+Description = 'Azure Resource Manager'
# Minimum version of the Windows PowerShell engine required by this module
PowerShellVersion = '3.0'
@@ -55,59 +55,59 @@ ScriptsToProcess = @()
# Type files (.ps1xml) to be loaded when importing this module
TypesToProcess = @(
- '.\Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml',
- '.\Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml'
+ '.\AzureRM.Compute\Microsoft.Azure.Commands.Compute.Types.ps1xml',
+ '.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.Types.ps1xml'
)
# Format files (.ps1xml) to be loaded when importing this module
FormatsToProcess = @(
- '.\Resources\Microsoft.Azure.Commands.Resources.format.ps1xml',
- '.\Tags\Microsoft.Azure.Commands.Tags.format.ps1xml',
- '.\Resources\Microsoft.Azure.Commands.Profile.format.ps1xml',
- '.\DataFactories\Microsoft.Azure.Commands.DataFactories.format.ps1xml',
- '.\RedisCache\Microsoft.Azure.Commands.RedisCache.format.ps1xml',
- '.\AzureBatch\Microsoft.Azure.Commands.Batch.format.ps1xml',
- '.\KeyVault\Microsoft.Azure.Commands.KeyVault.format.ps1xml',
- '.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml',
- '.\Compute\Microsoft.Azure.Commands.Compute.format.ps1xml',
- '.\Compute\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
- '.\Network\Microsoft.Azure.Commands.Network.format.ps1xml',
+ '.\AzureRM.Resources\Microsoft.Azure.Commands.Resources.format.ps1xml',
+ '.\AzureRM.Tags\Microsoft.Azure.Commands.Tags.format.ps1xml',
+ '.\AzureRM.Profile\Microsoft.Azure.Commands.Profile.format.ps1xml',
+ '.\AzureRM.DataFactories\Microsoft.Azure.Commands.DataFactories.format.ps1xml',
+ '.\AzureRM.RedisCache\Microsoft.Azure.Commands.RedisCache.format.ps1xml',
+ '.\AzureRM.AzureBatch\Microsoft.Azure.Commands.Batch.format.ps1xml',
+ '.\AzureRM.KeyVault\Microsoft.Azure.Commands.KeyVault.format.ps1xml',
+ '.\AzureRM.StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml',
+ '.\AzureRM.Compute\Microsoft.Azure.Commands.Compute.format.ps1xml',
+ '.\AzureRM.Compute\Microsoft.Azure.Commands.Compute.format.generated.ps1xml',
+ '.\AzureRM.Network\Microsoft.Azure.Commands.Network.format.ps1xml',
'.\Storage\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml',
- '.\StorageManagement\Microsoft.Azure.Commands.Management.Storage.format.ps1xml',
- '.\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml',
- '.\AzureBackup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml',
- '.\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
- '.\Sql\Microsoft.Azure.Commands.Sql.format.ps1xml'
+ '.\AzureRM.StorageManagement\Microsoft.Azure.Commands.Management.Storage.format.ps1xml',
+ '.\AzureRM.OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.format.ps1xml',
+ '.\AzureRM.AzureBackup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml',
+ '.\AzureRM.UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
+ '.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.format.ps1xml'
)
# Modules to import as nested modules of the module specified in ModuleToProcess
NestedModules = @(
- '.\Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll',
- '.\Resources\Microsoft.Azure.Commands.Resources.dll',
- '.\Resources\Microsoft.Azure.Commands.Profile.dll',
- '.\Tags\Microsoft.Azure.Commands.Tags.dll',
- '.\Sql\Microsoft.Azure.Commands.Sql.dll',
- '.\DataFactories\Microsoft.Azure.Commands.DataFactories.dll',
- '.\RedisCache\Microsoft.Azure.Commands.RedisCache.dll',
- '.\AzureBatch\Microsoft.Azure.Commands.Batch.dll',
- '.\Dns\Microsoft.Azure.Commands.Dns.dll',
- '.\KeyVault\Microsoft.Azure.Commands.KeyVault.dll',
- '.\TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll',
- '.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll',
- '.\Insights\Microsoft.Azure.Commands.Insights.dll',
- '.\Websites\Microsoft.Azure.Commands.Websites.dll',
- '.\Compute\Microsoft.Azure.Commands.Compute.dll',
- '.\Network\Microsoft.Azure.Commands.Network.dll',
+ '.\AzureRM.Automation\Microsoft.Azure.Commands.ResourceManager.Automation.dll',
+ '.\AzureRM.Resources\Microsoft.Azure.Commands.Resources.dll',
+ '.\AzureRM.Profile\Microsoft.Azure.Commands.Profile.dll',
+ '.\AzureRM.Tags\Microsoft.Azure.Commands.Tags.dll',
+ '.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.dll',
+ '.\AzureRM.DataFactories\Microsoft.Azure.Commands.DataFactories.dll',
+ '.\AzureRM.RedisCache\Microsoft.Azure.Commands.RedisCache.dll',
+ '.\AzureRM.AzureBatch\Microsoft.Azure.Commands.Batch.dll',
+ '.\AzureRM.Dns\Microsoft.Azure.Commands.Dns.dll',
+ '.\AzureRM.KeyVault\Microsoft.Azure.Commands.KeyVault.dll',
+ '.\AzureRM.TrafficManager\Microsoft.Azure.Commands.TrafficManager.dll',
+ '.\AzureRM.StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll',
+ '.\AzureRM.Insights\Microsoft.Azure.Commands.Insights.dll',
+ '.\AzureRM.Websites\Microsoft.Azure.Commands.Websites.dll',
+ '.\AzureRM.Compute\Microsoft.Azure.Commands.Compute.dll',
+ '.\AzureRM.Network\Microsoft.Azure.Commands.Network.dll',
'.\Storage\Microsoft.WindowsAzure.Commands.Storage.dll',
- '.\ResourceManager\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll',
- '.\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll',
- '.\StorageManagement\Microsoft.Azure.Commands.Management.Storage.dll',
- '.\OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll',
- '.\UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll',
- '.\HDInsight\Microsoft.Azure.Commands.HDInsight.dll',
- '.\ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll',
- '.\AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll',
- '.\SiteRecovery\Microsoft.Azure.Commands.SiteRecovery.dll'
+ '.\AzureRM.ResourceManager\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll',
+ '.\AzureRM.ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll',
+ '.\AzureRM.StorageManagement\Microsoft.Azure.Commands.Management.Storage.dll',
+ '.\AzureRM.OperationalInsights\Microsoft.Azure.Commands.OperationalInsights.dll',
+ '.\AzureRM.UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.dll',
+ '.\AzureRM.HDInsight\Microsoft.Azure.Commands.HDInsight.dll',
+ '.\AzureRM.ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll',
+ '.\AzureRM.AzureBackup\Microsoft.Azure.Commands.AzureBackup.dll',
+ '.\AzureRM.SiteRecovery\Microsoft.Azure.Commands.SiteRecovery.dll'
)
# Functions to export from this module
diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
index bcb3f221e85c..4307b061467c 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
+++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Resources
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Resources
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Resources
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Resources
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj
index 76abe55c60cb..f9c93836a4e6 100644
--- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj
+++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj
@@ -18,7 +18,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\SiteRecovery\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\
DEBUG;TRACE
prompt
4
@@ -26,7 +26,7 @@
pdbonly
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\SiteRecovery\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.SiteRecovery\
TRACE
prompt
4
diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj
index 060373571393..dfb5b19b2f07 100644
--- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj
+++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Sql
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Sql
DEBUG;TRACE
prompt
4
@@ -35,7 +35,7 @@
true
MSSharedLibKey.snk
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Sql\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Sql\
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj
index 5ec14c3c0ed5..7f4c6d6f834b 100644
--- a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj
+++ b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StorageManagement\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.StorageManagement\
DEBUG;TRACE
prompt
4
@@ -31,7 +31,7 @@
pdbonly
TRACE;SIGN
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\StorageManagement\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.StorageManagement\
TRACE
bin\Release\Microsoft.Azure.Commands.Management.Storage.dll.CodeAnalysisLog.xml
true
diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj
index 6c0e1ca7313b..ffbf6f1c83d3 100644
--- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj
+++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\StreamAnalytics
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\StreamAnalytics
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.StreamAnalytics
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj
index c2ae79a8d9ea..67d056f9c197 100644
--- a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj
+++ b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Tags
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Tags
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Tags
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Tags
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj
index aa024806ffa7..1af513770e6e 100644
--- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj
+++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj
@@ -61,7 +61,7 @@
False
- ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\TrafficManager\Microsoft.Azure.Management.TrafficManager.dll
+ ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.TrafficManager\Microsoft.Azure.Management.TrafficManager.dll
False
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj
index 7032b495d998..176fa213f0d4 100644
--- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj
+++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager2.csproj
@@ -21,7 +21,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\TrafficManager
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.TrafficManager
DEBUG;TRACE
prompt
4
@@ -33,7 +33,7 @@
OnBuildSuccess
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\TrafficManager
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.TrafficManager
TRACE;SIGN
true
pdbonly
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1 b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj
similarity index 98%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj
index 4ab5b31f2b33..f6625849737c 100644
--- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj
+++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj
@@ -19,7 +19,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\UsageAggregates
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates
DEBUG;TRACE
prompt
4
@@ -28,7 +28,7 @@
pdbonly
TRACE;SIGN
true
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\UsageAggregates
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.UsageAggregates
AnyCPU
true
true
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/GetUsageAggregatesCommand.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/GetUsageAggregatesCommand.cs
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/GetUsageAggregatesCommand.cs
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/GetUsageAggregatesCommand.cs
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/MSSharedLibKey.snk
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/MSSharedLibKey.snk
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Properties/AssemblyInfo.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/Properties/AssemblyInfo.cs
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Properties/AssemblyInfo.cs
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/TestTheCmdLet.ps1 b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/TestTheCmdLet.ps1
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/TestTheCmdLet.ps1
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/TestTheCmdLet.ps1
diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config
similarity index 100%
rename from src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config
rename to src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config
diff --git a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
index 329f1aa7f485..2edf481b39d4 100644
--- a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
+++ b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
@@ -20,7 +20,7 @@
true
full
false
- ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\Websites\
+ ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Websites\
DEBUG;TRACE
prompt
4
@@ -29,7 +29,7 @@
false
- ..\..\..\Package\Release\ResourceManager\AzureResourceManager\Websites\
+ ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Websites\
TRACE;SIGN
true
pdbonly