Skip to content

Dev #136

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 87 commits into from
Feb 23, 2016
Merged

Dev #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
31796d0
Add Tokens property to Publish-AzureWebsiteProject
aneillans Jan 17, 2016
b123ec5
Default to the local package SetParameters.xml
aneillans Jan 18, 2016
8958b1c
tokens parsed as strings
aneillans Jan 18, 2016
f0da8a7
Added UninstallChefClient option in ASM
Jan 19, 2016
ab170f3
Fixes to use Path.Combine
aneillans Jan 20, 2016
3ae74e7
adding Rm to cmdlet name
Feb 3, 2016
04e55cc
Removing authentication classes from common and refactoring SM classes
markcowl Feb 9, 2016
c9163f3
Changes to storage cmdlets profile usage
markcowl Feb 9, 2016
9b25d78
Fixing default profile for SM storage cmdlets
markcowl Feb 9, 2016
fdc2d0b
Show warning instead of throw exception when StorageAccountName doesn…
yantang-msft Feb 9, 2016
9b0b39a
Removing Thread.Sleep from AzureBackup package.
Feb 9, 2016
e24d47c
Fixed Tread.Sleep in ApiManagement.
Feb 9, 2016
504bcee
Removing LogicApp long running tests.
Feb 10, 2016
4899dc5
Made RecordMode condition for all Sleep calls in test ps1 scripts.
Feb 10, 2016
fb66cbf
Merge branch 'dev' of github.com:Azure/azure-powershell into TestSpeedUp
Feb 10, 2016
5544702
Bringing back LogicApp tests.
Feb 10, 2016
e25f4ed
Running Test modules in parallel.
Feb 10, 2016
4749bee
Upgraded xunit to version 2.1.0
Feb 11, 2016
152eb95
Removed parallel execution for xunit tests.
Feb 11, 2016
63310cd
Removed test execution timeout.
Feb 11, 2016
6aeea72
Moving common.authenticatio9n library into PowerShell
markcowl Feb 12, 2016
24c3e05
Update namespaces and usings for new common.authentication type locat…
markcowl Feb 12, 2016
ac41f7e
Merging with upstream
markcowl Feb 12, 2016
4a95983
Adding common.authentication project to individual solution files for…
markcowl Feb 12, 2016
89c07d9
Adding necessary settings to new project file
markcowl Feb 12, 2016
aaf437a
Common.Authentication changes for cmdlets not in the refactoring solu…
markcowl Feb 12, 2016
6175950
Updating wix file for changes
markcowl Feb 12, 2016
6dc77fd
Fix Issue #46 Slect-Object fails for Get-AzureStoreSimpleStorageAccou…
markcowl Feb 12, 2016
3379cf9
Remvoing config from logicapp
markcowl Feb 12, 2016
f7f553b
Merge branch 'dev' of github.com:azure/azure-powershell into refactor
markcowl Feb 12, 2016
9bf0a3f
removing bcl build warning from new assembly
markcowl Feb 12, 2016
b4d8ab6
Removing app.config so conveniently added by nuget
markcowl Feb 12, 2016
3b9ede7
Updating test framework for new clients
markcowl Feb 13, 2016
0d40180
Remove test with unimplemented functionality and update test framewor…
markcowl Feb 13, 2016
1cc3f5a
Fixing tests
markcowl Feb 13, 2016
dd9d547
Upgraded to latest TestFramework
Feb 15, 2016
5a94a6f
Fixed build.proj and AzurePowershell.Test.targets to use Xunit 2.1
Feb 15, 2016
59409a5
Fixed test scripts to use test execution path for files.
Feb 15, 2016
30900a4
Fixed initial folder location in test files to use AppDomain.CurrentD…
Feb 15, 2016
17143b8
Fixed StoreSimple ASM test.
Feb 15, 2016
c03048b
wxi
huangpf Feb 15, 2016
5668b3c
Fixed ASM Post checkin recovery tests.
Feb 15, 2016
466cc78
Fixed Service component tests
Feb 15, 2016
82f517d
Fixed Dispose method's file closing exception.
Feb 15, 2016
76a5be3
Merge branch 'dev' of github.com:Azure/azure-powershell into TestSpeedUp
Feb 16, 2016
ac1e78c
Fixed SetsAzureEnvironment test in ASM.
Feb 16, 2016
e946659
Cleared all previous errors in PS script before running a new test.
Feb 16, 2016
54c05f0
Removed PlayBack mode check over Sleep-Start PS1 method calls.
Feb 16, 2016
11a0ab1
Reverted changes to Scaffolding ps1 files.
Feb 16, 2016
178dfae
Fixed typo in the comments.
Feb 16, 2016
f10e5b6
Fix Issue [#113662413] with Add-AzureRmAccount -Environment and add c…
markcowl Feb 17, 2016
57e5968
Fixed flaky WebSites ASM Test.
Feb 17, 2016
61f9fe0
Update LogicApp client to use new runtime version
markcowl Feb 17, 2016
05327e3
Fixed WarningOnIncompatibleVersions test.
Feb 17, 2016
ce70fae
Fixed SaveAzureWebsiteLogTest
Feb 17, 2016
44df9d5
Remove unnecessary overrides for DatCmdlet
markcowl Feb 17, 2016
141a19b
Merge pull request #1795 from hovsepm/TestSpeedUp
Feb 17, 2016
aaf889b
Merging with upstream changes
markcowl Feb 17, 2016
b9d10ce
Fixing bad merge
markcowl Feb 17, 2016
59d5f45
Adjusting to new project added to build
markcowl Feb 17, 2016
956d0ca
Merge pull request #1809 from markcowl/refactor
markcowl Feb 17, 2016
e7d9953
Merge pull request #1813 from Azure/storsimple-fix
markcowl Feb 17, 2016
c19a050
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
huangpf Feb 17, 2016
a9feeba
Merge pull request #1792 from huangpf/dev
markcowl Feb 17, 2016
ee88241
Merge pull request #1811 from yantang-msft/StorageWarningMsg
Feb 17, 2016
46facfe
Initial add of authentication tests
markcowl Feb 18, 2016
fc081f2
Merge pull request #411 from Azure/dev
huangpf Feb 18, 2016
6f45c53
Initial add of authentication tests
markcowl Feb 18, 2016
a454f1e
Updating file locations
markcowl Feb 18, 2016
3a831aa
finish rename
markcowl Feb 18, 2016
a1da4e6
wxi
huangpf Feb 18, 2016
2a9959f
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Feb 18, 2016
6ab15da
Responding to review feedback
markcowl Feb 18, 2016
bfcb8a4
Merge pull request #1673 from aneillans/dev
markcowl Feb 18, 2016
6d2af53
Merge pull request #1827 from markcowl/authtests
markcowl Feb 18, 2016
72c012d
Fix for set and remove arm cmdlet
eshaparmar Feb 18, 2016
dc8b4a8
Merge pull request #414 from Azure/dev
huangpf Feb 18, 2016
3b988b5
wxi
huangpf Feb 18, 2016
f970146
Merge branch 'dev' of https://github.com/huangpf/azure-powershell int…
huangpf Feb 18, 2016
9096dd6
rename cmd and add doc
Feb 20, 2016
8b07d6b
updated dsc scenario test
eshaparmar Feb 22, 2016
9beb177
Merge pull request #1832 from dscsolutions/dev0218
stankovski Feb 22, 2016
910f676
Merge pull request #415 from Azure/dev
huangpf Feb 22, 2016
cf8caa3
Merge pull request #1768 from shefaliv/rm
Feb 22, 2016
fa796e6
Merge pull request #418 from Azure/dev
huangpf Feb 23, 2016
92d6174
Merge pull request #1674 from ClogenyTechnologies/vj/add_uninstall_ch…
Feb 23, 2016
aa6553a
Merge pull request #419 from Azure/dev
huangpf Feb 23, 2016
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
  •  
  •  
  •  
39 changes: 29 additions & 10 deletions AzurePowershell.Test.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@
<XUnitTests Include=".\src\ResourceManager\ApiManagement\Commands.ApiManagement.Test\bin\Debug\Microsoft.Azure.Commands.ApiManagement.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\Profile\Commands.Profile.Test\bin\Debug\Microsoft.Azure.Commands.Profile.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\AzureBackup\Commands.AzureBackup.Test\bin\Debug\Microsoft.Azure.Commands.AzureBackup.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
<XUnitTests Include=".\src\ResourceManager\NotificationHubs\Commands.NotificationHubs.Test\bin\Debug\Microsoft.Azure.Commands.NotificationHubs.Test.dll"/>
<XUnitTests Include=".\src\Common\Commands.Common.Authentication.Test\bin\Debug\Microsoft.Azure.Commands.Common.Authentication.Test.dll"/>
<XUnitTests Include="@(AsmXUnitTests)"/>
</ItemGroup>
<ItemGroup Condition=" '$(scope)' == 'ServiceManagement' ">
Expand All @@ -98,19 +99,37 @@
<Target Name="InvokeXUnit" DependsOnTargets="DeclareXunitTests">
<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; -parallel none -maxthreads 0 -trait &quot;AcceptanceType=CheckIn&quot; -html &quot;$(TestOutputDirectory)\%(XUnitTests.Filename).html&quot;"
Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/>
<OnError ExecuteTargets="TimeoutErrorHandler"/>

<xunit
Assemblies="@(XUnitTests)"
AppDomains="true"
ShadowCopy="false"
ParallelizeTestCollections="false"
ParallelizeAssemblies="true"
IncludeTraits="AcceptanceType=CheckIn"
Html="$(TestOutputDirectory)\AzurePowershellTestResults.html"
MaxParallelThreads="10"
DiagnosticMessages="false"
ContinueOnError="false"
Condition=" @(XUnitTests) != '' "/>
</Target>

<Target Name="InvokeXUnitAll" DependsOnTargets="DeclareXunitTests">
<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"/>

<xunit
Assemblies="@(XUnitTests)"
AppDomains="true"
ShadowCopy="false"
ParallelizeTestCollections="false"
ParallelizeAssemblies="true"
ExcludeTraits="RunType=LiveOnly"
Html="$(TestOutputDirectory)\AzurePowershellAllTestResults.html"
MaxParallelThreads="10"
DiagnosticMessages="false"
ContinueOnError="false"
Condition=" @(XUnitTests) != '' "/>
</Target>

<Target Name="TimeoutErrorHandler">
Expand Down Expand Up @@ -458,7 +477,7 @@

<Target Name="LiveTests">
<MakeDir Directories="$(TestOutputDirectory)" ContinueOnError="false" />
<Exec Command="packages\xunit.runners.1.9.2\tools\xunit.console.clr4.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
<Exec Command="packages\xunit.runner.console.2.1.0\tools\xunit.console.x86.exe @(LiveTestDlls) /trait &quot;AcceptanceType=LiveBVT&quot; /html &quot;$(TestOutputDirectory)\Live.%(Filename).html&quot;" />
</Target>


Expand Down
2 changes: 1 addition & 1 deletion build.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Import Condition=" $(OnPremiseBuild) " Project="$(CIToolsPath)\Microsoft.WindowsAzure.Build.OnPremise.msbuild" />

<UsingTask
AssemblyFile="$(MSBuildProjectDirectory)\src\packages\xunit.MSBuild.2.0.0.0\tools\xunit.runner.msbuild.dll"
AssemblyFile="$(MSBuildProjectDirectory)\packages\xunit.runner.msbuild.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll"
TaskName="Xunit.Runner.MSBuild.xunit" />

<!-- Clean the build in all configurations -->
Expand Down
4 changes: 2 additions & 2 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="xunit.runner.console" version="2.0.0" />
<package id="xunit.runners" version="1.9.2" />
<package id="xunit.runner.console" version="2.1.0" />
<package id="xunit.runner.msbuild" version="2.1.0" />
</packages>
Loading