diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
index c8afbd78f388..87fa34395f64 100644
--- a/setup/azurecmdfiles.wxi
+++ b/setup/azurecmdfiles.wxi
@@ -167,6 +167,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2307,6 +2351,9 @@
+
+
+
@@ -2486,6 +2533,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3173,6 +3234,7 @@
+
diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln
index 6aa7abaea885..1db294af9369 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.30723.0
+VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
ProjectSection(SolutionItems) = preProject
@@ -49,6 +49,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch", "ResourceManager\Batch\Commands.Batch\Commands.Batch.csproj", "{D470E50A-9607-48D6-A924-4F9F86502704}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch.Test", "ResourceManager\Batch\Commands.Batch.Test\Commands.Batch.Test.csproj", "{F4ABAD68-64A5-4B23-B09C-42559A7524DE}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -131,6 +135,14 @@ Global
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D470E50A-9607-48D6-A924-4F9F86502704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D470E50A-9607-48D6-A924-4F9F86502704}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D470E50A-9607-48D6-A924-4F9F86502704}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D470E50A-9607-48D6-A924-4F9F86502704}.Release|Any CPU.Build.0 = Release|Any CPU
+ {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -144,5 +156,6 @@ Global
{080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+ {F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
EndGlobalSection
EndGlobal
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
index 94a9159f6c79..a1c954e9fbae 100644
--- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
+++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
@@ -156,7 +156,6 @@
-
@@ -167,7 +166,8 @@
- powershell.exe -ExecutionPolicy Unrestricted -File $(ProjectDir)\PostBuild.ps1 $(TargetDir)
+
+
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/PostBuild.ps1 b/src/ResourceManager/RedisCache/Commands.RedisCache/PostBuild.ps1
deleted file mode 100644
index 432e76af61ff..000000000000
--- a/src/ResourceManager/RedisCache/Commands.RedisCache/PostBuild.ps1
+++ /dev/null
@@ -1,25 +0,0 @@
-# ----------------------------------------------------------------------------------
-#
-# Copyright Microsoft Corporation
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-# http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ----------------------------------------------------------------------------------
-
-$sourceDir = $args[0]
-Write-Output $sourceDir
-
-$sourcePath = $sourceDir + "AzureResourceManager.psd1"
-$destDir = $(Split-Path $sourceDir)
-
-Write-Output "Copying '$sourcePath' to directory '$destDir'"
-Copy-Item $sourcePath $destDir
-
-Write-Output "Removing $sourcePath"
-Remove-Item $sourcePath -Force
\ No newline at end of file
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
index 18dc5f6fd307..ed3c6b3bf26a 100644
--- a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
+++ b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -64,7 +64,7 @@ FormatsToProcess = @(
'.\DataFactories\Microsoft.Azure.Commands.DataFactories.format.ps1xml',
'.\RedisCache\Microsoft.Azure.Commands.RedisCache.format.ps1xml',
'.\Batch\Microsoft.Azure.Commands.Batch.format.ps1xml',
- '.\KeyVault\Microsoft.Azure.Commands.KeyVault.format.ps1xml'
+ '.\KeyVault\Microsoft.Azure.Commands.KeyVault.format.ps1xml',
'.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.format.ps1xml'
)
@@ -77,8 +77,9 @@ NestedModules = @(
'.\DataFactories\Microsoft.Azure.Commands.DataFactories.dll',
'.\RedisCache\Microsoft.Azure.Commands.RedisCache.dll',
'.\Batch\Microsoft.Azure.Commands.Batch.dll',
- '.\KeyVault\Microsoft.Azure.Commands.KeyVault.dll'
- '.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll'
+ '.\KeyVault\Microsoft.Azure.Commands.KeyVault.dll',
+ '.\StreamAnalytics\Microsoft.Azure.Commands.StreamAnalytics.dll',
+ '.\Insights\Microsoft.Azure.Commands.Insights.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 966bdf67428a..776f229cd9a0 100644
--- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
+++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
@@ -232,14 +232,14 @@
{c60342b1-47d3-4a0e-8081-9b97ce60b7af}
Commands.Profile
-
- {11524d98-6c40-4091-a8e1-86463fee607c}
- Commands.StorSimple
-
{d470e50a-9607-48d6-a924-4f9f86502704}
Commands.Batch
+
+ {dea446a1-84e2-46cc-b780-eb4afde2460e}
+ Commands.Insights
+
{9ffc40cc-a341-4d0c-a25d-dc6b78ef6c94}
Commands.KeyVault