Merged
Conversation
…shell into dev Conflicts: src/Common/Commands.Common.Storage/packages.config src/Common/Commands.Common.Test/packages.config src/Common/Commands.Common/packages.config src/Common/Commands.Profile/packages.config src/Common/Commands.ScenarioTest/packages.config src/Common/Commands.ScenarioTests.Common/packages.config src/ResourceManager/Batch/Commands.Batch.Test/packages.config src/ResourceManager/Batch/Commands.Batch/packages.config src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories/packages.config src/ResourceManager/Insights/Commands.Insights.Test/packages.config src/ResourceManager/Insights/Commands.Insights/packages.config src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config src/ResourceManager/KeyVault/Commands.KeyVault/packages.config src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config src/ResourceManager/RedisCache/Commands.RedisCache/packages.config src/ResourceManager/Resources/Commands.Resources.Test/packages.config src/ResourceManager/Resources/Commands.Resources/packages.config src/ResourceManager/Sql/Commands.Sql.Test/packages.config src/ResourceManager/Sql/Commands.Sql/packages.config src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config src/ResourceManager/Tags/Commands.Tags/packages.config src/ResourceManager/Websites/Commands.Websites/packages.config src/ServiceManagement/Automation/Commands.Automation.Test/packages.config src/ServiceManagement/Automation/Commands.Automation/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache/packages.config src/ServiceManagement/Network/Commands.Network.Test/packages.config src/ServiceManagement/Network/Commands.Network/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/packages.config src/ServiceManagement/Services/Commands.Test.Utilities/packages.config src/ServiceManagement/Services/Commands.Test/packages.config src/ServiceManagement/Services/Commands.Utilities/packages.config src/ServiceManagement/Services/Commands/packages.config src/ServiceManagement/Sql/Commands.SqlDatabase.Test/packages.config src/ServiceManagement/Sql/Commands.SqlDatabase/packages.config src/ServiceManagement/StorSimple/Commands.StorSimple.Test/packages.config src/ServiceManagement/StorSimple/Commands.StorSimple/packages.config src/ServiceManagement/Storage/Commands.Storage.Test/packages.config src/ServiceManagement/Storage/Commands.Storage/packages.config src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config
…shell into dev 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/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.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj src/ResourceManager/Batch/Commands.Batch/Commands.Batch.csproj src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj 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/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj 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/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/Commands.ServiceManagement.Extensions.Test.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj src/ServiceManagement/Services/Commands/Commands.csproj src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj src/ServiceManagement/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj src/ServiceManagement/Storage/Commands.Storage/Commands.Storage.csproj src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config
Conflicts: src/AzurePowershell.sln src/ResourceManager.sln src/ResourceManager/Websites/Commands.Websites/packages.config
Conflicts: src/AzurePowershell.sln src/ResourceManager.sln src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj src/ResourceManager/Websites/Commands.Websites/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj
Owner
There was a problem hiding this comment.
Why is it StringComparison.OrdinalIgnoreCase instead of StringComparison.InvariantCultureIgnoreCase ?
Collaborator
Author
There was a problem hiding this comment.
I think we are only handling ASCII characters, so I think the StringComparison.OrdinalIgnoreCase one is enough.
Collaborator
Author
|
retest this please |
AzureRT
pushed a commit
that referenced
this pull request
May 8, 2015
AzureRT
pushed a commit
that referenced
this pull request
Jul 20, 2015
Add support for piping timezone info in Set-ASSDevice
hyonholee
pushed a commit
to hyonholee/azure-powershell
that referenced
this pull request
May 25, 2016
New Graphical Runbook types
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.