Merge pull request Azure#3880 from Panda-Wang/preview

Resubmit for New version of cmdlets for AzureRM.Billing and AzureRM.C…
lilinvictorms · May 2, 2017 · 7542d78 · 7542d78
2 parents b4b6ba0 + bc08f48
commit 7542d78
Show file tree

Hide file tree

Showing 70 changed files with 4,068 additions and 322 deletions.
diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets
@@ -77,6 +77,7 @@
 			<XUnitTests Include=".\src\ResourceManager\CognitiveServices\CognitiveServices.Test\bin\Debug\Microsoft.Azure.Commands.Management.CognitiveServices.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\ContainerRegistry\Commands.ContainerRegistry.Test\bin\Debug\Microsoft.Azure.Commands.ContainerRegistry.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
+			<XUnitTests Include=".\src\ResourceManager\Consumption\Commands.Consumption.Test\bin\Debug\Microsoft.Azure.Commands.Consumption.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataLakeAnalytics\Commands.DataLakeAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.DataLakeAnalytics.Test.dll"/>
 			<XUnitTests Include=".\src\ResourceManager\DataLakeStore\Commands.DataLakeStore.Test\bin\Debug\Microsoft.Azure.Commands.DataLake.Test.dll"/>

diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
@@ -2,6 +2,12 @@
 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
         <DirectoryRef Id="PowerShellFolder">
+            <Component Id="cmp7644830B39E03269093EB0A018EAEA56" Guid="*">
+                <File Id="filA689C596FD6AEDE8B73DA7689B7B648A" KeyPath="yes" Source="$(var.sourceDir)\groupMapping.json" />
+            </Component>
+            <Component Id="cmp71EF63E6562FCAAE6D951C41F608AA1A" Guid="*">
+                <File Id="fil0A6EB11F5E2D319D5EE18C60D0AB2BE1" KeyPath="yes" Source="$(var.sourceDir)\groupMappingWarnings.json" />
+            </Component>
             <Component Id="cmpDC507D3B034FD0F9887EC67302B6F5A0" Guid="*">
                 <File Id="filBF2E03D229851ADE6748EBFCE4288A27" KeyPath="yes" Source="$(var.sourceDir)\PowerShellSetup.Test.dll" />
             </Component>
@@ -459,6 +465,9 @@
                         <Component Id="cmpBB6FF1BC401C60D7455037617C7B5623" Guid="*">
                             <File Id="fil0935B5CED10B5F800BE3B7665CECD715" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Billing\Microsoft.Azure.Commands.Billing.dll-Help.xml" />
                         </Component>
+                        <Component Id="cmpED26EE081CBB4F4C2EE847CE1EB95A6D" Guid="*">
+                            <File Id="filE1C7D04BC99FF86D6DE04107789A5564" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Billing\Microsoft.Azure.Commands.Billing.Format.ps1xml" />
+                        </Component>
                         <Component Id="cmp6BDCB170E1F314882CF58F8F80DE76A6" Guid="*">
                             <File Id="filBFDE1699047559AB8DA89E0F660D35DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Billing\Microsoft.Azure.Commands.Common.Authentication.dll" />
                         </Component>
@@ -846,6 +855,71 @@
                             </Component>
                         </Directory>
                     </Directory>
+                    <Directory Id="dir192D7B7AF9ADB35B16F2F7201CDE2374" Name="AzureRM.Consumption">
+                        <Component Id="cmp6C8331719E08C6FBCEB6CC712233BBF4" Guid="*">
+                            <File Id="fil6A85430C4516A17B68FED02667140178" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\AzureRM.Consumption.psd1" />
+                        </Component>
+                        <Component Id="cmp252AF831901B42D15AC8505856E684E5" Guid="*">
+                            <File Id="fil2D678F543408D9B0D327A9448ECB6878" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Hyak.Common.dll" />
+                        </Component>
+                        <Component Id="cmpB1132CF56722B5764689D86A5917B81B" Guid="*">
+                            <File Id="fil3A732E38CA890EF381850C9836124B34" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.ApplicationInsights.dll" />
+                        </Component>
+                        <Component Id="cmp1EB512296F82E0EE939AB37E35C5EC9F" Guid="*">
+                            <File Id="fil3D7F9008C258E7450C6CF51C137E9895" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Commands.Common.Authentication.dll" />
+                        </Component>
+                        <Component Id="cmpDD85BA0CB5BD478001F59A13DEA2E8B7" Guid="*">
+                            <File Id="fil64A4ADE3566E9B73DAAC6795F119261E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Commands.Consumption.dll" />
+                        </Component>
+                        <Component Id="cmp0E08518AB0FA4A764307C6033523F2E7" Guid="*">
+                            <File Id="fil260CEB875C6400C3F2DEA41C88ED03B5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Commands.Consumption.dll-Help.xml" />
+                        </Component>
+                        <Component Id="cmpC318704FA0ABF8BCF59C9DB1225B481E" Guid="*">
+                            <File Id="fil3379E4B1C2E437937A7CF7CDBEFA901F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Commands.Consumption.Format.ps1xml" />
+                        </Component>
+                        <Component Id="cmp5C8AF4B77427F161963C8C2C03FF1D8D" Guid="*">
+                            <File Id="fil7F312375FC35B8DEB60E795CB57B7C0B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Commands.ResourceManager.Common.dll" />
+                        </Component>
+                        <Component Id="cmpA98F3C8D88D6421C585C60D3B2C55371" Guid="*">
+                            <File Id="fil73B6EBD28F1C962D2CEF4E38BB4243CF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Common.dll" />
+                        </Component>
+                        <Component Id="cmpB7C4CEA183C2C83A2C564CD7BB0DFD5D" Guid="*">
+                            <File Id="fil8547AE26C7B42AF878432AAF246F2987" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Common.NetFramework.dll" />
+                        </Component>
+                        <Component Id="cmp1DD0CB8F0D3850F5B5623D9C7D751E31" Guid="*">
+                            <File Id="fil65BF92AEAAB52B6FC69E1D44E9892A8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.Management.Consumption.dll" />
+                        </Component>
+                        <Component Id="cmp57C972067D421BEDDD1BE53C33320FD0" Guid="*">
+                            <File Id="fil00FDF65C7DFAFE02A59760FCDB12F702" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Azure.ResourceManager.dll" />
+                        </Component>
+                        <Component Id="cmp245B86BD45A54E11807E721DDDA4BDB8" Guid="*">
+                            <File Id="fil59B8BDD11B14AFF855C8CB87CA874656" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
+                        </Component>
+                        <Component Id="cmpD01BA3FD9E9FEF15B08B50681E646B32" Guid="*">
+                            <File Id="fil961742F414FE80BC53A1F5B482450FCF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
+                        </Component>
+                        <Component Id="cmpC0CFECD2A2B29B6CF442DA9848CDC71B" Guid="*">
+                            <File Id="filFA8A4517634A14FBDF5B936B1AABA599" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Rest.ClientRuntime.Azure.dll" />
+                        </Component>
+                        <Component Id="cmp9171E1BFFFD371486E14ED758DD57D71" Guid="*">
+                            <File Id="filA728847F5533F14FDE77C09735A334E2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Rest.ClientRuntime.dll" />
+                        </Component>
+                        <Component Id="cmp18E360E10FDF6D18F43DA176E69BB359" Guid="*">
+                            <File Id="fil9A5E4BD85B55B52D13E3954E982B4E1E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Threading.Tasks.dll" />
+                        </Component>
+                        <Component Id="cmp1F3422DCFDE2E146E0F6B08BC406B09C" Guid="*">
+                            <File Id="filC9FE0CA8AF9F112C0AB0B3DA41C7C76A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Threading.Tasks.Extensions.Desktop.dll" />
+                        </Component>
+                        <Component Id="cmpF41F05589D4CC29E448A96A8A524E962" Guid="*">
+                            <File Id="filFD0BEB9E7884EFEEA7B359D77F7E0364" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.Threading.Tasks.Extensions.dll" />
+                        </Component>
+                        <Component Id="cmp74D5D09C816B0FBB414056AD6DEA4F36" Guid="*">
+                            <File Id="filA77C1B611E6FE53366057BF23581A929" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Microsoft.WindowsAzure.Commands.Common.dll" />
+                        </Component>
+                        <Component Id="cmp7E5FC780611F3C956F9AB6247B7ED1C5" Guid="*">
+                            <File Id="filD9C121FD716888472718731994D8A272" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Consumption\Newtonsoft.Json.dll" />
+                        </Component>
+                    </Directory>
                     <Directory Id="dir78B1ED8DBB1AADB6D8A971F20091A708" Name="AzureRM.ContainerRegistry">
                         <Component Id="cmp70A64104F3BC8D22E626DD19299FC6D6" Guid="*">
                             <File Id="filD282EDCE8F330B66F678059D8DAF1650" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.ContainerRegistry\AzureRM.ContainerRegistry.psd1" />
@@ -5774,6 +5848,8 @@
     </Fragment>
     <Fragment>
         <ComponentGroup Id="azurecmdfiles">
+            <ComponentRef Id="cmp7644830B39E03269093EB0A018EAEA56" />
+            <ComponentRef Id="cmp71EF63E6562FCAAE6D951C41F608AA1A" />
             <ComponentRef Id="cmpDC507D3B034FD0F9887EC67302B6F5A0" />
             <ComponentRef Id="cmpE1934F4197E90691F3F4FD7D0D17559F" />
             <ComponentRef Id="cmpF0D8E7A18EC397D4F297FB010BB719FF" />
@@ -5922,6 +5998,7 @@
             <ComponentRef Id="cmp542D91E9EF48E0757E6A37EFC06D1B49" />
             <ComponentRef Id="cmp90AAD895620F85A0D5DAF01332F0B080" />
             <ComponentRef Id="cmpBB6FF1BC401C60D7455037617C7B5623" />
+            <ComponentRef Id="cmpED26EE081CBB4F4C2EE847CE1EB95A6D" />
             <ComponentRef Id="cmp6BDCB170E1F314882CF58F8F80DE76A6" />
             <ComponentRef Id="cmp772BF01AB0847CA5A8478AE2E41D4682" />
             <ComponentRef Id="cmp935995BD55CE27A59AEBA59098FB9D7A" />
@@ -6048,6 +6125,27 @@
             <ComponentRef Id="cmp22C16EA85B773C14B7E6439621F10355" />
             <ComponentRef Id="cmp8BCA174B740D6FE9FE610DDF340C002E" />
             <ComponentRef Id="cmp7E161D88C2C114CB3885FA17B24DF61C" />
+            <ComponentRef Id="cmp6C8331719E08C6FBCEB6CC712233BBF4" />
+            <ComponentRef Id="cmp252AF831901B42D15AC8505856E684E5" />
+            <ComponentRef Id="cmpB1132CF56722B5764689D86A5917B81B" />
+            <ComponentRef Id="cmp1EB512296F82E0EE939AB37E35C5EC9F" />
+            <ComponentRef Id="cmpDD85BA0CB5BD478001F59A13DEA2E8B7" />
+            <ComponentRef Id="cmp0E08518AB0FA4A764307C6033523F2E7" />
+            <ComponentRef Id="cmpC318704FA0ABF8BCF59C9DB1225B481E" />
+            <ComponentRef Id="cmp5C8AF4B77427F161963C8C2C03FF1D8D" />
+            <ComponentRef Id="cmpA98F3C8D88D6421C585C60D3B2C55371" />
+            <ComponentRef Id="cmpB7C4CEA183C2C83A2C564CD7BB0DFD5D" />
+            <ComponentRef Id="cmp1DD0CB8F0D3850F5B5623D9C7D751E31" />
+            <ComponentRef Id="cmp57C972067D421BEDDD1BE53C33320FD0" />
+            <ComponentRef Id="cmp245B86BD45A54E11807E721DDDA4BDB8" />
+            <ComponentRef Id="cmpD01BA3FD9E9FEF15B08B50681E646B32" />
+            <ComponentRef Id="cmpC0CFECD2A2B29B6CF442DA9848CDC71B" />
+            <ComponentRef Id="cmp9171E1BFFFD371486E14ED758DD57D71" />
+            <ComponentRef Id="cmp18E360E10FDF6D18F43DA176E69BB359" />
+            <ComponentRef Id="cmp1F3422DCFDE2E146E0F6B08BC406B09C" />
+            <ComponentRef Id="cmpF41F05589D4CC29E448A96A8A524E962" />
+            <ComponentRef Id="cmp74D5D09C816B0FBB414056AD6DEA4F36" />
+            <ComponentRef Id="cmp7E5FC780611F3C956F9AB6247B7ED1C5" />
             <ComponentRef Id="cmp70A64104F3BC8D22E626DD19299FC6D6" />
             <ComponentRef Id="cmp557D6FF644755BCB1B0DFE0484A5D177" />
             <ComponentRef Id="cmpE24EA5505355B2DD7B4DAA3C48E826A5" />

diff --git a/src/ResourceManager/Billing/AzureRM.Billing.psd1 b/src/ResourceManager/Billing/AzureRM.Billing.psd1
@@ -63,7 +63,7 @@ RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '2.8.0'; }
 # TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
-# FormatsToProcess = @()
+FormatsToProcess = '.\Microsoft.Azure.Commands.Billing.Format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
 NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll')
@@ -72,7 +72,8 @@ NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmBillingInvoice'
+CmdletsToExport = 'Get-AzureRmBillingInvoice',
+				'Get-AzureRmBillingPeriod'
 
 # Variables to export from this module
 # VariablesToExport = @()

diff --git a/src/ResourceManager/Billing/ChangeLog.md b/src/ResourceManager/Billing/ChangeLog.md
@@ -18,6 +18,11 @@
         - Additional information about change #1
 -->
 ## Current Release
+* New Cmdlet Get-AzureRmBillingPeriod
+    - cmdlet to retrieve azure billing periods of the subscription.
+* Update Cmdlet Get-AzureRmBillingInvoice
+	- new property BillingPeriodNames
+	- output in list view
 
 ## Version 0.11.0
 

diff --git a/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.csproj b/src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.csproj
@@ -62,9 +62,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Billing, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Billing.1.0.0-preview\lib\net45\Microsoft.Azure.Management.Billing.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="Microsoft.Azure.Management.Billing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Billing.2.0.0-preview\lib\net452\Microsoft.Azure.Management.Billing.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -86,8 +85,7 @@
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
-      <Private>True</Private>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.6\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.5\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
@@ -112,6 +110,9 @@
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -137,18 +138,37 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScenarioTests\BillingPeriodsTests.cs" />
     <Compile Include="ScenarioTests\InvoicesTests.cs" />
     <Compile Include="ScenarioTests\TestController.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />
+    <None Include="ScenarioTests\BillingPeriodsTests.ps1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\InvoicesTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.BillingPeriodsTests\TestGetBillingPeriodWithName.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.BillingPeriodsTests\TestGetBillingPeriodWithNames.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.BillingPeriodsTests\TestListBillingPeriods.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.BillingPeriodsTests\TestListBillingPeriodsWithMaxCount.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.InvoicesTests\TestGetInvoiceWithName.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.InvoicesTests\TestGetInvoiceWithNames.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.InvoicesTests\TestGetLatestInvoice.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>