Skip to content

Commit 5c2354d

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2 parents f6bc5aa + 521a9b8 commit 5c2354d

33 files changed

+4062
-16
lines changed

‎AzurePowershell.Test.targets

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
3030
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
3131
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
32+
<UsageAggregationTestDebug>.\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
3233
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
3334
<ScenarioTestFilter>All</ScenarioTestFilter>
3435
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
@@ -55,13 +56,14 @@
5556
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
5657
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
5758
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
59+
<XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
5860
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
5961
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
6062
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
6163
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
6264
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
6365
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
64-
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
66+
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
6567
</ItemGroup>
6668

6769
<Target Name="InvokeMSTest">
@@ -242,6 +244,13 @@
242244
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
243245
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
244246
</Target>
247+
248+
<!-- run the UsageAggregationTests -->
249+
<Target Name="UsageAggregationTests">
250+
<Message Importance="high" Text="Running UsageAggregates tests" />
251+
<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
252+
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
253+
</Target>
245254

246255
<!-- Run the scenario tests with Mocks -->
247256
<Target Name="MockedScenarioTests">

‎ChangeLog.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
* Added Batch cmdlets
33
* Start-AzureBatchPoolResize
44
* Stop-AzureBatchPoolResize
5+
* Azure SQL Database
6+
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
7+
* Suspend-AzureSqlDatabase
8+
* Resume-AzureSqlDatabase
9+
* Get-AzureSqlDatabaseRestorePoints
10+
* Changed cmdlets:
11+
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
512
* RedisCache cmdlets
613
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
714
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
@@ -12,6 +19,8 @@
1219
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
1320
* Refactored Resource Lock cmdlets
1421
* Removed unnecessary code when getting a resource
22+
* Added UsageAggregates cmdlets
23+
* Get-UsageAggregates
1524

1625
2015.06.05 version 0.9.3
1726
* Fixed bug in Websites cmdlets related to slots #454

‎setup/azurecmdfiles.wxi

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,6 +1737,35 @@
17371737
<File Id="fil2EE4D727387984593EACCF967C5A417A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\System.Net.Http.Formatting.dll" />
17381738
</Component>
17391739
</Directory>
1740+
<Directory Id="dir32BED972EE251F875EA4F09B134AEF5E" Name="UsageAggregates">
1741+
<Component Id="cmpD145D7FE09196101520B2C18061AB078" Guid="*">
1742+
<File Id="filED88890651AE0FC7F16E7E1B29193FA8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Hyak.Common.dll" />
1743+
</Component>
1744+
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
1745+
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
1746+
</Component>
1747+
<Component Id="cmp3048A284A67314ED7DD113C8A0E7AACC" Guid="*">
1748+
<File Id="fil4746A971C2BAF476C3EE30F134B538C4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.Authentication.dll" />
1749+
</Component>
1750+
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
1751+
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
1752+
</Component>
1753+
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
1754+
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
1755+
</Component>
1756+
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
1757+
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
1758+
</Component>
1759+
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
1760+
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
1761+
</Component>
1762+
<Component Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" Guid="*">
1763+
<File Id="filF0B029A9140C07B215BA98335F090980" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Newtonsoft.Json.dll" />
1764+
</Component>
1765+
<Component Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" Guid="*">
1766+
<File Id="fil77C2AC985863AB51DD34CBFD1CE7034E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\System.Net.Http.Formatting.dll" />
1767+
</Component>
1768+
</Directory>
17401769
<Directory Id="dirC50ADFE5CD118426F389B9B2CD995BF6" Name="Websites">
17411770
<Component Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" Guid="*">
17421771
<File Id="fil6C3554ACEEBC9EA8063C3E75065A9154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Hyak.Common.dll" />
@@ -4207,6 +4236,15 @@
42074236
<ComponentRef Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" />
42084237
<ComponentRef Id="cmp44E9CD59264367064398F4E0170F73B3" />
42094238
<ComponentRef Id="cmp166C9307AB9128CC171F02474EBC9F38" />
4239+
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
4240+
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
4241+
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
4242+
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
4243+
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
4244+
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
4245+
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
4246+
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
4247+
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />
42104248
<ComponentRef Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" />
42114249
<ComponentRef Id="cmpAA3B522375D7F8190EF55B87EB1EB8D4" />
42124250
<ComponentRef Id="cmp1A3E551E9A3F632A9FF29E4347C0E07F" />

‎setup/azurepowershell.sln

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 2013
3-
VisualStudioVersion = 12.0.30110.0
3+
VisualStudioVersion = 12.0.31101.0
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
65
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
76
ProjectSection(ProjectDependencies) = postProject
87
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -16,10 +15,8 @@ Global
1615
Release|Any CPU = Release|Any CPU
1716
EndGlobalSection
1817
GlobalSection(ProjectConfigurationPlatforms) = postSolution
19-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
21-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
22-
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
18+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
19+
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
2320
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2421
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
2522
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎src/AzurePowershell.sln

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsight
218218
EndProject
219219
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}"
220220
EndProject
221+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\Commerce\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
222+
EndProject
223+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
224+
EndProject
221225
Global
222226
GlobalSection(SolutionConfigurationPlatforms) = preSolution
223227
Debug|Any CPU = Debug|Any CPU
@@ -536,6 +540,14 @@ Global
536540
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
537541
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
538542
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU
543+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
544+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
545+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
546+
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.Build.0 = Release|Any CPU
547+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
548+
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
549+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
550+
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
539551
EndGlobalSection
540552
GlobalSection(SolutionProperties) = preSolution
541553
HideSolutionNode = FALSE
@@ -579,5 +591,6 @@ Global
579591
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
580592
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
581593
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
594+
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
582595
EndGlobalSection
583596
EndGlobal

0 commit comments

Comments
 (0)