Skip to content

Merging dev into profile and adding test framework for profile cmldets #163

New issue

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

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

Already on GitHub? Sign in to your account

Closed
wants to merge 232 commits into from

Conversation

stankovski
Copy link
Member

No description provided.

elvg and others added 30 commits December 10, 2014 17:44
Merge all changes from mpenta and kirab
Conflicts:
	src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj
	src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj
	src/ServiceManagement/Automation/Commands.Automation/Common/AutomationClient.cs
	src/ServiceManagement/Automation/Commands.Automation/Common/AutomationCmdletParameterSet.cs
	src/ServiceManagement/Automation/Commands.Automation/Common/Constants.cs
	src/ServiceManagement/Automation/Commands.Automation/Common/IAutomationClient.cs
	src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.Designer.cs
	src/ServiceManagement/Automation/Commands.Automation/Properties/Resources.resx
unknown and others added 16 commits February 9, 2015 11:25
Conflicts:
	src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj
	src/ResourceManager/Insights/Commands.Insights/packages.config
	src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/Commands.ServiceManagement.Extensions.Test.csproj
StreamType should be enum + unit test fixed
Reimplementing the exisiting Automation cmdlets and adding new cmdlets
VM Sizes merge with Azure/dev
Conflicts:
	src/ServiceManagement/Automation/Commands.Automation/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config
	src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config
Azure RT Changes for Sprint 44
…profile

Conflicts:
	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/Properties/Resources.Designer.cs
	src/Common/Commands.Common/Properties/Resources.resx
	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/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/Commands.Insights.csproj
	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/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/Common/AutomationClient.cs
	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/HostedServices/NewAzureDeployment.cs
	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/Common/CloudServiceProject.cs
	src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs
	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
@stankovski
Copy link
Member Author

@azuresdkci retest this please

@ogail
Copy link
Contributor

ogail commented Feb 12, 2015

@stankovski regenerate the wix file (i.e. execute tools\BuildInstaller.ps1)

@jianghaolu
Copy link
Contributor

Closing in favor of #165

@jianghaolu jianghaolu closed this Feb 12, 2015
@stankovski stankovski deleted the profile branch September 11, 2015 17:35
AzureRT referenced this pull request in AzureRT/azure-powershell Oct 21, 2015
markcowl pushed a commit that referenced this pull request Apr 28, 2016
Added prompt in Remove Vault
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.