Merge pull request #196 from huangpf/vmss

HPF PR: vmss <- huangpf:vmss

Author: huangpf

setup/azurecmdfiles.wxi

@@ -628,9 +628,6 @@
                         <Component Id="cmp6DFF88AE7B93A36864378B172E784B10" Guid="*">
                             <File Id="fil491EBBF8EFB09C41405B26397B25EF2A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Network.format.ps1xml" />
                         </Component>
-                        <Component Id="cmpAD547DC8279220E2C90D9B84B60D9102" Guid="*">
-                            <File Id="fil46D231EE6F8D8F5EDB3FEEE8FE15D9AF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Profile.dll" />
-                        </Component>
                         <Component Id="cmp1302E5B238ABE9F3066E986C7868FC11" Guid="*">
                             <File Id="filCFC5F85E3755A146557FE7CF67E2B594" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Compute\Microsoft.Azure.Commands.Profile.dll-Help.xml" />
                         </Component>
@@ -883,6 +880,9 @@
                         <Component Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" Guid="*">
                             <File Id="filEC64A002E6CBA598F7148F816DB05F11" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll" />
                         </Component>
+                        <Component Id="cmp48F19935A02383063E0B360AA999603C" Guid="*">
+                            <File Id="fil49E99655A03D6452E383DFA326B88D9C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll-help.psd1" />
+                        </Component>
                         <Component Id="cmp96C621A371FF4A410548AAB167869D94" Guid="*">
                             <File Id="filC7912B6B895CF7DF00A7C7F821AE40BF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.dll-help.xml" />
                         </Component>
@@ -963,6 +963,9 @@
                         <Component Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" Guid="*">
                             <File Id="filECB31473DDB8F3F534163169ABBEC69D" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll" />
                         </Component>
+                        <Component Id="cmp94C1745555268B9A864EE489A357D45E" Guid="*">
+                            <File Id="fil6EB35A8BD5FD7462E0D84E4E546009F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll-help.psd1" />
+                        </Component>
                         <Component Id="cmp23342B840C2625BED919B4FA66BA0BA6" Guid="*">
                             <File Id="filB052F432D77A8BCDFF1ADC6CF9AEFFD1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStore.dll-help.xml" />
                         </Component>
@@ -5183,7 +5186,6 @@
             <ComponentRef Id="cmp8D5568ABA06D6A2BC2F3649BFF7A8017" />
             <ComponentRef Id="cmp038C04BC57D5706B5BE749340101FF2B" />
             <ComponentRef Id="cmp6DFF88AE7B93A36864378B172E784B10" />
-            <ComponentRef Id="cmpAD547DC8279220E2C90D9B84B60D9102" />
             <ComponentRef Id="cmp1302E5B238ABE9F3066E986C7868FC11" />
             <ComponentRef Id="cmp910A351D2ED5E37A946579FF389B2845" />
             <ComponentRef Id="cmp416FE1126290180FF714F6090D762C32" />
@@ -5266,6 +5268,7 @@
             <ComponentRef Id="cmp2FEEAA23FF0F261C6E47AB598DBBF8A6" />
             <ComponentRef Id="cmp2724FFAE2E4148D8281FED1A2B986135" />
             <ComponentRef Id="cmp5835D87A5A94F44EAAAE61BCA33C1D80" />
+            <ComponentRef Id="cmp48F19935A02383063E0B360AA999603C" />
             <ComponentRef Id="cmp96C621A371FF4A410548AAB167869D94" />
             <ComponentRef Id="cmpBFBF6E4B62912618B79304EFC6838BAB" />
             <ComponentRef Id="cmpF9A737C5D10D7520DABFD5A7B1CA19AF" />
@@ -5292,6 +5295,7 @@
             <ComponentRef Id="cmpFA06C9BD3FF76E0DAA7ACE5C9435F394" />
             <ComponentRef Id="cmp198EEB211792E85743513C6C91F89DE2" />
             <ComponentRef Id="cmp5014A98086549EE22F2F2DF9C7C1B1F2" />
+            <ComponentRef Id="cmp94C1745555268B9A864EE489A357D45E" />
             <ComponentRef Id="cmp23342B840C2625BED919B4FA66BA0BA6" />
             <ComponentRef Id="cmp001FEDC74DD7D918EFE88F2EB8E4285C" />
             <ComponentRef Id="cmpBE1007C3B5920359FED93D232612FA3D" />

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineScaleSetTests.cs

@@ -25,5 +25,12 @@ public void TestVirtualMachineScaleSet()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSet");
         }
+
+        [Fact(Skip="TODO: Record")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestVirtualMachineScaleSetReimageUpdate()
+        {
+            ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineScaleSetReimageUpdate");
+        }
     }
 }