Merge pull request #124 from AzureRT/vmss

Vmss

Author: huangpf

setup-powershellget/Setup/ShortcutStartup.ps1

@@ -17,9 +17,25 @@ Param(
 [switch]$Install
 )
 
+function EnsureRegistryPath
+{
+	$originalpaths = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PSModulePath).PSModulePath
+	if($originalpaths.Contains("$env:ProgramFiles\WindowsPowerShell\Modules") -eq $false)
+	{
+		Write-Output "Fixing PSModulePath"
+		$newPath = "$originalpaths;$env:ProgramFiles\WindowsPowerShell\Modules"
+		Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PSModulePath –Value $newPath
+	}
+	else
+	{
+		Write-Output "PSModulePath successfuly validated"
+	}
+}
+
 $error.clear()
 try {
 	if ($Install.IsPresent) {
+		EnsureRegistryPath
 		Write-Output @"
 
 Finalizing installation of Azure PowerShell. 
@@ -57,4 +73,5 @@ Write-Output "An error occured during installation."
 Write-Output $error 
 Write-Output "Press any key..."
 $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
-}
+}
+

setup/azurecmdfiles.wxi

@@ -2535,9 +2535,6 @@
                         <Component Id="cmp42FE31D214E88600BC5DE868A244BA20" Guid="*">
                             <File Id="filD6668B53C1E9BB018419C62B94B1EDCC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Common.NetFramework.dll" />
                         </Component>
-                        <Component Id="cmpC97A392E1DDFDAA47605D26D01A7C5CE" Guid="*">
-                            <File Id="filF7C94BA91D0D264080EB79D6C9AB6582" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.Management.Compute.dll" />
-                        </Component>
                         <Component Id="cmp9BE4A14F2E050EFD14F849753F4D0C80" Guid="*">
                             <File Id="filF37AF7FAE1E4FAD4D16EDA8BC0CF45D5" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\Compute\Microsoft.Azure.ResourceManager.dll" />
                         </Component>
@@ -5164,7 +5161,6 @@
             <ComponentRef Id="cmp7AAE7BA21799D1BAFA96134E30059981" />
             <ComponentRef Id="cmpBCF3C38FB8142F10977444858EFAF20D" />
             <ComponentRef Id="cmp42FE31D214E88600BC5DE868A244BA20" />
-            <ComponentRef Id="cmpC97A392E1DDFDAA47605D26D01A7C5CE" />
             <ComponentRef Id="cmp9BE4A14F2E050EFD14F849753F4D0C80" />
             <ComponentRef Id="cmpC4B0F527C50AAE1765CBAD30D27B8A40" />
             <ComponentRef Id="cmp137E88F14FE19BC371D0B55830162E31" />

src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj

@@ -150,11 +150,7 @@
     <Compile Include="Autoscale\NewAutoscaleProfileCommandTests.cs" />
     <Compile Include="Autoscale\NewAutoscaleRuleCommandTests.cs" />
     <Compile Include="Autoscale\RemoveAutoscaleSettingCommandTests.cs" />
-    <Compile Include="Events\GetAzureCorrelationIdLogCommandTests.cs" />
-    <Compile Include="Events\GetAzureResourceLogCommandTests.cs" />
-    <Compile Include="Events\GetAzureResourceProviderLogCommandTests.cs" />
-    <Compile Include="Events\GetAzureSubscriptionIdLogCommandTests.cs" />
-    <Compile Include="Events\GetAzureResourceGroupLogCommandTests.cs" />
+    <Compile Include="Events\GetAzureRmLogCommandTests.cs" />
     <Compile Include="Metrics\FormatMetricsAsTableCommandTests.cs" />
     <Compile Include="Metrics\GetMetricDefinitionsCommandTests.cs" />
     <Compile Include="Metrics\GetMetricsCommandTests.cs" />