Skip to content

Commit 270237e

Browse files
ogailogail
ogail
authored and
ogail
committed
Merge branch 'master' of github.com:Azure/azure-powershell
Conflicts: ChangeLog.txt build.proj setup/azurecmd.wxs src/Common/Commands.Common.Storage/StorageUtilities.cs src/Common/Commands.Common.Test/Commands.Common.Test.csproj src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs src/Common/Commands.Common.Test/Properties/Resources.Designer.cs src/Common/Commands.Common.Test/Properties/Resources.resx src/Common/Commands.Common.Test/packages.config src/Common/Commands.Common/Common/AzurePowerShell.cs src/Common/Commands.Common/Common/ManagementConstants.cs src/Common/Commands.Common/Common/ProcessHelper.cs src/Common/Commands.Common/Common/ProfileClient.cs src/Common/Commands.Common/Properties/Resources.Designer.cs src/Common/Commands.Common/Properties/Resources.resx src/Common/Commands.Common/XmlSchema/ServiceConfigurationSchema.cs src/Common/Commands.Common/XmlSchema/ServiceDefinitionSchema.cs src/Common/Commands.Profile/Commands.Profile.csproj src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj src/Common/Commands.ScenarioTest/Resources/RunWebsitesTests.ps1 src/Common/Commands.ScenarioTest/Resources/Websites/WebsitesTests.ps1 src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTests.cs 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/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/linkedService.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/pipeline.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/PipelineTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/PipelineTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestCreateDataFactory.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDeleteDataFactoryWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetNonExistingDataFactory.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHub.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHubWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedService.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedServiceWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTable.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTableWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewLinkedServiceTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj src/ResourceManager/DataFactories/Commands.DataFactories/DataFactories/RemoveAzureDataFactoryCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SaveAzureDataFactoryLog.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Encrypt/NewAzureDataFactoryEncryptValueCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/GetAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/NewAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/NewAzureDataFactoryGatewayKeyCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/RemoveAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/SetAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/GetAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/NewAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/RemoveAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/GetAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/LinkedServiceContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/NewAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/RemoveAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataFactories.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Gateway.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataFactory.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataFactoryGateway.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSHub.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSLinkedService.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSPipeline.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSTable.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/GetAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/NewAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/PipelineContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/RemoveAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/ResumeAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/SetAzureDataFactoryPipelineActivePeriodCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/SuspendAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx src/ResourceManager/DataFactories/Commands.DataFactories/Tables/GetAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/NewAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/RemoveAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/TableContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/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/Microsoft.Azure.Commands.RedisCache.dll-Help.xml src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestAzureTagsEndToEnd.json src/ResourceManager/Resources/Commands.Resources.Test/packages.config src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1 src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.cs src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.ps1 src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseDisableEnableKeepProperties.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyKeepPreviousStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithEventTypeShortcuts.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithEventTypes.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDisableDatabaseAuditing.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDisableServerAuditing.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailWithBadDatabaseIndentity.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailWithBadServerIndentity.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedDatabaseUpdatePolicyWithNoStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedServerUpdatePolicyWithNoStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedUseServerDefault.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerDisableEnableKeepProperties.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyKeepPreviousStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithEventTypeShortcuts.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithEventTypes.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestUseServerDefault.json src/ResourceManager/Sql/Commands.Sql.Test/packages.config src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.xml src/ResourceManager/Sql/Commands.Sql/Properties/Resources.Designer.cs src/ResourceManager/Sql/Commands.Sql/Properties/Resources.resx src/ResourceManager/Sql/Commands.Sql/Security/Model/AuditingPolicy.cs src/ResourceManager/Sql/Commands.Sql/Security/Model/Constants.cs src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs src/ResourceManager/Sql/Commands.Sql/packages.config src/ServiceManagement.sln src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1 src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1 src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTBVTs.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTExtensions.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTFull.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/BVTTest.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ConfigDataInfo/AzureEndPointConfigInfo.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Constants.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTest.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTestCommonVhd.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/AddAzureEndpointCmdletInfo.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/SetAzureEndpointCmdletInfo.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/UpdateAzureVMImageCmdletInfo.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/LBandEndPointACLsTest.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/Utilities.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/DiskRepository/UpdateAzureVMImage.cs src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.format.ps1xml src/ServiceManagement/Compute/Commands.ServiceManagement/Model/OSImageContext.cs src/ServiceManagement/Compute/Commands.ServiceManagement/Model/VMImageContext.cs src/ServiceManagement/Compute/Commands.ServiceManagement/Model/VirtualNetworkSiteContext.cs src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1 src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CmdLetTests/CmdletHardCodes.cs src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CmdLetTests/NewClusterCmdletTests.cs src/ServiceManagement/HDInsight/Commands.HDInsight.Test/HDInsight/CommandTests/StartAzureHDInsightJobCommandTests.cs src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightClusterManagementClientSimulator.cs src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Models/Simulators/AzureHDInsightJobSubmissionClientSimulator.cs src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightConfigValuesCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightMetastoreCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AddAzureHDInsightStorageCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/AzureHdInsightPowerShellHardCodes.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/InvokeHiveCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightClusterCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/NewAzureHDInsightHiveJobDefinitionCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/SetAzureHDInsightDefaultStorageCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Cmdlet/StartAzureHDInsightJobCmdlet.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/BaseCommandInterfaces/INewAzureHDInsightHiveJobDefinitionBase.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/NewAzureHDInsightClusterCommand.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/NewAzureHDInsightHiveJobDefinitionCommand.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandImplementations/StartAzureHDInsightJobCommand.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/Commands/CommandInterfaces/INewAzureHDInsightClusterCommand.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/DataObjects/AzureHDInsightConfig.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/DataObjects/AzureHDInsightHiveJobDefinition.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/AzureHDInsightCommandFactory.cs src/ServiceManagement/HDInsight/Commands.HDInsight/Model/GetAzureHDInsightClusters/IAzureHDInsightCommandFactory.cs src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTests.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTests.ps1 src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/SessionRecords/Microsoft.Azure.Commands.ManagedCache.Test.ScenarioTests.ManagedCacheTests/ManagedCacheEndToEndTest.json src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj src/ServiceManagement/ManagedCache/Commands.ManagedCache/ManagedCacheCmdletBase.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.xml src/ServiceManagement/ManagedCache/Commands.ManagedCache/Models/CacheAccessKeys.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Models/CacheSkuCountConvert.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Models/MemoryDynamicParameterSet.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Models/PSCacheService.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Properties/Resources.Designer.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Properties/Resources.resx src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/GetAzureManagedCache.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/GetAzureManagedCacheAccessKey.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/NewAzureManagedCache.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/NewAzureManagedCacheAccessKey.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/RemoveAzureManagedCache.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/Service/SetAzureManagedCache.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache/lib/ManagedCacheClient.cs src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestCreateAndRemoveNSG.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestGetMultipleNSGs.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGFromSubnet.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGWithNonExistingName.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSR.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetAndGetNSGForSubnet.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSR.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSRWithInvalidParameter.json src/ServiceManagement/Network/Commands.Network.Test/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/Services/Commands.Test.Utilities/Common/FileSystemHelper.cs src/ServiceManagement/Services/Commands.Test/CloudService/Development/EnableAzureMemcacheRoleTests.cs src/ServiceManagement/Services/Commands.Test/CloudService/Development/SaveAzureServiceProjectPackageTests.cs src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj src/ServiceManagement/Services/Commands.Test/Websites/DisableAzureWebsiteDiagnosticTests.cs src/ServiceManagement/Services/Commands.Test/Websites/EnableAzureWebsiteDiagnosticTests.cs src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs src/ServiceManagement/Services/Commands.Test/Websites/PublishAzureWebsiteProjectTests.cs src/ServiceManagement/Services/Commands.Test/Websites/WebJobs/WebJobWrapperTest.cs src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 src/ServiceManagement/Services/Commands.Utilities/CloudService/CacheConfigurationFactory.cs src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/AzureTool.cs src/ServiceManagement/Services/Commands.Utilities/Common/AzureTools/CsPack.cs src/ServiceManagement/Services/Commands.Utilities/Common/CloudServiceProject.cs src/ServiceManagement/Services/Commands.Utilities/Microsoft.WindowsAzure.Commands.dll-Help.xml src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.Designer.cs src/ServiceManagement/Services/Commands.Utilities/Properties/Resources.resx src/ServiceManagement/Services/Commands.Utilities/WAPackIaaS/WebClient/Subscription.cs src/ServiceManagement/Services/Commands.Utilities/Websites/IWebsitesClient.cs src/ServiceManagement/Services/Commands.Utilities/Websites/PSTriggeredWebJob.cs src/ServiceManagement/Services/Commands.Utilities/Websites/Services/DeploymentEntities/DiagnosticsSettings.cs src/ServiceManagement/Services/Commands.Utilities/Websites/Services/Git.cs src/ServiceManagement/Services/Commands.Utilities/Websites/Services/LinkedRevisionControl.cs src/ServiceManagement/Services/Commands.Utilities/Websites/Services/WebEntities/SiteConfig.cs src/ServiceManagement/Services/Commands.Utilities/Websites/UriElements.cs src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs src/ServiceManagement/Services/Commands/Websites/DisableAzureWebsiteDiagnostic.cs src/ServiceManagement/Services/Commands/Websites/EnableAzureWebsiteDiagnostic.cs src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs src/ServiceManagement/Services/Commands/Websites/PublishAzureWebsiteProject.cs src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml src/ServiceManagement/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs tools/VerifyAzureSDK.ps1
2 parents 7309171 + e06a22c commit 270237e

File tree

338 files changed

+64283
-12274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

338 files changed

+64283
-12274
lines changed

ChangeLog.txt

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,43 @@
1+
2014.11.14 Version 0.8.11
2+
* Profile
3+
* Clear-AzureProfile: remove all subscription and credential data from the user store
4+
* Select-AzureSubscription: fixed output types in default and PassThru mode
5+
* Compute
6+
* Get-AzureVMSqlServerExtension
7+
* New-AzureVMSqlServerExtension
8+
* Set-AzureVMSqlServerExtension
9+
* Remove-AzureVMSqlServerExtension
10+
* HDInsight
11+
* New cmdlets
12+
* Add-AzureHDInisghtScriptAction
13+
* Set-AzureHDInsightClusterSize
14+
* Changed cmdlets
15+
*Added ConfigActions parameter
16+
* Managed Cache
17+
* Get-AzureManagedCacheNamedCache
18+
* New-AzureManagedCacheNamedCache
19+
* Set-AzureManagedCacheNamedCache
20+
* Remove-AzureManagedCacheNamedCache
21+
* Websites
22+
* Fixes for webjobs and site creation
23+
* Additional settings for Publish-AzureWebsiteProject cmdlet
24+
* Enable use of SAS URLs in ApplicationDiagnostics storage
25+
* Sql Database (AzureResourceManager)
26+
* New cmdlets to manage direct access to Sql databases:
27+
* Enable-AzureSqlDatabaseDirectAccess
28+
* Disable-AzureSqlDatabaseDirectAccess
29+
* Enable-AzureSqlDatabaseServerDirectAccess
30+
* Enable-AzureSqlDatabaseServerDirectAccess
31+
* Rename previous cmdlets to use the term audit policy instead of audit setting
32+
* Get-AzureSqlDatabaseAuditingPolicy
33+
* Set-AzureSqlDatabaseAuditingPolicy
34+
* Get-AzureSqlDatabaseServerAuditingPolicy
35+
* Set-AzureSqlDatabaseServerAuditingPolicy
36+
* Remove-AzureSqlDatabaseAuditing
37+
* Remove-AzureSqlDatabaseServerAuditing
38+
* Use-AzureSqlDatabaseServerAuditingPolicy
39+
* Allow users to define which storage account key (Primary or Secondary) to use when defining audit policy, using the “StorageKeyType” parameter.
40+
141
2014.10.27 Version 0.8.10
242
* Azure Data Factory cmdlets in AzureResourceManager mode
343
* New-AzureDataFactory
@@ -58,6 +98,33 @@
5898
* SlotStickyConnectionStringNames – connection string names not to be moved during swap operation
5999
* SlotStickyAppSettingNames – application settings names not to be moved during swap operation
60100
* AutoSwapSlotName – slot name to swap automatically with after successful deployment
101+
* Recovery Services
102+
* Import & view vault settings
103+
* Import-AzureSiteRecoveryVaultSettingsFile
104+
* Get-AzureSiteRecoveryVaultSettings
105+
* Enumerate Servers, Protection Containers, Protection Entities
106+
* Get-AzureSiteRecoveryServer
107+
* Get-AzureSiteRecoveryProtectionContainer
108+
* Get-AzureSiteRecoveryProtectionEntity
109+
* Get-AzureSiteRecoveryVM
110+
* Manage Azure Site Recovery Operations
111+
* Get-AzureSiteRecoveryJob
112+
* Restart-AzureSiteRecoveryJob
113+
* Resume-AzureSiteRecoveryJob
114+
* Stop-AzureSiteRecoveryJob
115+
* Manage Recovery Plan
116+
* New-AzureSiteRecoveryRecoveryPlan
117+
* Get-AzureSiteRecoveryRecoveryPlanFile
118+
* Get-AzureSiteRecoveryRecoveryPlan
119+
* Remove-AzureSiteRecoveryRecoveryPlan
120+
* Update-AzureSiteRecoveryRecoveryPlan
121+
* Protection and Failover Operations
122+
* Set-AzureSiteRecoveryProtectionEntity
123+
* Start-AzureSiteRecoveryCommitFailoverJob
124+
* Start-AzureSiteRecoveryPlannedFailoverJob
125+
* Start-AzureSiteRecoveryTestFailoverJob
126+
* Start-AzureSiteRecoveryUnplannedFailoverJob
127+
* Update-AzureSiteRecoveryProtectionDirection
61128

62129
2014.10.03 Version 0.8.9
63130
* Redis Cache cmdlets in AzureResourceManager mode

build.proj

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@
7272
ContinueOnError="false" />
7373
</Target>
7474

75+
<PropertyGroup>
76+
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
77+
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
78+
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
79+
</PropertyGroup>
80+
7581
<!--
7682
Force nuget package restore so that packages that include .targets files
7783
don't need to be checked into source control.
7884
-->
7985
<Target Name="ForceRestorePackages">
80-
<PropertyGroup>
81-
<NuGetCommand>$(MSBuildProjectDirectory)\src\.nuget\NuGet.exe</NuGetCommand>
82-
<NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
83-
<NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
84-
</PropertyGroup>
85-
8686
<ItemGroup>
8787
<NuGetCache Include="$(LOCALAPPDATA)\NuGet\Cache\*.nupkg"/>
8888
</ItemGroup>
@@ -94,12 +94,7 @@
9494
<WriteLinesToFile File="$(NuGetRestoreConfigFile)" Lines="&lt;configuration&gt;&lt;/configuration&gt;" Overwrite="true" Encoding="UTF-8" />
9595
<!-- Create config for user name and password for private feed access -->
9696
<Exec Command="$(NuGetCommand) sources add -Name AzureSdkInternal -Source &quot;https://www.myget.org/F/azure-sdk-internal/&quot; $(NuGetRestoreConfigSwitch)" />
97-
<!-- Private versions of packages are picked up from these feeds, defined with environment variables -->
98-
<Exec Command="$(NuGetCommand) sources add -Name PrimaryFeed -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" Condition=" '$(PRIVATE_FEED_URL)'!='' "/>
99-
<Exec Command="$(NuGetCommand) sources Update -Name PrimaryFeed -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)" EchoOff="true" Condition=" '$(PRIVATE_FEED_PASSWORD)'!='' AND '$(PRIVATE_FEED_USER_NAME)'!='' "/>
100-
<Exec Command="$(NuGetCommand) sources add -Name SecondaryFeed -Source &quot;$(SECONDARY_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" Condition=" '$(SECONDARY_FEED_URL)'!='' "/>
101-
<Exec Command="$(NuGetCommand) sources Update -Name SecondaryFeed -UserName $(SECONDARY_FEED_USER_NAME) -Password &quot;$(SECONDARY_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)" EchoOff="true" Condition=" '$(SECONDARY_FEED_PASSWORD)'!='' AND '$(SECONDARY_FEED_USER_NAME)'!='' "/>
102-
97+
<CallTarget Targets="ForceRestorePackagesFromPrivateFeed"/>
10398
<!-- Restore packages -->
10499
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\src\AzurePowerShell.sln $(NuGetRestoreConfigSwitch)" ContinueOnError="false" />
105100
<!-- delete config file, don't want to leave passwords hanging around on the build server file system -->
@@ -108,6 +103,12 @@
108103
<Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
109104
</Target>
110105

106+
<Target Name="ForceRestorePackagesFromPrivateFeed" Condition="'$(PRIVATE_FEED_PASSWORD)' != ''">
107+
<Exec Command="$(NuGetCommand) sources add -Name Hydra -Source &quot;$(PRIVATE_FEED_URL)&quot; $(NuGetRestoreConfigSwitch)" />
108+
<Exec Command="$(NuGetCommand) sources Update -Name Hydra -UserName $(PRIVATE_FEED_USER_NAME) -Password &quot;$(PRIVATE_FEED_PASSWORD)&quot; $(NuGetRestoreConfigSwitch)"
109+
EchoOff="true" />
110+
</Target>
111+
111112
<!-- Build all flavors of the Cmdlets -->
112113
<Target Name="BuildCmdlets" DependsOnTargets="ForceRestorePackages">
113114
<Message Importance="high" Text="Building Cmdlets..." />

setup/azurecmd.wxs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33

4-
<?define productName="Microsoft Azure PowerShell - October 2014" ?>
4+
<?define productName="Microsoft Azure PowerShell - November 2014" ?>
55
<?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
66
<?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
77

8-
<?define version="0.8.10.1" ?>
8+
<?define version="0.8.11" ?>
99
<?define versionedStartMenuFolder="Microsoft Azure" ?>
1010
<?define staleStartMenuFolder="Windows Azure" ?>
1111

src/Common/Commands.Common.Storage/StorageUtilities.cs

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
using Microsoft.WindowsAzure.Management.Storage;
44
using Microsoft.WindowsAzure.Storage;
55
using Microsoft.WindowsAzure.Storage.Auth;
6+
using Microsoft.WindowsAzure.Storage.Blob;
7+
using Microsoft.WindowsAzure.Storage.Table;
68

79
namespace Microsoft.WindowsAzure.Commands.Common.Storage
810
{
@@ -41,5 +43,37 @@ public static CloudStorageAccount GenerateCloudStorageAccount(StorageManagementC
4143
tableEndpoint,
4244
fileEndpoint);
4345
}
46+
47+
public static string GenerateTableStorageSasUrl(string connectionString, string tableName, DateTime expiryTime, SharedAccessTablePermissions permissions)
48+
{
49+
CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString);
50+
CloudTableClient tableClient = storageAccount.CreateCloudTableClient();
51+
CloudTable tableReference = tableClient.GetTableReference(tableName);
52+
tableReference.CreateIfNotExists();
53+
var sasToken = tableReference.GetSharedAccessSignature(
54+
new SharedAccessTablePolicy()
55+
{
56+
SharedAccessExpiryTime = expiryTime,
57+
Permissions = permissions
58+
});
59+
60+
return tableReference.Uri + sasToken;
61+
}
62+
63+
public static string GenerateBlobStorageSasUrl(string connectionString, string blobContainerName, DateTime expiryTime, SharedAccessBlobPermissions permissions)
64+
{
65+
CloudStorageAccount storageAccount = CloudStorageAccount.Parse(connectionString);
66+
CloudBlobClient blobClient = storageAccount.CreateCloudBlobClient();
67+
CloudBlobContainer blobContainer = blobClient.GetContainerReference(blobContainerName);
68+
blobContainer.CreateIfNotExists();
69+
var sasToken = blobContainer.GetSharedAccessSignature(
70+
new SharedAccessBlobPolicy()
71+
{
72+
SharedAccessExpiryTime = expiryTime,
73+
Permissions = permissions
74+
});
75+
76+
return blobContainer.Uri + sasToken;
77+
}
4478
}
4579
}

src/Common/Commands.Common.Test/Commands.Common.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</Reference>
5656
<Reference Include="Microsoft.Azure.Utilities.HttpRecorder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5757
<SpecificVersion>False</SpecificVersion>
58-
<HintPath>..\..\packages\Hydra.HttpRecorder.1.0.5406.28672-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
58+
<HintPath>..\..\packages\Hydra.HttpRecorder.1.0.5417.13285-prerelease\lib\net45\Microsoft.Azure.Utilities.HttpRecorder.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6161
<HintPath>..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>

0 commit comments

Comments
 (0)