Skip to content

merge from azure/azure-powershell/dev #19

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.

Sign up for GitHub

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 1,626 commits into from
May 26, 2015
Merged

merge from azure/azure-powershell/dev #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1626 commits
Select commit Hold shift + click to select a range
284befe
Merge pull request #187 from huangpf/crp2
markcowl Apr 28, 2015
6173a2b
removed NOT FOUND exception handling from getConfiguration which brea…
balukambala Apr 28, 2015
85d006a
Merge pull request #179 from milosevic81/recommended_elastic
markcowl Apr 28, 2015
05268ae
Merge pull request #185 from vladca/ignite_team
markcowl Apr 28, 2015
7e40f40
Merge pull request #7 from balukambala/ignite
safeermohammed Apr 28, 2015
686f5ed
Test proj file
safeermohammed Apr 28, 2015
6bfa8a1
Took latest from Azure ignite and resolved merge conflict
safeermohammed Apr 28, 2015
40032a7
Update help file
Apr 28, 2015
6aa132c
Merge pull request #2 from Azure/build
jtlibingus Apr 28, 2015
1fe188f
Update the help contents
jtlibingus Apr 28, 2015
35bc622
Merge pull request #184 from hungmai-msft/ignite-sql2-server-upgrade
markcowl Apr 28, 2015
59b7fa0
Merge pull request #186 from AzureAutomationTeam/ignite
markcowl Apr 28, 2015
9369dfb
Merge pull request #191 from danielceckert/ignite
markcowl Apr 28, 2015
3885e39
Merge pull request #193 from jtlibing/build
markcowl Apr 28, 2015
e1c0bab
Merge pull request #192 from hyonholee/crp2-help
markcowl Apr 28, 2015
90b340c
Merge pull request #29 from Azure/build
huangpf Apr 28, 2015
3a8f927
Merge pull request #30 from Azure/ignite
huangpf Apr 28, 2015
0fd85ee
Adding doc files for DNS and TM
ms-alguerra Apr 28, 2015
2daac1f
Fix autogenerate issues
ms-alguerra Apr 28, 2015
c5585dc
Merge pull request #195 from t-alguer/ignite_doc
markcowl Apr 28, 2015
d2ec538
Initial Check-in
chadiel Apr 28, 2015
196672b
completing the integration
chadiel Apr 28, 2015
63a2d30
Merge pull request #196 from Azure/build
stankovski Apr 28, 2015
8cb4132
Merge pull request #31 from Azure/ignite
huangpf Apr 28, 2015
d68fbb8
Updated versions
stankovski Apr 28, 2015
8cbe9c5
change test location to 'westus'
huangpf Apr 28, 2015
5decb88
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 28, 2015
e345765
Updated the nuget
Apr 28, 2015
c5cc795
Merge branch 'ignite' of github.com:Azure/azure-powershell-pr into de…
Apr 28, 2015
2fdb919
Fixing csproj files
Apr 28, 2015
b0bbab6
Merge pull request #198 from stankovski/ignite
stankovski Apr 28, 2015
dbc0c2b
Update documentation for AzureResourceManagement based Sql Cmdlets
jamestao Apr 28, 2015
f1ce00e
Update Sql nuget package from signed CI job
hungmai-msft Apr 28, 2015
c7e8427
Updated with signed nuget
Apr 29, 2015
cbc73aa
Merge branch 'ignite' of github.com:Azure/azure-powershell-pr into de…
Apr 29, 2015
8272409
update test data
huangpf Apr 29, 2015
c051312
Merge pull request #32 from Azure/ignite
huangpf Apr 29, 2015
0308624
Merge pull request #201 from hungmai-msft/fix-sql-nuget
stankovski Apr 29, 2015
ece006a
Update PS Types
huangpf Apr 29, 2015
d72e3f6
fix format file
huangpf Apr 29, 2015
81497dd
Updated SQL mock
stankovski Apr 29, 2015
01a0de3
Merge pull request #205 from stankovski/ignite
stankovski Apr 29, 2015
420e85a
Changed MSI name to indicate May
stankovski Apr 29, 2015
26efdd6
Merge pull request #206 from stankovski/ignite
stankovski Apr 29, 2015
0936a48
Update ChangeLog.txt
markcowl Apr 29, 2015
1cec159
Update ChangeLog.txt
markcowl Apr 29, 2015
0b3249d
Merge pull request #33 from Azure/build
huangpf Apr 29, 2015
0f8dcb9
Merge pull request #34 from Azure/ignite
huangpf Apr 29, 2015
d562210
+ added ApiManagement commands
ailn Apr 29, 2015
499f3eb
Merge remote-tracking branch 'upstream/ignite' into ignite
ailn Apr 29, 2015
397035f
added documentation files
ailn Apr 29, 2015
f5a1acd
remove unused pack
huangpf Apr 29, 2015
91f7908
Address PR feedback
Apr 29, 2015
b26eb7a
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 29, 2015
3b0e601
Merging BUILD release from private repo
markcowl Apr 29, 2015
a11a439
Ignite: WORK:3527498 PowerShell cmdlets for new NRP Brooklyn APIs
Nilambari Apr 29, 2015
6b5aa7b
Merge branch 'ignite' of https://github.com/Azure/azure-powershell-pr…
Nilambari Apr 29, 2015
5a13577
update
huangpf Apr 29, 2015
d2731d0
Merge pull request #199 from j82w/devTdeIgnite
markcowl Apr 29, 2015
52baaf9
Fix small issue
chadiel Apr 29, 2015
ba60855
Merge pull request #200 from jamestao/ignite
markcowl Apr 29, 2015
e3859f7
Fix typo in psd1
Apr 29, 2015
5aa3be1
Merge pull request #356 from markcowl/mergebuild
markcowl Apr 29, 2015
c109fcb
Merge pull request #207 from huangpf/ignite
markcowl Apr 29, 2015
5698961
Removing packages that are public or shipped with BUILD
markcowl Apr 29, 2015
c485acd
Merge pull request #35 from Azure/ignite
huangpf Apr 29, 2015
03590b7
Merge branch 'ignite' of github.com:Azure/azure-powershell-pr into de…
Apr 29, 2015
4db76e7
Skip some tests
Apr 29, 2015
c015050
Small fix
Apr 29, 2015
c002328
WORK:3527498 CR incorporation
Nilambari Apr 30, 2015
aae0092
Updating help documents for TDE
Apr 30, 2015
6577eed
Merge pull request #209 from markcowl/removepackages
markcowl Apr 30, 2015
ae0983c
Merge pull request #357 from Azure/master
markcowl Apr 30, 2015
a7832b6
Merge pull request #36 from Azure/ignite
huangpf Apr 30, 2015
af18570
Merge pull request #1 from Azure/dev
huangpf Apr 30, 2015
6ab3233
fixed backup/restore test
ailn Apr 30, 2015
3da08f2
Merge remote-tracking branch 'upstream/ignite' into ignite
ailn Apr 30, 2015
5903569
Merge pull request #208 from Nilambari/ignite
markcowl Apr 30, 2015
465054e
Merge pull request #210 from chadiel/ignite
markcowl Apr 30, 2015
15a3d66
Updated ChangeLog.txt with Automation cmdlets
safeermohammed Apr 30, 2015
e4b312e
Updated ChangeLog.txt with Automation cmdlets
safeermohammed Apr 30, 2015
72b587d
Merge pull request #37 from Azure/ignite
huangpf Apr 30, 2015
3423729
Add Tags support
huangpf Apr 30, 2015
6b6995c
Merge branch 'ignite' of https://github.com/huangpf/azure-powershell-…
huangpf Apr 30, 2015
7427fd7
Merge pull request #211 from AzureAutomationTeam/ignite
markcowl Apr 30, 2015
3888657
Merge remote-tracking branch 'upstream/ignite' into ignite
ailn Apr 30, 2015
5856873
removed redundant files
ailn Apr 30, 2015
da09fd5
Merge pull request #38 from Azure/ignite
huangpf Apr 30, 2015
5da2061
Merge branch 'ignite' of github.com:Azure/azure-powershell-pr into de…
Apr 30, 2015
4d9aa51
Updating the nuget, and help documents for Azure SQL transparent data…
Apr 30, 2015
2d8f322
Use HashtableExtensions to convert Tags to Dict.
huangpf Apr 30, 2015
9d00d0c
Update ChangeLog.txt
markcowl Apr 30, 2015
acaeea5
Merge pull request #213 from huangpf/ignite
markcowl Apr 30, 2015
82210b5
Merge pull request #214 from ailn/ignite
markcowl Apr 30, 2015
34b3926
Adding signed nuget, removing old nuget
Apr 30, 2015
7308e6e
Fixing csproj files
Apr 30, 2015
ad20e2f
Fixed csproj
Apr 30, 2015
d2fe967
Fixed csproj
Apr 30, 2015
8d6b464
Fixed help document
Apr 30, 2015
7f531b2
Removed the app.config
Apr 30, 2015
c7ee618
Merge branch 'ignite' into dev
eshaparmar Apr 30, 2015
acbb146
Updating installer
markcowl Apr 30, 2015
e8b285c
fixing merge issues
markcowl Apr 30, 2015
676a78c
Update documentation for server upgrade cmdlets
hungmai-msft Apr 30, 2015
323bd99
Update namespaces and name width for Routes formatting
May 1, 2015
5f6e291
Merge pull request #216 from markcowl/installmerge
markcowl May 1, 2015
2a9b142
Merge pull request #217 from hungmai-msft/sql-server-upgrade-document…
markcowl May 1, 2015
d8510da
Merge branch 'update-route-formatting' of github.com:dud5/azure-power…
markcowl May 1, 2015
a07c330
Merge pull request #218 from dud5/update-route-formatting
markcowl May 1, 2015
2bfe357
Merge pull request #215 from j82w/devTdeIgnite
markcowl May 1, 2015
a209e59
Fix APIManagement signing issue
markcowl May 1, 2015
36b14ff
Merge pull request #219 from markcowl/fixapi
markcowl May 1, 2015
f9f2d9a
Update README.md
markcowl May 1, 2015
0e2c815
Change networking path to avoid windows installer issues.
May 2, 2015
bf3190f
Update Stream Analytics PowerShell
atpham256 May 2, 2015
e49b1ce
Update wix file.
May 2, 2015
345373b
Some chances based on bug bash findings
chadiel May 2, 2015
7013df5
Remve the readonly lock level
chadiel May 2, 2015
02f7c7c
Fix build break.
chadiel May 2, 2015
611cad1
Set null for AUC when WindowsConfiguration is initialized
May 2, 2015
fa877ea
Merge pull request #221 from dud5/change-networking-path
markcowl May 2, 2015
ed19824
Merge branch 'ignite' of https://github.com/Azure/azure-powershell-pr…
May 2, 2015
d49212a
Add linux VM test
May 2, 2015
cd75a08
Merge branch 'ignite' of github.com:chadiel/azure-powershell-pr into …
markcowl May 2, 2015
47dc4c6
update installer for resource manager changes
markcowl May 2, 2015
352598d
Merge pull request #224 from hyonholee/ignite2
markcowl May 2, 2015
1884e42
Merge pull request #225 from markcowl/resignite
markcowl May 3, 2015
1deb723
fixed Scenario Test for Set-AzureServiceDiagnosticsExtension cmdlet
PashaPash Apr 29, 2015
3f00913
fix for #193 - "The extension ID Default-PaaSDiagnostics-Staging-Ext-…
PashaPash Apr 29, 2015
9d7ac4b
Merge branch 'ignite' of github.com:Azure/azure-powershell-pr into me…
markcowl May 4, 2015
1de47b9
Remove LocalFeed folder
markcowl May 4, 2015
21fb5cc
Merge pull request #363 from markcowl/mergeignite
markcowl May 4, 2015
811102a
Update ChangeLog.txt
markcowl May 4, 2015
f50060c
Update ChangeLog.txt
markcowl May 4, 2015
dfbe868
Merge pull request #17 from Azure/dev
sethusrinivasan May 4, 2015
e8e669c
Merge pull request #2 from Azure/master
huangpf May 5, 2015
e0f30d6
Merge pull request #364 from Azure/master
amarzavery May 5, 2015
6037c75
Merge remote-tracking branch 'Azure/dev' into dev
atpham256 May 5, 2015
173eb34
Fixes for github issues: 310, 329, 335.
amarzavery May 5, 2015
94ed44d
Ported changes for commandlet rename
olignat May 5, 2015
8541aac
Fixed SelectAzureSubscriptionWithPassthroughPrintsSubscription test
stankovski May 5, 2015
e19b79d
Merge pull request #1 from stankovski/dev
amarzavery May 5, 2015
a58af04
Merge pull request #367 from amarzavery/dev
stankovski May 5, 2015
12c1034
Merge remote-tracking branch 'Azure/dev' into dev
atpham256 May 5, 2015
a1016a4
Update Stream Analytics Get-Help Documentation
atpham256 May 5, 2015
20315a6
Fix to the new subscription registiontaion with ADF RP issue.
May 6, 2015
69d3f37
Move resource storage account management cmdlets to a new project.
EmmaZhu May 5, 2015
45dfa3b
Merge pull request #3 from Azure/dev
huangpf May 6, 2015
0fc9fb2
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
eshaparmar May 6, 2015
114fbdd
Delete tests that have coverage in end to end
eshaparmar May 6, 2015
c36c3f1
Merge pull request #18 from Azure/dev
sethusrinivasan May 6, 2015
88d979b
Added new ADF onpremises encryption for M sources.
May 6, 2015
4ed9828
Move resource storage account management cmdlets unittest to a new pr…
EmmaZhu May 7, 2015
0f5f006
Merge branch 'dev' of https://github.com/Azure/azure-powershell into srp
EmmaZhu May 7, 2015
a8319b1
Updating references to use latest HDInsight SDK
vhamine May 7, 2015
e96e19a
Update Stream Analytics PowerShell
atpham256 May 7, 2015
0d535cd
Updating references in HDInsight.Test to use the latest HDInsight SDK
vhamine May 7, 2015
7eaf123
Change help content to make it consistant.
EmmaZhu May 8, 2015
eeafd07
Merge remote-tracking branch 'origin/srp' into dev
EmmaZhu May 8, 2015
cdf0685
Remove unneccessary app.config reference.
EmmaZhu May 8, 2015
da0d34e
Merge pull request #360 from atpham256/dev
stankovski May 8, 2015
ef4fb6f
Merge pull request #374 from vhamine/dev
stankovski May 8, 2015
d33d22b
Merge pull request #4 from Azure/dev
huangpf May 8, 2015
b1e5051
Fixed failing configuration parsing and serialization tests
eshaparmar May 11, 2015
158770e
changed the test category to BVT
eshaparmar May 11, 2015
43b60e4
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
May 11, 2015
a967e48
update model classes
huangpf May 12, 2015
b99edf4
update
huangpf May 12, 2015
3eb2516
Fixing Set-AzureSqlDatabase when targetting a v11 server through the …
akromm-zz May 13, 2015
1f0475b
Key Vault cmdlet bug fix for GitHub issues 368, 378
divyagandhi01 May 5, 2015
b5fdea1
Adding tests.
akromm-zz May 13, 2015
e58d1f8
Resolve PR comments.
EmmaZhu May 14, 2015
8668e00
Merge branch 'srp' of https://github.com/wastoresh/azure-powershell-p…
EmmaZhu May 14, 2015
cc82553
Addressing code review comments.
akromm-zz May 14, 2015
e3c5862
Merge pull request #381 from divyakgupta/dev
stankovski May 14, 2015
f1df0b4
Merge pull request #5 from Azure/dev
huangpf May 14, 2015
72fb072
Updating referenced nuget package version.
akromm-zz May 14, 2015
cc6bc90
Removing reference to app.config.
akromm-zz May 14, 2015
50c38b0
Removing another reference to app.config.
akromm-zz May 14, 2015
121c37c
Fix Set and Move AzureResource commands. DefaultParamSet is now Resou…
vivsriaus May 14, 2015
ce4c1d8
Add copyright to cs files.
EmmaZhu May 15, 2015
d2fe114
Merge pull request #389 from akromm/dev-update-fix-20150513
markcowl May 15, 2015
d0719f5
Support compound identity access policy
May 14, 2015
afd0f58
Merge pull request #6 from Azure/dev
huangpf May 15, 2015
75eb0fe
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
vivsriaus May 15, 2015
3865aa7
Re-record tests
May 15, 2015
48d9590
Add a scenario test for Move and Set. Accept legacy property object. …
vivsriaus May 15, 2015
858709c
Changes to add DeleteChefConfig option for set chef extension
May 18, 2015
2ba03da
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
yoavrubin May 18, 2015
bc81a61
Merge pull request #19 from Azure/dev
sethusrinivasan May 18, 2015
dcf6e0e
Merge pull request #380 from dscsolutions/delete-tests
May 18, 2015
fa75814
Merge pull request #7 from Azure/dev
huangpf May 18, 2015
7de2457
Throw warning only if using legacy object format
vivsriaus May 19, 2015
01d2830
Merge pull request #400 from YuhuiZhong/ace
ogail May 19, 2015
faddde8
Get-AzureVMSqlServerExtension was not reporting back "AutoBackup" and…
sethusrinivasan May 19, 2015
82bb198
Merge pull request #20 from Azure/dev
sethusrinivasan May 19, 2015
55f1e06
Merge pull request #8 from Azure/dev
huangpf May 19, 2015
a323cc6
Merge pull request #377 from wastoresh/dev
stankovski May 19, 2015
7982004
Update Common.Authentication dll to pick up graph and gallery mooncak…
vivsriaus May 19, 2015
e7ee318
Merge pull request #401 from sethusrinivasan/dev
stankovski May 19, 2015
1f58123
Add app.config back to StorSimple.Test.csproj
vivsriaus May 19, 2015
cc94edd
Merge pull request #321 from ClogenyTechnologies/sid-chef-extension-b…
ogail May 19, 2015
f90bbd5
Merge pull request #390 from vivsriaus/dev
ogail May 19, 2015
3d88c8c
Merge pull request #361 from LogicSoftware/dev
ogail May 19, 2015
e59611e
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf May 20, 2015
fa3ee24
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf May 20, 2015
9cec9e3
update
huangpf May 20, 2015
599fba5
Alias should be PropertyObject
vivsriaus May 20, 2015
b449be4
Merge pull request #405 from huangpf/dev
ogail May 20, 2015
61feebd
Merge pull request #407 from vivsriaus/dev
ogail May 20, 2015
aab06f5
WORK:3527498 Enabled tests & add recorded tests results for Brooklyn …
Nilambari May 20, 2015
ae01bf3
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Nilambari May 20, 2015
45aa190
Merge pull request #408 from Nilambari/dev
yugangw-msft May 20, 2015
b63006b
Changing namespace Azure->WindowsAzure for RDFE API specs
yadavbdev May 20, 2015
e20ca14
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yadavbdev May 20, 2015
d93693d
Merge pull request #9 from Azure/dev
huangpf May 20, 2015
cdf8774
Removing the file newly added but not needed from the project
yadavbdev May 20, 2015
621ea0b
Merge pull request #410 from yadavbdev/dev
yadavbdev May 20, 2015
117634e
Merging alias changes with upstream dev branch changes
markcowl May 21, 2015
40f8328
Merge branch 'dev' of https://github.com/azure/azure-powershell into dev
May 21, 2015
7824e13
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
yoavrubin May 21, 2015
6609d5a
Remove redundant "-All" flag in Get-AzureVM
huangpf May 21, 2015
8cbee16
Changing alias infrastructure for sql aliases
markcowl May 21, 2015
301cfe0
Deprecating Switch-AzureMode
markcowl May 21, 2015
93e41fb
Move the generated format content to a separate file.
huangpf May 21, 2015
fc59a7e
Fixes to structure for alias script
markcowl May 21, 2015
f0009d0
Upgrade ADF gateway encryption nuget version.
May 22, 2015
f09125d
Update PS Output Types & Format for VM/Ext/AVSet Cmdlets
huangpf May 22, 2015
921c3e1
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf May 22, 2015
7edfeee
Add Force parameter to Remove-AzureAvailabilitySet
May 22, 2015
58fcb41
Combine Get-AzureVMImage and Get-AzureVMImageDetail cmdlets
May 22, 2015
39d57bf
Fix piping issue for Remove-AzureVMDataDisk
May 22, 2015
8dedf30
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
May 22, 2015
2811ed6
Merge pull request #412 from huangpf/dev
markcowl May 22, 2015
301140c
Removing the alias option from data masking rule
yoavrubin May 22, 2015
9f910dd
Fix for combining image and imagedetails
May 22, 2015
4eaf626
Update the output of Remove-AzureAvailabilitySet cmdlet
May 22, 2015
0bcc52d
Add test for piping of Remove-AzureVMDataDisk and Remove-AzureVMNetwo…
May 22, 2015
a06dfeb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
May 22, 2015
f33cbc3
Fixing tests
markcowl May 22, 2015
9deef66
Merge pull request #414 from yitao-zhang/dev
markcowl May 22, 2015
7774bc7
Add help file for Key Vault cmdlets
divyagandhi01 May 22, 2015
a89ec8b
Merge pull request #415 from markcowl/sqlps1
markcowl May 22, 2015
966574c
Fix bug PowerShell returns an exception when listing keys in a vault …
May 22, 2015
5757972
Change NicIds to NetworkInterfaceIds
May 22, 2015
5819480
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
May 22, 2015
9bf5b03
Merge pull request #416 from yoavrubin/dev
ogail May 22, 2015
bcf0742
Merge pull request #417 from hyonholee/dev2
ogail May 22, 2015
169e479
Merge pull request #419 from divyakgupta/dev
ogail May 22, 2015
237ab20
Merge pull request #420 from YuhuiZhong/dev
ogail May 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
81 changes: 61 additions & 20 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<ScenarioTestDebug>.\src\Common\Commands.ScenarioTest\bin\Debug\Microsoft.WindowsAzure.Commands.ScenarioTest.dll</ScenarioTestDebug>
<CommonTestDebug>.\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll</CommonTestDebug>
<SqlTestDebug>.\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll</SqlTestDebug>
<ComputeTestDebug>.\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll</ComputeTestDebug>
<NetworkTestDebug>.\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll</NetworkTestDebug>
<AzureRTTestSettings>.\src\AzureRT.testsettings</AzureRTTestSettings>
<AzureRTTestContainer>.\src\ServiceManagement\Compute\Commands.ServiceManagement.Test\bin\Debug\Microsoft.WindowsAzure.Commands.ServiceManagement.Test.dll</AzureRTTestContainer>
<StorageScenarioTestDebug>src\ServiceManagement\Storage\Commands.Storage.ScenarioTest\bin\Debug\CLITest.dll</StorageScenarioTestDebug>
Expand All @@ -32,14 +34,19 @@
<AzureRTAllPreviewFilter>"Functional|AzureRTScenario|Preview"</AzureRTAllPreviewFilter>
<AzureRTUploadSeqFilter>"AzureRTUpload|Sequential"</AzureRTUploadSeqFilter>
<AzureRTSeqAllFilter>"AzureRTUpload|Sequential|Network"</AzureRTSeqAllFilter>
<TestTimeout Condition=" '$(TestTimeout)' == '' ">100000000</TestTimeout>
</PropertyGroup>

<ItemGroup>
<XUnitTests Include=".\src\Common\Commands.Common.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Common.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Sql\Commands.Sql.Test\bin\Debug\Microsoft.Azure.Commands.Sql.Test.dll"/>
<XUnitTests Include=".\src\ServiceManagement\Services\Commands.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Test.dll"/>
<XUnitTests Include=".\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Resources\Commands.Resources.Test\bin\Debug\Microsoft.Azure.Commands.Resources.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Compute\Commands.Compute.Test\bin\Debug\Microsoft.Azure.Commands.Compute.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Network\Commands.Network.Test\bin\Debug\Microsoft.Azure.Commands.Network.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\DataFactories\Commands.DataFactories.Test\bin\Debug\Microsoft.Azure.Commands.DataFactories.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Dns\Commands.Dns.Test\bin\Debug\Microsoft.Azure.Commands.Dns.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\StreamAnalytics\Commands.StreamAnalytics.Test\bin\Debug\Microsoft.Azure.Commands.StreamAnalytics.Test.dll"/>
<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"/>
Expand All @@ -48,11 +55,13 @@
<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\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.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"/>
</ItemGroup>

<Target Name="InvokeMSTest">
<!--Remove existing test result; otherwsie mstest will error-->
<!--Remove existing test result; otherwise mstest will error-->
<Delete Files="$(_testResult)"/>
<Exec
Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)"
Expand All @@ -62,8 +71,23 @@
<Target Name="InvokeXUnit">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<Xunit.Runner.MSBuild.xunit Assemblies="@(XUnitTests)" Html="$(TestOutputDirectory)\xunit.tests.dll.html" Verbose="true"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
<Exec
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
Timeout="$(TestTimeout)" ContinueOnError="false"/>
<OnError ExecuteTargets="TimeoutErrorHandler"/>
</Target>

<Target Name="InvokeXUnitAll">
<Message Importance="high" Text="Running XUnit tests" />
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<Exec
Command="$(MSBuildProjectDirectory)\packages\xunit.runner.console.2.0.0\tools\xunit.console.x86.exe &quot;%(XUnitTests.Identity)&quot; -notrait &quot;RunType=LiveOnly&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
Timeout="$(TestTimeout)" ContinueOnError="false"/>
<OnError ExecuteTargets="TimeoutErrorHandler"/>
</Target>

<Target Name="TimeoutErrorHandler">
<Error Text="XUnit tests in assembly &quot;%(XUnitTests.Filename).dll&quot; failed or timed out. Ensure that all tests in a project pass and collectively take less than 1 minute to run."/>
</Target>

<Target Name="BeforeRunTests">
Expand All @@ -73,46 +97,56 @@

<Target Name="TestManagement">
<Xunit.Runner.MSBuild.xunit Assemblies="$(ManagementTestDebug)" Html="$(TestOutputDirectory)\ManagementDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestManagedCache">
<PropertyGroup>
<_ManagedCacheTestAssembly>.\src\ServiceManagement\ManagedCache\Commands.ManagedCache.Test\bin\Debug\Microsoft.Azure.Commands.ManagedCache.Test.dll</_ManagedCacheTestAssembly>
</PropertyGroup>
<Xunit.Runner.MSBuild.xunit Assemblies="$(_ManagedCacheTestAssembly)" Html="$(TestOutputDirectory)\ManagedCache.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestResourceManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(ResourceManagerTestDebug)" Html="$(TestOutputDirectory)\ResourceManagerTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>


<Target Name="TestCompute">
<Xunit.Runner.MSBuild.xunit Assemblies="$(ComputeTestDebug)" Html="$(TestOutputDirectory)\ComputeTestDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="NetworkTestDebug">
<Xunit.Runner.MSBuild.xunit Assemblies="$(NetworkTestDebug)" Html="$(TestOutputDirectory)\NetworkTestDebug.xunit.dll.html" Verbose="false"
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestBatch">
<Xunit.Runner.MSBuild.xunit Assemblies="$(BatchTestDebug)" Html="$(TestOutputDirectory)\BatchTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>


<Target Name="TestRemoteApp">
<Xunit.Runner.MSBuild.xunit Assemblies="$(RemoteAppTestDebug)" Html="$(TestOutputDirectory)\RemoteAppTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestWebsites">
<Xunit.Runner.MSBuild.xunit Assemblies="$(WebsitesTestDebug)" Html="$(TestOutputDirectory)\WebsitesTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestDataFactoryManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(DataFactoryManagerTestDebug)" Html="$(TestOutputDirectory)\DataFactoryManagerTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestStreamAnalyticsManager">
<Xunit.Runner.MSBuild.xunit Assemblies="$(StreamAnalyticsManagerTestDebug)" Html="$(TestOutputDirectory)\StreamAnalyticsManagerTestDebug.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestServiceManagement">
Expand Down Expand Up @@ -150,15 +184,15 @@
<_RecoveryServicesTestAssembly>.\src\ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\bin\Debug\Microsoft.Azure.Commands.RecoveryServices.Test.dll</_RecoveryServicesTestAssembly>
</PropertyGroup>
<Xunit.Runner.MSBuild.xunit Assemblies="$(_RecoveryServicesTestAssembly)" Html="$(TestOutputDirectory)\RecoveryServices.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="TestStorSimple">
<PropertyGroup>
<_StorSimpleTestAssembly>.\src\ServiceManagement\StorSimple\Commands.StorSimple.Test\bin\Debug\Microsoft.WindowsAzure.Commands.StorSimple.Test.dll</_StorSimpleTestAssembly>
</PropertyGroup>
<Xunit.Runner.MSBuild.xunit Assemblies="$(_StorSimpleTestAssembly)" Html="$(TestOutputDirectory)\StorSimple.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<!-- Run the scenario tests -->
Expand All @@ -176,28 +210,35 @@
<Target Name="CommonTests">
<Message Importance="high" Text="Running Common tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(CommonTestDebug)" Html="$(TestOutputDirectory)\CommonTests.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- Run the Compute tests -->
<Target Name="ComputeTests">
<Message Importance="high" Text="Running Compute tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(ComputeTestDebug)" Html="$(TestOutputDirectory)\ComputeTests.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<!-- Run the sql tests -->
<Target Name="SqlTests">
<Message Importance="high" Text="Running Sql tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(SqlTestDebug)" Html="$(TestOutputDirectory)\SqlTests.xunit.dll.html" Verbose="false"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<!-- Run the KeyVault tests -->
<Target Name="KeyVaultTests">
<Message Importance="high" Text="Running KeyVault tests" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(KeyVaultTestDebug)" Html="$(TestOutputDirectory)\KeyVaultTests.xunit.dll.html" Verbose="true"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false"/>
</Target>

<!-- Run the scenario tests with Mocks -->
<Target Name="MockedScenarioTests">
<Message Importance="high" Text="Running scenario tests with Mocks" />
<Xunit.Runner.MSBuild.xunit Assemblies="$(ScenarioTestDebug)" Html="$(TestOutputDirectory)\MockedScenarioTests.xunit.dll.html" Verbose="true"
ExcludeTraits="$(XUnitExcludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
IncludeTraits="$(XUnitIncludedTrait)" MaxParallelThreads="0" ParallelizeAssemblies="false" ParallelizeTestCollections="false" />
</Target>

<Target Name="RunOneSDKCIT" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
Expand Down Expand Up @@ -237,7 +278,7 @@
<Message Importance="high" Text="Running a specific tests..." />
<Delete Files="$(TestOutputDirectory)\RTFunctionalDebug.trx" />
<Exec
Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
Command="for /l %%x in (1, 1, $(RepeatTimes)) do MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /test:$(TestName) /resultsfile:$(TestOutputDirectory)\RTFunctionalDebug%%x.trx"
ContinueOnError="false" />
</Target>

Expand Down
Loading