Skip to content

Merging master -> dev for release 0.9.0 #357

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,019 commits into from
Apr 30, 2015
Merged

Merging master -> dev for release 0.9.0 #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1019 commits
Select commit Hold shift + click to select a range
247f97a
address CR feedback
deepakswifty Apr 17, 2015
18567b7
Adding gallery
ms-alguerra Apr 17, 2015
845c1b3
Removed python from docs.
Apr 17, 2015
b4dac18
Add Network cmdlets to changelog
deepakswifty Apr 17, 2015
9a7831e
Merge pull request #114 from hovsepm/build
Apr 17, 2015
518c564
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
mumou Apr 17, 2015
eb709b0
converting MSTests to XUnit tests
mumou Apr 17, 2015
e09721c
removing xunit.extensibility.core from list of packages
mumou Apr 17, 2015
4fc98a9
updating xunit references
mumou Apr 17, 2015
61d7a99
Aligining tests
ms-alguerra Apr 17, 2015
475ebc2
Merge pull request #112 from t-alguer/build_dev
Apr 17, 2015
4e3e057
fixing HDInsight test initialization
mumou Apr 17, 2015
3db30d8
Merge pull request #7 from Azure/build
huangpf Apr 17, 2015
a0fa5f4
Update nrp api version and rerecord tests
deepakswifty Apr 17, 2015
812a5c7
Fix TM2 test issues and update to latest common.authentication
markcowl Apr 18, 2015
47412e0
update tests
huangpf Apr 18, 2015
c525ab1
Regenerate CRP-NRPintegration test records
deepakswifty Apr 18, 2015
4f31e18
Merge pull request #2 from DeepakRajendranMsft/UpdateNrpClient
DeepakRajendranMsft Apr 18, 2015
2e92b6d
Sql2: Adding cmdlets for:
akromm-zz Mar 30, 2015
c5b48be
Adding default firewall rule for Azure IPs to cmdlet.
akromm-zz Mar 31, 2015
c9b751b
Addressing code review comments
akromm-zz Mar 31, 2015
c6c9349
Adding additional comments. Adding ResourceGroupName and ServerName …
akromm-zz Apr 1, 2015
b8ff697
Sql2: Added service objective CMDLETs and test.
akromm-zz Apr 1, 2015
a065772
Adding resource group cmdlets.
akromm-zz Apr 3, 2015
cc16808
Modifying Elastic Pool cmdlets.
akromm-zz Apr 3, 2015
25cddbf
Adding Get Elastic Pool Databases cmdlet.
akromm-zz Apr 6, 2015
91f6670
Fixing some cmdlets.
akromm-zz Apr 7, 2015
c9c194f
Working on adding tests, and refining cmdlets.
akromm-zz Apr 8, 2015
128c57c
Adding Position to parameters
akromm-zz Apr 9, 2015
7b3999e
Adding tests and tweaking new cmdlets.
akromm-zz Apr 9, 2015
9154e7d
Adding cmdlets for getting Elastic Pool activity.
akromm-zz Apr 10, 2015
00ccd61
Renaming all the cmdlets.
akromm-zz Apr 15, 2015
95e1ebe
Adding Database Usages to WindowsAzure namespace.
akromm-zz Apr 16, 2015
1962473
Adding Get Database Activity
akromm-zz Apr 17, 2015
93a47fc
Addressing Code review comments.
akromm-zz Apr 18, 2015
e728242
Merge pull request #110 from DeepakRajendranMsft/NicLbChanges
markcowl Apr 18, 2015
a8192e7
Fixing Tests.
akromm-zz Apr 18, 2015
87a0ff7
fix tests
huangpf Apr 18, 2015
4975ade
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
huangpf Apr 18, 2015
d88419f
Enable ARM partner/isv scenario
markcowl Apr 18, 2015
1321a57
Resolve upstream conflicts
markcowl Apr 18, 2015
d91bf85
update
huangpf Apr 18, 2015
33d09b2
merged
mumou Apr 18, 2015
33461ff
updating reference to Microsoft.IdentityModel.Clients.ActiveDirectory…
mumou Apr 18, 2015
c0592a2
Ext/Image cmdlets
huangpf Apr 18, 2015
b00eb2c
Merge pull request #55 from Azure/build
AzureRT Apr 18, 2015
a5a55e7
Image Cmdlets
huangpf Apr 18, 2015
61a02bf
update CRP package
huangpf Apr 18, 2015
322fe9f
Adding nuget dependencies
akromm-zz Apr 18, 2015
7213a89
test
huangpf Apr 18, 2015
500dbbe
update tests
huangpf Apr 18, 2015
5585861
update test
huangpf Apr 18, 2015
e265b2f
update
huangpf Apr 18, 2015
4413739
update instance view return
huangpf Apr 18, 2015
b7a63f5
remove unused package
huangpf Apr 19, 2015
6eae685
Merge pull request #97 from AzCiS/build
markcowl Apr 19, 2015
1584048
Merge pull request #109 from mumou/build
markcowl Apr 19, 2015
77c2842
Merge pull request #119 from markcowl/rpregistration
markcowl Apr 19, 2015
8c3641a
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
huangpf Apr 19, 2015
49585a2
Address CRs
huangpf Apr 19, 2015
828ede1
update
huangpf Apr 19, 2015
ce8c7b1
Merge pull request #56 from Azure/build
AzureRT Apr 19, 2015
b5d8103
Fix VM Image cmdlet
huangpf Apr 20, 2015
320d9a4
fix test
huangpf Apr 20, 2015
4809ba3
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
EmmaZhu Apr 20, 2015
7f67e7c
Fix unit test issues in storage account cmdlets.
EmmaZhu Apr 20, 2015
de53bde
Add storage account cmdlets change description to change log.
EmmaZhu Apr 20, 2015
c46a9ab
Format a line in change log.
EmmaZhu Apr 20, 2015
1f5b51e
Format a line in change log.
EmmaZhu Apr 20, 2015
398e072
Removing symbols.
akromm-zz Apr 20, 2015
134a1fa
Merge pull request #118 from akromm/build-ps-servercrud
ogail Apr 20, 2015
ac92fd3
Merge pull request #120 from huangpf/crp2
ogail Apr 20, 2015
6340730
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 20, 2015
96374a5
fix sql tests caused by missing record files
markcowl Apr 20, 2015
b6585f4
CustomScript extension, VMAccess extension cmdlets
Apr 20, 2015
21883ff
Merge pull request #123 from markcowl/fixsql
markcowl Apr 20, 2015
7164b53
Disabling failing tests which were not run when enabled
markcowl Apr 20, 2015
c732496
Merge branch 'build' of github.com:Azure/azure-powershell-pr into fixDSC
markcowl Apr 20, 2015
7b57c06
Merge pull request #8 from Azure/build
huangpf Apr 20, 2015
93c086c
update storage client & tests
huangpf Apr 20, 2015
54a80a1
Updating private Sql management package version
markcowl Apr 20, 2015
b2524f3
reverting test changes
markcowl Apr 20, 2015
371cfe3
Merge branch 'fixsql2' of https://github.com/markcowl/azure-powershel…
huangpf Apr 20, 2015
c60da92
remove unused pack
huangpf Apr 20, 2015
9d00c41
Merge pull request #126 from markcowl/fixsql2
markcowl Apr 20, 2015
9408db2
Merge pull request #127 from huangpf/crp2
markcowl Apr 20, 2015
61e901f
Merge branch 'crp2' of https://github.com/AzureRT/azure-powershell-pr…
Apr 20, 2015
1af17ca
Update get extension with a new api.
Apr 20, 2015
6074b72
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 20, 2015
64da4d3
Ignoreing DSC tests which were previoudly ignored
markcowl Apr 20, 2015
d12f91b
fix loadbalancer output format
deepakswifty Apr 20, 2015
ff8295d
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
deepakswifty Apr 20, 2015
2a13144
Updating version number to 0.9.0
markcowl Apr 21, 2015
66c9754
Merge pull request #130 from markcowl/fixDSC
markcowl Apr 21, 2015
0fc14b6
Merge pull request #9 from Azure/build
huangpf Apr 21, 2015
67e7d10
update
huangpf Apr 21, 2015
653873a
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 21, 2015
15405fc
update
huangpf Apr 21, 2015
e04b01d
Merge pull request #131 from markcowl/release-0.9.0
markcowl Apr 21, 2015
1f85619
update
huangpf Apr 21, 2015
c3a37c0
Merge pull request #10 from Azure/build
huangpf Apr 21, 2015
1ee9b0c
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
EmmaZhu Apr 21, 2015
ad95af3
Update PR according to comments
Apr 21, 2015
fb2a5ad
Update
Apr 21, 2015
5ad316f
Fix Checkin test
Apr 21, 2015
0ecb84b
Update
Apr 21, 2015
2200e3d
Fixing dll metadata for Authorization library
markcowl Apr 21, 2015
8cbdb07
Merge pull request #132 from markcowl/fixauthlib
markcowl Apr 21, 2015
0334c75
Merge pull request #11 from Azure/build
huangpf Apr 21, 2015
516fbe6
Disable two failed virtual machine unit test cases temporarily..
EmmaZhu Apr 21, 2015
823b5bd
Update CRP package & VM APIs
huangpf Apr 21, 2015
272f05e
Merge pull request #129 from hyonholee/crp2
markcowl Apr 21, 2015
842c2c2
Skip failed virtual machine cases.
EmmaZhu Apr 21, 2015
9cadca1
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
huangpf Apr 21, 2015
c7cff5b
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
EmmaZhu Apr 21, 2015
b778340
update tests
huangpf Apr 21, 2015
1ac43e4
Migration Related changes
parvezah Apr 21, 2015
7f76034
Adding the new MAML package
parvezah Apr 21, 2015
963ccad
Merge remote-tracking branch 'upstream/build' into build
parvezah Apr 21, 2015
88cbbde
Resolve several unit test failures.
EmmaZhu Apr 21, 2015
3b3183e
Merge pull request #100 from wastoresh/srp
ogail Apr 21, 2015
6883fea
1. added the changelog 2. added outtypes where needed
parvezah Apr 21, 2015
dd53467
Merge pull request #12 from Azure/build
huangpf Apr 21, 2015
3e3a508
update
huangpf Apr 21, 2015
1ab8165
update
huangpf Apr 21, 2015
8e47d2d
remove unused lib.
huangpf Apr 21, 2015
f42c8f8
Merge pull request #134 from huangpf/crp2
markcowl Apr 21, 2015
86a7690
Update VM Image Cmdlets
huangpf Apr 21, 2015
5ce54c9
Adding parameter to create a desktop collection
yadavbdev Apr 21, 2015
a3bba5f
update ext. image cmdlets
huangpf Apr 21, 2015
fc73486
Merge pull request #135 from AzCiS/build
markcowl Apr 21, 2015
5ae1b18
Merge branch 'build' of https://github.com/azure/azure-powershell-pr …
yadavbdev Apr 21, 2015
8c913fd
Merge pull request #13 from Azure/build
huangpf Apr 21, 2015
66e9af7
update image cmdlets
huangpf Apr 21, 2015
e942b5c
Update Disk Cmdlets
huangpf Apr 21, 2015
68fe0cf
Merge pull request #136 from yadavbdev/dev
Apr 21, 2015
bcfce79
update
huangpf Apr 21, 2015
456d100
Bug fixes on New-nic
deepakswifty Apr 21, 2015
5dce666
update
huangpf Apr 21, 2015
8c801cc
Merge pull request #14 from Azure/build
huangpf Apr 21, 2015
553d170
fix test script
huangpf Apr 22, 2015
29a3d62
comment out test for now according to @hovsepm's comment.
huangpf Apr 22, 2015
19e40c9
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 22, 2015
22baf8a
Merge pull request #138 from huangpf/crp2
Apr 22, 2015
638cca1
Merge pull request #137 from DeepakRajendranMsft/NrpBugFixes
Apr 22, 2015
0d0dd0e
Merge pull request #15 from Azure/build
huangpf Apr 22, 2015
ced64c5
test for pirv2
huangpf Apr 22, 2015
1311001
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 22, 2015
d33d474
Update SRP SDK to latest
Apr 22, 2015
bebb393
Update SRP SDK to 2.4.0
Apr 22, 2015
4109c04
Replace the SRP pacakge with latest 2.4
Apr 22, 2015
ac35cd6
Change New- cmdlets related with OSProfile to Add- cmdlets
Apr 22, 2015
92042fd
allow edits to dhcptoptions and vnet format fix
deepakswifty Apr 22, 2015
b572763
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 22, 2015
02c411c
Update SaveAzureVMImageCommand
huangpf Apr 22, 2015
de72acd
add negative test for data disks
huangpf Apr 22, 2015
1712c28
[Azure PowerShell]Add ODBC connection string credential encyrption su…
jtlibingus Apr 22, 2015
4d0d4bf
BUG: 3586662 Powershell - Usage cmdlets for retrieving usage across r…
gucalder Apr 22, 2015
20662a0
Merge pull request #144 from jtlibing/build
markcowl Apr 22, 2015
441e29b
Merge pull request #141 from wastoresh/srp
markcowl Apr 22, 2015
f5d355a
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
huangpf Apr 22, 2015
3ed0475
Merge pull request #143 from huangpf/crp2
markcowl Apr 22, 2015
bd5f226
FW: Fixing minor issues in the code, changing the return type of the …
gucalder Apr 22, 2015
69fd150
Add test for Get-Metric on a ElasticPool
jamestao Apr 22, 2015
113811b
FW: Removing unnecessary empty tag in project file.
gucalder Apr 22, 2015
52090d5
Test Recording for CustomScript and VMAccess extension tests
Apr 22, 2015
3cf6a30
Update according to comments
Apr 22, 2015
17b9289
FW: Fixing one more issue in the code (linebreak)
gucalder Apr 22, 2015
ef56c83
Add help file
deepakswifty Apr 22, 2015
0b3d946
Merge pull request #142 from hyonholee/crp2
markcowl Apr 22, 2015
c74ac51
Merge pull request #145 from AuxMon/build
markcowl Apr 22, 2015
d1fd2f6
Merge pull request #146 from jamestao/build
markcowl Apr 22, 2015
613aaed
Merge pull request #16 from Azure/build
huangpf Apr 22, 2015
2e337f1
update
huangpf Apr 22, 2015
8686d1b
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 22, 2015
6e0b9ea
Add Rdp file
deepakswifty Apr 22, 2015
0614630
add Get-RDP cmd and fix addnic
deepakswifty Apr 23, 2015
3e2718a
Merge pull request #148 from huangpf/crp2
markcowl Apr 23, 2015
5cc50a9
resolve merge conflicts
deepakswifty Apr 23, 2015
674b2a9
fix indedntation
deepakswifty Apr 23, 2015
4ab038e
NrpBugFixes
deepakswifty Apr 23, 2015
6f60546
Merge pull request #149 from DeepakRajendranMsft/NrpBugFixes
ogail Apr 23, 2015
199830a
Change parameter name, WinRMCertUrl to WinRMCertificateUrl
Apr 23, 2015
32abb93
Refine SRP storage account cmdlets help descriptions.
EmmaZhu Apr 23, 2015
b3bc453
Merge pull request #17 from Azure/build
huangpf Apr 23, 2015
de6f04d
Refine storage account cmdlets help descriptions.
EmmaZhu Apr 23, 2015
f3c341c
Adding the Azure.psd1 and Startup Changes
parvezah Apr 23, 2015
7c65fa6
Merge branch 'build' of https://github.com/AzCiS/azure-powershell-pr …
parvezah Apr 23, 2015
6a6baf2
Changing the version back to 0.9.0
parvezah Apr 23, 2015
4cb34a5
Changing the network dll back to what it is
parvezah Apr 23, 2015
6540f8a
Adding the aliases in this branch
parvezah Apr 23, 2015
bb155f9
Fix the format files
parvezah Apr 23, 2015
04ccf9f
Fix the types files
parvezah Apr 23, 2015
693d300
Fix the nested files
parvezah Apr 23, 2015
980e5df
Fixed the extra commas
parvezah Apr 23, 2015
8fdd3ef
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 23, 2015
23adb13
Adding the aliases for the migration related cmdlets
parvezah Apr 23, 2015
f206963
Fixing the spaces and tabs
parvezah Apr 23, 2015
06f2e7d
Adding the proper help file
parvezah Apr 23, 2015
20e3aa9
Fix PSVirtualMachine
huangpf Apr 23, 2015
d205136
update
huangpf Apr 23, 2015
90c8b9e
update test
huangpf Apr 23, 2015
5706468
Merge branch 'crp2' of https://github.com/huangpf/azure-powershell-pr…
huangpf Apr 23, 2015
29a1bfe
Merge pull request #151 from wastoresh/srp
ogail Apr 23, 2015
1325d1f
Merge pull request #152 from AzCiS/build
ogail Apr 23, 2015
cab67c9
Address CRs
huangpf Apr 23, 2015
87e0174
Merge pull request #150 from hyonholee/crp2
ogail Apr 23, 2015
a50b729
Merge pull request #154 from huangpf/crp2
ogail Apr 23, 2015
4e03822
Merge pull request #18 from Azure/build
huangpf Apr 23, 2015
0e84745
Update PS Output Types
huangpf Apr 23, 2015
a85c974
fix
huangpf Apr 23, 2015
6d22d4c
revert sln change
huangpf Apr 23, 2015
ed22ddd
Merge pull request #159 from huangpf/crp2
Apr 23, 2015
90c3563
update wxi
huangpf Apr 23, 2015
66f42da
Change parameter name 'ReferenceUri' to 'SourceVaultId'
Apr 23, 2015
e9d54c5
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 23, 2015
a3a5b97
Merge pull request #162 from huangpf/crp2
Apr 24, 2015
0eaa961
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 24, 2015
8fd98d4
fix tests
huangpf Apr 24, 2015
fae8ece
Merge pull request #165 from huangpf/crp2
ogail Apr 24, 2015
6f8dcbf
Merge pull request #163 from hyonholee/crp2
markcowl Apr 24, 2015
52c580a
Merge pull request #19 from Azure/build
huangpf Apr 24, 2015
fbe980e
update compute integration tests after crp update
deepakswifty Apr 24, 2015
a4cb297
Merge pull request #170 from DeepakRajendranMsft/FixCrpIntegrationTests
markcowl Apr 24, 2015
f02fbab
Merge branch 'build' of https://github.com/Azure/azure-powershell-pr …
Apr 24, 2015
4e3f028
Merge pull request #20 from Azure/build
huangpf Apr 24, 2015
b789eeb
Updating Help file, changing default extension version
Apr 24, 2015
c5973ea
Merge pull request #172 from hyonholee/crp2
markcowl Apr 24, 2015
6f1bd38
Merge pull request #21 from Azure/build
huangpf Apr 24, 2015
80cb367
update compute package
huangpf Apr 25, 2015
b84825a
Merge pull request #174 from huangpf/crp2
markcowl Apr 25, 2015
c487e3b
Merge pull request #24 from Azure/build
huangpf Apr 25, 2015
3613b14
Set-AzureVMPlan cmdlet
huangpf Apr 26, 2015
0884f86
update test
huangpf Apr 26, 2015
ed76e52
update test
huangpf Apr 26, 2015
419a639
update test
huangpf Apr 26, 2015
c91d6c5
Merge pull request #178 from huangpf/crp2
markcowl Apr 27, 2015
abd055c
Fix Location & VM Plan
huangpf Apr 27, 2015
c487776
Update Set-AzureVMSourceImage
huangpf Apr 27, 2015
b671845
Change function name to Canonicalize
huangpf Apr 28, 2015
284befe
Merge pull request #187 from huangpf/crp2
markcowl 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
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
0936a48
Update ChangeLog.txt
markcowl Apr 29, 2015
1cec159
Update ChangeLog.txt
markcowl Apr 29, 2015
3b0e601
Merging BUILD release from private repo
markcowl Apr 29, 2015
5aa3be1
Merge pull request #356 from markcowl/mergebuild
markcowl Apr 29, 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
  •  
  •  
  •  
78 changes: 58 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,13 +34,17 @@
<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\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"/>
Expand All @@ -48,11 +54,11 @@
<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"/>
</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 +68,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 +94,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 +181,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 +207,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 +275,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