Skip to content

Merging the Azure master with Azure dev #263

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

Jump to bottom
Closed
wants to merge 152 commits into from
Closed

Merging the Azure master with Azure dev #263

wants to merge 152 commits into from

Conversation

yadavbdev
Copy link
Contributor

Also fixes a shared CommandRuntimeMock implementation and affected tests
Add back RemoteApp Unit tests

yadavbdev and others added 30 commits February 24, 2015 19:12
@yadavbdev
Initial version of the Azure RemoteApp PowerShell cmdlet
3ef3a17
@yadavbdev
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
782014a
@yadavbdev
Changed to use the Context from Azure Authentication
64f6321
@yadavb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
28715bd
@yadavb
Adding RemoteApp projects in to the .sln
fe60f9f
@yadavb
Updated RemoteApp project to use the public version of Azure RemoteAp…
b8e838d 
…p SDK
@yadavb
Merge branch 'using_public_sdk' into dev
e495a49
@gucalder
BUG: 3223618 Create Powershell Commandlets for Alerts
e24a53d
@gucalder
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
bc07c3f
@yadavbdev
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
2de5272
@yadavbdev
Upgrading to use Azure RemoteApp v1.0.7
07e643c
@yadavbdev
Updated to use the Azure RemoteApp v1.0.7
0ec01db 
Included Amarpreet's changes for the new features
@xamarsinx
Merge branch 'dev' of https://github.com/yadavbdev/azure-powershell i…
b166d38 
…nto dev

Conflicts:
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config
@gucalder
FW: Include references in the project (the installer fails without them)
09222ca
@yadavbdev
Fixing the CI build break
35aa503
@yadavbdev
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
312f697
@yadavbdev
Bug 1796479:OneSDK: Address feedback from Azure PS team
09e51ec
@relmer
Bug 1827560:*Get-AzureRemoteAppCollection should not show vnet if it …
1f51213 
…was created by the backend (simplevnet-*)
@relmer
Bug 1856319:$ Remove Get-AzureRemoteAppUploadScript
f19825b
@yadavbdev
Bug 1856290:Remove Get-AzureRemoteAppResetVpnSharedKey -- make Reset-…
5e53e38 
…xxx synchronous.
@relmer
Bug 1856407:$Set-AzureRemoteAppCollection -- remove OU
3fe6eac
@yadavbdev
Ignoring all the failing tests for now, will revisit later
575a09b
@yadavbdev
Merge branch 'bugfix' into dev
97788a2
@yadavbdev
Merge branch 'dev' of https://github.com/relmer/azure-powershell into…
d48983c 
… robdev
@yadavbdev
Parameter help message updated to include wild card support.
c7f0c4d
@relmer
Bug 1856505:$Vnet cmdlets: param should be VNetName, not VnetName.
ac94a29
@yadavbdev
Fixed the potential null ref issue
d0f46c3
@xamarsinx
Merge branch 'dev' of https://github.com/yadavbdev/azure-powershell i…
6f7ae0c 
…nto dev
@xamarsinx
Bug 1857745:New-AzureRemoteAppTemplateImage is not catching errors in…
a1e3ac5 
… the upload script

and adding feature check
@relmer
Bug 1856575:*Some cmdlets aren't showing all params in get-help
88966d4
yadavb and others added 24 commits March 7, 2015 09:57
@yadavb
Fixing the help file
ecf6a6d
@ogail
Merge pull request Azure#246 from yadavbdev/release-0.8.15
d5fa78f 
Fixing the help file
@markcowl
Update ChangeLog.txt
bbad09f
@markcowl
Update ChangeLog.txt
84e4692
@markcowl
Fixing startup issue on new mcahines and RP registration issue
3b21cc3
@markcowl
Fixing test infrastructure to mirror change in client creation
1b66abb
@markcowl
Fixing issue with hdinsight tests
435358c
@markcowl
fix for hdinsight tests
fc2eaa0
@markcowl
fix for hdinsight tests2
7d92474
@markcowl
Merge pull request Azure#250 from markcowl/profilehelp
3f65200 
Fixing startup issue on new machines and RP registration issue
@yadavb
Revert "Removing the MS Test cases from the build"
cde9b83 
This reverts commit bc68d11.
@yadavb
Merge branch 'release-0.8.15' of https://github.com/Azure/azure-power…
ad70492 
…shell into working_dev
@yadavbdev
Merge branch 'release-0.8.15' of https://github.com/Azure/azure-power…
8f8e719 
…shell into dev
@markcowl
Update ChangeLog.txt
5a7a90f
@markcowl
Merge pull request Azure#254 from Azure/release-0.8.15
95bab06 
Release 0.8.15
@yadavb
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
21007ba 
…to dev
@yadavb
Merge branch 'dev' of https://github.com/yadavbdev/azure-powershell i…
9a09049 
…nto dev
@yadavb
Fixing a bug in the mock file
fbbed5c
@yadavb
Revert "Fixing a bug in the mock file"
4c37544 
This reverts commit fbbed5c.
@yadavb
Updated to the RemoteApp v1.0.8 SDK
e7aedc8
@yadavb
Fixing a bug in the mock file
44f49b6
@yadavb
Merge branch 'dev' into working_dev
71a69c4
@yadavb
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
277ecb6 
…working_dev

Conflicts:
	src/AzurePowershell.sln
	src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj
	src/Common/Commands.Common.Storage/packages.config
	src/Common/Commands.Common.Test/Commands.Common.Test.csproj
	src/Common/Commands.Common.Test/packages.config
	src/Common/Commands.Common/Commands.Common.csproj
	src/Common/Commands.Common/packages.config
	src/Common/Commands.Profile/Commands.Profile.csproj
	src/Common/Commands.Profile/packages.config
	src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj
	src/Common/Commands.ScenarioTest/packages.config
	src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj
	src/Common/Commands.ScenarioTests.Common/packages.config
	src/ResourceManager.sln
	src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj
	src/ResourceManager/Batch/Commands.Batch.Test/packages.config
	src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj
	src/ResourceManager/Batch/Commands.Batch/packages.config
	src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj
	src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config
	src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj
	src/ResourceManager/DataFactories/Commands.DataFactories/packages.config
	src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj
	src/ResourceManager/Insights/Commands.Insights.Test/packages.config
	src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
	src/ResourceManager/Insights/Commands.Insights/packages.config
	src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj
	src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config
	src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj
	src/ResourceManager/KeyVault/Commands.KeyVault/packages.config
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
	src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config
	src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
	src/ResourceManager/RedisCache/Commands.RedisCache/packages.config
	src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj
	src/ResourceManager/Resources/Commands.Resources.Test/packages.config
	src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj
	src/ResourceManager/Resources/Commands.Resources/packages.config
	src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj
	src/ResourceManager/Sql/Commands.Sql.Test/packages.config
	src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj
	src/ResourceManager/Sql/Commands.Sql/packages.config
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj
	src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config
	src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj
	src/ResourceManager/Tags/Commands.Tags/packages.config
	src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj
	src/ResourceManager/Websites/Commands.Websites/packages.config
	src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj
	src/ServiceManagement/Automation/Commands.Automation.Test/packages.config
	src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj
	src/ServiceManagement/Automation/Commands.Automation/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/Commands.ServiceManagement.Extensions.Test.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config
	src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj
	src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj
	src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj
	src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config
	src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj
	src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config
	src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj
	src/ServiceManagement/ManagedCache/Commands.ManagedCache/packages.config
	src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj
	src/ServiceManagement/Network/Commands.Network.Test/packages.config
	src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj
	src/ServiceManagement/Network/Commands.Network/packages.config
	src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj
	src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config
	src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj
	src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/packages.config
	src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj
	src/ServiceManagement/Services/Commands.Test.Utilities/packages.config
	src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj
	src/ServiceManagement/Services/Commands.Test/packages.config
	src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj
	src/ServiceManagement/Services/Commands.Utilities/packages.config
	src/ServiceManagement/Services/Commands/Commands.csproj
	src/ServiceManagement/Services/Commands/packages.config
	src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj
	src/ServiceManagement/Sql/Commands.SqlDatabase.Test/packages.config
	src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj
	src/ServiceManagement/Sql/Commands.SqlDatabase/packages.config
	src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj
	src/ServiceManagement/StorSimple/Commands.StorSimple.Test/packages.config
	src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj
	src/ServiceManagement/StorSimple/Commands.StorSimple/packages.config
	src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj
	src/ServiceManagement/Storage/Commands.Storage.Test/packages.config
	src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj
	src/ServiceManagement/Storage/Commands.Storage/packages.config
	src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj
	src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config
	src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj
	src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config
@yadavb
Merge branch 'dev' into from_master
911d06f 
Conflicts:
	src/AzurePowershell.sln
@azurecla
Copy link

Hi @yadavbdev, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!


It looks like you're working at Microsoft (yadavb). If you're full-time, we DON'T require a contribution license agreement.



If you are a vendor, or work for Microsoft Open Technologies, DO please sign the electronic contribution license agreement. It will take 2 minutes and there's no faxing! https://cla.azure.com.

TTYL, AZPRBOT;

@AzureRT
Copy link
Contributor

AzureRT commented Mar 13, 2015

Can one of the admins verify this patch?

@markcowl markcowl closed this Mar 13, 2015
huangpf added a commit to AzureRT/azure-powershell that referenced this pull request Dec 19, 2015
@huangpf
Merge pull request Azure#263 from Azure/clu
6791640 
Clu
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@yadavbdev @azurecla @AzureRT @markcowl @yadavb @gucalder @xamarsinx @relmer @chadiel @ogail