diff --git a/ChangeLog.txt b/ChangeLog.txt index 8a3c23ddb32e..a72bc2486eaa 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,9 @@ -2015.06.26 version 0.9.4 +2015.07.16 version 0.9.5 +* Azure Resource Manager cmdlets + * Fixed formatting of output for Get-UsageAggregates + * Fixed executing Get-UsageAggregates when first cmdlet being called. + +2015.06.26 version 0.9.4 * Azure Compute cmdlets * Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet. * Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server. diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index c979b6822a16..073674e29a53 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1894,6 +1894,9 @@ + + + @@ -1903,12 +1906,24 @@ + + + + + + + + + + + + @@ -4549,11 +4564,16 @@ + + + + + diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj index 8966843c0896..2c3b1fa4ce77 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj @@ -40,7 +40,7 @@ True - ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll + ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll True diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config b/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config index 10f8d2924c3a..6e3f4d88aed8 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config @@ -1,7 +1,7 @@  - + diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj index 42a120318960..d51226827257 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj @@ -41,7 +41,7 @@ True - ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1-preview\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll + ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll True @@ -52,6 +52,9 @@ ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.27-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True + + ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll True @@ -60,6 +63,15 @@ ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.14.201151115\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll True + + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + ..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll True @@ -86,6 +98,9 @@ + + Always + diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml new file mode 100644 index 000000000000..835a5678e63f --- /dev/null +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml @@ -0,0 +1,60 @@ + + + + + Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregationGetResponse + + Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregationGetResponse + + + + + + + + $_.UsageAggregations | Format-Table | Out-String + + + + + + + + Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregation + + Microsoft.Azure.Commerce.UsageAggregates.Models.UsageAggregation + + + + + + Left + + + + Left + + + + Left + + + + + + + $_.Properties.MeterCategory + + + $_.Properties.MeterName + + + $_.Properties.Quantity.ToString() + ' ' + $_.Properties.Unit + + + + + + + + \ No newline at end of file diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml index d9ced1185768..16236926b65d 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml @@ -150,7 +150,8 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso - + + @@ -162,7 +163,8 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso - + + @@ -180,8 +182,7 @@ For more information, see Azure Billing REST API Reference (https://msdn.microso PS C:\> - PS C:\>Set-AzureSubscription -SubscriptionId $subscription -PS C:\>Get-UsageAggregates -ReportedStartTime "5/2/2015" -ReportedEndTime "5/5/2015" + PS C:\>Get-UsageAggregates -ReportedStartTime "5/2/2015" -ReportedEndTime "5/5/2015" The final command retrieves the usage data for the subscription for the specificed dates of 5/2/2015 and 5/5/2015. diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config b/src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config index f7b7cc743058..a57ac92e1fff 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config @@ -1,7 +1,7 @@  - +