Merge pull request #3171 from bganapa/dev-tp2refresh1

TP2 refesh 1 changes

Author: shahabhijeet

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <?define productName="Microsoft Azure PowerShell for Azure Stack TP2 - September 2016" ?>
+  <?define productName="Microsoft Azure PowerShell for Azure Stack TP2 Update 1 - November 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.2.6" ?>
+  <?define version="1.2.7" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmdfiles.wxi

@@ -320,9 +320,18 @@
                         <Component Id="cmpFDFB38E21048DD505BCAD31F5136992E" Guid="*">
                             <File Id="fil725BD220D8CBA56756A4178EC0DF3BD1" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.Azure.Common.dll" />
                         </Component>
+                        <Component Id="cmpC2439F65706917CA4AABD3AF6AFB856A" Guid="*">
+                            <File Id="filB30A22185C3B74D7BF42213FB3287E98" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.Azure.Common.NetFramework.dll" />
+                        </Component>
                         <Component Id="cmp048B605B1072F4A5467F2AFFD8ED2459" Guid="*">
                             <File Id="fil38FE506241BEC2CA3B34645613B821F3" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll" />
                         </Component>
+                        <Component Id="cmpB2F2FF5F057BDE656891B43C18ADF020" Guid="*">
+                            <File Id="fil952FAF0371C7CCC373DBDF330DB18A87" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.psd1" />
+                        </Component>
+                        <Component Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" Guid="*">
+                            <File Id="filE0954BDD89FA012B32E270ADA2F66DD8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Commands.dll-help.xml" />
+                        </Component>
                         <Component Id="cmpA2F17B479BD0FE1A81AED68A6C03B7A0" Guid="*">
                             <File Id="fil80D875AB0DAA2F1FDA208FBF372BDD50" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.AzureStackAdmin\Microsoft.AzureStack.Management.dll" />
                         </Component>
@@ -5053,7 +5062,10 @@
             <ComponentRef Id="cmp341162180BF390CE2A96709D6793E79A" />
             <ComponentRef Id="cmpD0EF8A0F8719C6D155CF9683A6832BD9" />
             <ComponentRef Id="cmpFDFB38E21048DD505BCAD31F5136992E" />
+            <ComponentRef Id="cmpC2439F65706917CA4AABD3AF6AFB856A" />
             <ComponentRef Id="cmp048B605B1072F4A5467F2AFFD8ED2459" />
+            <ComponentRef Id="cmpB2F2FF5F057BDE656891B43C18ADF020" />
+            <ComponentRef Id="cmp889E4CFA9046EFFEFF5D63CB61E990A6" />
             <ComponentRef Id="cmpA2F17B479BD0FE1A81AED68A6C03B7A0" />
             <ComponentRef Id="cmp4E983C9ECBC2D4A29376A70418BE5E2B" />
             <ComponentRef Id="cmpD7DAB84173CC8537AFCD22E7B68C4B3D" />

src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

@@ -9,7 +9,8 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.11'
+
+ModuleVersion = '0.10.2'
 
 # ID used to uniquely identify this module
 GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/AzureStackTests.cs

@@ -39,6 +39,7 @@ public void TestPlan()
         }
 
         [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestOffer()
         {
             AzStackTestRunner.NewInstance.RunPsTest("Test-Offer");

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/Commands.AzureStackAdmin.Test.Common.csproj

@@ -73,7 +73,7 @@
       <HintPath>..\..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AzureStack.Management">
-      <HintPath>..\..\..\..\packages\Microsoft.AzureStack.Management.0.9.6-preview\lib\net45\Microsoft.AzureStack.Management.dll</HintPath>
+      <HintPath>..\..\..\..\packages\Microsoft.AzureStack.Management.0.10.1-preview\lib\net45\Microsoft.AzureStack.Management.dll</HintPath>
     </Reference>
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\..\packages\Hyak.Common.1.0.3\lib\net40\Hyak.Common.dll</HintPath>

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Common/packages.config

@@ -6,7 +6,7 @@
   <package id="Microsoft.Azure.Management.Resources" version="2.18.14-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.6068.31305-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.6025.18429-prerelease" targetFramework="net45" />
-  <package id="Microsoft.AzureStack.Management" version="0.9.6-preview" targetFramework="net45" />
+  <package id="Microsoft.AzureStack.Management" version="0.10.1-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin/Commands.AzureStackAdmin.csproj

@@ -73,18 +73,18 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.AzureStack.Management">
-      <HintPath>..\..\..\packages\Microsoft.AzureStack.Management.0.9.6-preview\lib\net45\Microsoft.AzureStack.Management.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.AzureStack.Management.0.10.1-preview\lib\net45\Microsoft.AzureStack.Management.dll</HintPath>
     </Reference>
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\net40\Hyak.Common.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
-    </Reference>    
+    </Reference>
     <Reference Include="Microsoft.Azure.Common.NetFramework, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
-    </Reference>  
+      <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.1.8.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
@@ -131,7 +131,9 @@
       <Link>AzureRM.AzureStackAdmin.psd1</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Microsoft.AzureStack.Commands.dll-help.psd1" />
+    <None Include="Microsoft.AzureStack.Commands.dll-help.psd1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Compile Include="CommonPSConst.cs" />
     <Compile Include="Microsoft.Subscriptions\ManagedLocations\GetManagedLocation.cs" />
     <Compile Include="Microsoft.Subscriptions\ManagedLocations\NewManagedLocation.cs" />
@@ -185,7 +187,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Microsoft.AzureStack.Commands.dll-help.xml" />
+    <Content Include="Microsoft.AzureStack.Commands.dll-help.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Token\readme.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin/Microsoft.AzureStack.Commands.dll-help.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.2'
+ModuleVersion = '0.10.2'
 
 # ID used to uniquely identify this module
 GUID = 'F237EAAA-BD3A-4965-AD4A-BF38598BFEF7'
@@ -24,7 +24,7 @@ CompanyName = 'Microsoft Corporation'
 Copyright = 'Microsoft Corporation. All rights reserved.'  
 
 # Description of the functionality provided by this module
-Description = ''
+Description = 'Azure Stack Administrative module, included commands for operations on Plans, Offers, Subscriptions, Gallery Items, Resource Provider Registration and Usage Connection'
 
 # Minimum version of the Windows PowerShell engine required by this module
 PowerShellVersion = '3.0'