From 74775937f3ecd26b5e49e0e9d9d23c9ba59ff324 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Tue, 30 Jun 2015 15:06:11 -0700 Subject: [PATCH 1/8] initial update --- ...ure.Commands.UsageAggregates.Format.ps1xml | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml 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..23578441867c --- /dev/null +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml @@ -0,0 +1,67 @@ + + + + + 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 + + + + Left + + + + + + + $_.Id + + + $_.Properties.MeterCategory + + + $_.Properties.MeterName + + + $results.UsageAggregations[0].Properties.Quantity.ToString() + ' ' + $results.UsageAggregations[0].Properties.Unit + + + + + + + + \ No newline at end of file From 4040050d5b2f1f277c91daa9c33aee7265b38860 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Tue, 30 Jun 2015 15:39:43 -0700 Subject: [PATCH 2/8] fixed error with quantity --- ...icrosoft.Azure.Commands.UsageAggregates.Format.ps1xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) 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 index 23578441867c..835a5678e63f 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml @@ -26,10 +26,6 @@ - - - Left - Left @@ -46,9 +42,6 @@ - - $_.Id - $_.Properties.MeterCategory @@ -56,7 +49,7 @@ $_.Properties.MeterName - $results.UsageAggregations[0].Properties.Quantity.ToString() + ' ' + $results.UsageAggregations[0].Properties.Unit + $_.Properties.Quantity.ToString() + ' ' + $_.Properties.Unit From 15810154108a01671e0c494b4bb1683e9f1bc6b9 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Tue, 30 Jun 2015 17:29:10 -0700 Subject: [PATCH 3/8] updated help file and deployment for UsageAggregates --- setup/azurecmdfiles.wxi | 4 ++++ .../Commands.UsageAggregates.csproj | 3 +++ ...Microsoft.Azure.Commands.UsageAggregates.dll-help.xml | 9 +++++---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index c979b6822a16..985c8e11fc10 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1894,6 +1894,9 @@ + + + @@ -4549,6 +4552,7 @@ + diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj index 6f3add1125f6..1e5028ac7658 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj @@ -86,6 +86,9 @@ + + Always + 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. From 04e14ea59f8a029cecadb9a4837f5426ea490822 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Tue, 30 Jun 2015 18:13:27 -0700 Subject: [PATCH 4/8] Update the project file to include missing references needed at runtime if the cmdlet is executed without anything previously --- setup/azurecmdfiles.wxi | 16 ++++++++++++++++ .../Commands.UsageAggregates.csproj | 13 ++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 985c8e11fc10..073674e29a53 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1906,12 +1906,24 @@ + + + + + + + + + + + + @@ -4556,8 +4568,12 @@ + + + + diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj index 1e5028ac7658..affcab060b75 100644 --- a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj +++ b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj @@ -50,7 +50,9 @@ ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.0.26-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 @@ -60,6 +62,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 From 8e1fd4d5d21516a0d00ae957b94464a88305d5b3 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Wed, 8 Jul 2015 16:57:43 -0700 Subject: [PATCH 5/8] Added changelog info for usageaggregates changes --- ChangeLog.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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. From a6da68352bd81a74428e2e78e1eb783b446ce99e Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Wed, 8 Jul 2015 17:22:11 -0700 Subject: [PATCH 6/8] removed added line from .gitignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 882cac270099..ac45c755c73f 100644 --- a/.gitignore +++ b/.gitignore @@ -192,4 +192,3 @@ UpgradeLog*.htm # Microsoft Fakes FakesAssemblies/ -src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.Help.pshproj From 3db09a315c8e5e01290f3ab79f8018d87075a206 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Wed, 8 Jul 2015 17:28:10 -0700 Subject: [PATCH 7/8] update packages for UsageAggregates --- setup/azurecmdfiles.wxi | 4 ---- .../Commerce/Commands.UsageAggregates.Test/packages.config | 2 +- .../Commerce/Commands.UsageAggregates/packages.config | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 073674e29a53..2a3a82809d14 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1906,9 +1906,6 @@ - - - @@ -4568,7 +4565,6 @@ - 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/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 @@  - + From 5eb73a846963e69fc4878e81995eabae29ed8ac8 Mon Sep 17 00:00:00 2001 From: Matt Westphal Date: Wed, 8 Jul 2015 17:45:05 -0700 Subject: [PATCH 8/8] project file updates for UsageAggregates --- setup/azurecmdfiles.wxi | 4 ++++ .../Commands.UsageAggregates.Test.csproj | 2 +- .../Commands.UsageAggregates/Commands.UsageAggregates.csproj | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi index 2a3a82809d14..073674e29a53 100644 --- a/setup/azurecmdfiles.wxi +++ b/setup/azurecmdfiles.wxi @@ -1906,6 +1906,9 @@ + + + @@ -4565,6 +4568,7 @@ + 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/Commands.UsageAggregates.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj index eb31811c0b43..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