Skip to content

. #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 52 commits into from
Jun 20, 2015
Merged

. #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0e28a0d
added project shell
Matt-Westphal Jun 15, 2015
bc68a15
added test project
Matt-Westphal Jun 15, 2015
0f7274e
adding appropriate nuget packages
Matt-Westphal Jun 15, 2015
db2f4e6
Added enough code to build with the commerce package
Matt-Westphal Jun 16, 2015
265c244
working on tests
Matt-Westphal Jun 16, 2015
77f3a51
trying to get this to build and show the tests
Matt-Westphal Jun 16, 2015
526ee38
everything compiles, now to get the test to work
Matt-Westphal Jun 16, 2015
386d598
got to compile with xUnit and show the tests
Matt-Westphal Jun 17, 2015
eb4f8d2
small mods
Matt-Westphal Jun 17, 2015
d8d9326
minor updates, skipping the tests for now
Matt-Westphal Jun 17, 2015
2e1f65b
re adding tests
Matt-Westphal Jun 17, 2015
bc0c76a
trying out different way to call the powershell
Matt-Westphal Jun 17, 2015
a592a9c
Adding GetRestorePoints cmdlet
caln-microsoft Jun 18, 2015
ecb546b
Adding backup tests to Commands.Sql.Test.csproj
caln-microsoft Jun 18, 2015
fd1001f
Adding backup cmdlet support and Get-SqlAzureDatabaseRestorePoints
caln-microsoft Jun 18, 2015
f54875c
adding script to import and test the new UsageAggregates module
Matt-Westphal Jun 18, 2015
fa2ba22
csproj was referencing a file that didn't exist
Matt-Westphal Jun 18, 2015
0f9bc58
got the tests to run
Matt-Westphal Jun 19, 2015
f982719
remove unused files
Matt-Westphal Jun 19, 2015
4b7b931
removed app.config
Matt-Westphal Jun 19, 2015
0604377
Styling fixes for Get-AzureSqlDatabaseRestorePoints
caln-microsoft Jun 19, 2015
72858ce
Adding Get-AzureSqlDatabaseRestorePoints powershell support
caln-microsoft Jun 19, 2015
50cd60d
Merge pull request #1 from caln-microsoft/dev
caln-microsoft Jun 19, 2015
e084368
added our tests to the powershell test tagets
Matt-Westphal Jun 19, 2015
9718df2
Merge pull request #2 from caln-microsoft/backup
caln-microsoft Jun 19, 2015
3c85c14
Merge remote-tracking branch 'azure-powershell/dev' into dev
caln-microsoft Jun 19, 2015
9f9e6bc
added another place for the targets file
Matt-Westphal Jun 19, 2015
11a805b
updated name of dll for the test project to align with others
Matt-Westphal Jun 19, 2015
2bf9e8e
Updated code based on pull request feedback
Matt-Westphal Jun 19, 2015
a1f7e78
added Get-usageaggregates to changelog.txt
Matt-Westphal Jun 19, 2015
9d4cd92
Updated ListRestorePoints test and removed SizeBytes from RestorePoin…
caln-microsoft Jun 19, 2015
bf82141
added UsageAggregates to the installer
Matt-Westphal Jun 19, 2015
9a56c1e
Updated Get-SqlAzureRestorePoints test comments
caln-microsoft Jun 19, 2015
0ec0008
fixed csproj, was using wrong filename for help. didn't click save b…
Matt-Westphal Jun 19, 2015
db579db
updated help file correctly for Get-UsageAggregates
Matt-Westphal Jun 19, 2015
66f51fa
Edit help file.
ldattilo Jun 20, 2015
7405c66
ADF PowerShell update for sprint 50
jackmagic313 Jun 20, 2015
e6554d9
updated help file with formatting from help editor
Matt-Westphal Jun 20, 2015
9ce45b4
Fixed refactoring error
caln-microsoft Jun 20, 2015
e8956c2
Merge pull request #526 from huangpf/dev
Jun 20, 2015
aa8cfc7
Merge pull request #527 from jackmagic313/dev
Jun 20, 2015
31811ed
Changed ChangeLog for Azure Sql Data Warehouse functionality
caln-microsoft Jun 20, 2015
b089637
pulled from Azure repo and up
Matt-Westphal Jun 20, 2015
5880776
fixed merge error
Matt-Westphal Jun 20, 2015
f9fee87
Merge remote-tracking branch 'azure-powershell/dev' into dev
caln-microsoft Jun 20, 2015
bd685f0
Merge pull request #517 from Matt-Westphal/dev
Jun 20, 2015
a48e397
Merge remote-tracking branch 'azure-powershell/dev' into dev
caln-microsoft Jun 20, 2015
521a9b8
Merge pull request #525 from caln-microsoft/dev
Jun 20, 2015
e15552f
updated package versions
Matt-Westphal Jun 20, 2015
124acfb
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
Matt-Westphal Jun 20, 2015
55c528a
removed app.config
Matt-Westphal Jun 20, 2015
7732569
Merge pull request #529 from Matt-Westphal/dev
Jun 20, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion AzurePowershell.Test.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
<StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
<KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
<UsageAggregationTestDebug>.\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll</UsageAggregationTestDebug>
<TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload&#x26;!AzureRTCleanUp"</TestFilter>
<ScenarioTestFilter>All</ScenarioTestFilter>
<OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
Expand All @@ -55,13 +56,14 @@
<XUnitTests Include=".\src\ResourceManager\Batch\Commands.Batch.Test\bin\Debug\Microsoft.Azure.Commands.Batch.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Websites\Commands.Websites.Test\bin\Debug\Microsoft.Azure.Commands.Websites.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Commerce\Commands.UsageAggregates.Test\bin\Debug\Microsoft.Azure.Commands.UsageAggregates.Test.dll"/>
<XUnitTests Include=".\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll"/>
<XUnitTests Include=".\src\ServiceManagement\RemoteApp\Commands.RemoteApp.Test\bin\Debug\Microsoft.Azure.Commands.RemoteApp.Tests.dll"/>
<XUnitTests Include=".\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll"/>
<XUnitTests Include=".\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\TrafficManager\Commands.TrafficManager2.Test\bin\Debug\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.dll"/>
<XUnitTests Include=".\src\ServiceManagement\Network\Commands.Network.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
</ItemGroup>

<Target Name="InvokeMSTest">
Expand Down Expand Up @@ -242,6 +244,13 @@
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- run the UsageAggregationTests -->
<Target Name="UsageAggregationTests">
<Message Importance="high" Text="Running UsageAggregates tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(UsageAggregationTestDebug)" Html="$(TestOutputDirectory)\UsageAggregationTests.xunit.dll.html" Verbose="true"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- Run the scenario tests with Mocks -->
<Target Name="MockedScenarioTests">
Expand Down
9 changes: 9 additions & 0 deletions ChangeLog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
* Added Batch cmdlets
* Start-AzureBatchPoolResize
* Stop-AzureBatchPoolResize
* Azure SQL Database
* Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
* Suspend-AzureSqlDatabase
* Resume-AzureSqlDatabase
* Get-AzureSqlDatabaseRestorePoints
* Changed cmdlets:
* New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
* RedisCache cmdlets
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
Expand All @@ -12,6 +19,8 @@
* Added Test-AzureResourceGroup and Test-AzureResource cmdlets
* Refactored Resource Lock cmdlets
* Removed unnecessary code when getting a resource
* Added UsageAggregates cmdlets
* Get-UsageAggregates

2015.06.05 version 0.9.3
* Fixed bug in Websites cmdlets related to slots #454
Expand Down
38 changes: 38 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,35 @@
<File Id="fil2EE4D727387984593EACCF967C5A417A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\TrafficManager\System.Net.Http.Formatting.dll" />
</Component>
</Directory>
<Directory Id="dir32BED972EE251F875EA4F09B134AEF5E" Name="UsageAggregates">
<Component Id="cmpD145D7FE09196101520B2C18061AB078" Guid="*">
<File Id="filED88890651AE0FC7F16E7E1B29193FA8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Hyak.Common.dll" />
</Component>
<Component Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" Guid="*">
<File Id="fil95DC13FD8BAE2C8DC3424CE9146D21D7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Commerce.UsageAggregates.dll" />
</Component>
<Component Id="cmp3048A284A67314ED7DD113C8A0E7AACC" Guid="*">
<File Id="fil4746A971C2BAF476C3EE30F134B538C4" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.Authentication.dll" />
</Component>
<Component Id="cmpB75C2663276AF9B54A1956F617A490ED" Guid="*">
<File Id="filD08C015ACF7AD5B062BE3E3B1906E9B9" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.Azure.Common.dll" />
</Component>
<Component Id="cmp91D57F5419289E0EA1726AB996C48F89" Guid="*">
<File Id="filF2B7F2A291EA5AF0DD39901DB2165B29" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
<Component Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" Guid="*">
<File Id="fil820DF2C4D93FFC063173B332ECCFFED8" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll" />
</Component>
<Component Id="cmp284F2546DD1BE4D69C3B73E601610E2E" Guid="*">
<File Id="filC856466A045915F20513BA625F127ADF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" Guid="*">
<File Id="filF0B029A9140C07B215BA98335F090980" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\Newtonsoft.Json.dll" />
</Component>
<Component Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" Guid="*">
<File Id="fil77C2AC985863AB51DD34CBFD1CE7034E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\UsageAggregates\System.Net.Http.Formatting.dll" />
</Component>
</Directory>
<Directory Id="dirC50ADFE5CD118426F389B9B2CD995BF6" Name="Websites">
<Component Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" Guid="*">
<File Id="fil6C3554ACEEBC9EA8063C3E75065A9154" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\Websites\Hyak.Common.dll" />
Expand Down Expand Up @@ -4207,6 +4236,15 @@
<ComponentRef Id="cmp2BC5CD3EEAB03215BAF80C8D91B316F1" />
<ComponentRef Id="cmp44E9CD59264367064398F4E0170F73B3" />
<ComponentRef Id="cmp166C9307AB9128CC171F02474EBC9F38" />
<ComponentRef Id="cmpD145D7FE09196101520B2C18061AB078" />
<ComponentRef Id="cmpEAB3189ED9B3FC06E3EE9DF31FB78FCD" />
<ComponentRef Id="cmp3048A284A67314ED7DD113C8A0E7AACC" />
<ComponentRef Id="cmpB75C2663276AF9B54A1956F617A490ED" />
<ComponentRef Id="cmp91D57F5419289E0EA1726AB996C48F89" />
<ComponentRef Id="cmp28587E28E63FB7DC33E7A706CE1A97F0" />
<ComponentRef Id="cmp284F2546DD1BE4D69C3B73E601610E2E" />
<ComponentRef Id="cmp44560EFE13A1B5A47A0E2CB848ECF8C7" />
<ComponentRef Id="cmp84B6B5DFEFD61AD649BF4A22CFEF2C86" />
<ComponentRef Id="cmpCB9C95BF2FE6D784EC47F78CEA8714FE" />
<ComponentRef Id="cmpAA3B522375D7F8190EF55B87EB1EB8D4" />
<ComponentRef Id="cmp1A3E551E9A3F632A9FF29E4347C0E07F" />
Expand Down
9 changes: 3 additions & 6 deletions setup/azurepowershell.sln
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1

Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
ProjectSection(ProjectDependencies) = postProject
{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
Expand All @@ -16,10 +15,8 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
13 changes: 13 additions & 0 deletions src/AzurePowershell.sln
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsight
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\Commerce\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -536,6 +540,14 @@ Global
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.Build.0 = Release|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -579,5 +591,6 @@ Global
{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
{F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
EndGlobalSection
EndGlobal
Loading