diff --git a/src/Accounts/Accounts/ChangeLog.md b/src/Accounts/Accounts/ChangeLog.md index a281b19be8db..f5cb080df1a7 100644 --- a/src/Accounts/Accounts/ChangeLog.md +++ b/src/Accounts/Accounts/ChangeLog.md @@ -18,6 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Added parameter "ContainerRegistryEndpointSuffix" to: `Add-AzEnvironment`, `Set-AzEnvironment` * Supported interrupting login by hitting CTRL+C * Fixed an issue causing `Connect-AzAccount -KeyVaultAccessToken` not working [#13127] * Fixed null reference and method case insensitive in `Invoke-AzRestMethod` diff --git a/src/Accounts/Accounts/Environment/AddAzureRMEnvironment.cs b/src/Accounts/Accounts/Environment/AddAzureRMEnvironment.cs index 0e082004e0e9..d373d4770929 100644 --- a/src/Accounts/Accounts/Environment/AddAzureRMEnvironment.cs +++ b/src/Accounts/Accounts/Environment/AddAzureRMEnvironment.cs @@ -196,6 +196,12 @@ public string DataLakeAudience HelpMessage = "Dns suffix of Azure Synapse Analytics.")] public string AzureSynapseAnalyticsEndpointSuffix { get; set; } + [Parameter(ParameterSetName = EnvironmentPropertiesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, + HelpMessage = "Suffix of Azure Container Registry.")] + [Parameter(ParameterSetName = MetadataParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, + HelpMessage = "Suffix of Azure Container Registry.")] + public string ContainerRegistryEndpointSuffix { get; set; } + [Parameter(ParameterSetName = EnvironmentPropertiesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.")] [Parameter(ParameterSetName = MetadataParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, @@ -327,7 +333,8 @@ public override void ExecuteCmdlet() nameof(StorageEndpoint)); SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.ActiveDirectory, nameof(ActiveDirectoryEndpoint), true); - + SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.ContainerRegistryEndpointSuffix, + nameof(ContainerRegistryEndpointSuffix)); SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId, nameof(ActiveDirectoryServiceEndpointResourceId)); diff --git a/src/Accounts/Accounts/Environment/SetAzureRMEnvironment.cs b/src/Accounts/Accounts/Environment/SetAzureRMEnvironment.cs index 5571d47a93aa..d27a74fe2edf 100644 --- a/src/Accounts/Accounts/Environment/SetAzureRMEnvironment.cs +++ b/src/Accounts/Accounts/Environment/SetAzureRMEnvironment.cs @@ -176,6 +176,12 @@ public string DataLakeAudience HelpMessage = "Dns suffix of Azure Synapse Analytics.")] public string AzureSynapseAnalyticsEndpointSuffix { get; set; } + [Parameter(ParameterSetName = EnvironmentPropertiesParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, + HelpMessage = "Suffix of Azure Container Registry.")] + [Parameter(ParameterSetName = MetadataParameterSet, Mandatory = false, ValueFromPipelineByPropertyName = true, + HelpMessage = "Suffix of Azure Container Registry.")] + public string ContainerRegistryEndpointSuffix { get; set; } + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The resource identifier of the Azure Synapse Analytics that is the recipient of the requested token.")] public string AzureSynapseAnalyticsEndpointResourceId { get; set; } @@ -339,6 +345,8 @@ public override void ExecuteCmdlet() nameof(AzureAttestationServiceEndpointResourceId)); SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AzureSynapseAnalyticsEndpointSuffix, nameof(AzureSynapseAnalyticsEndpointSuffix)); + SetEndpointIfBound(newEnvironment, AzureEnvironment.Endpoint.ContainerRegistryEndpointSuffix, + nameof(ContainerRegistryEndpointSuffix)); SetEndpointIfBound(newEnvironment, AzureEnvironment.ExtendedEndpoint.AzureSynapseAnalyticsEndpointResourceId, nameof(AzureSynapseAnalyticsEndpointResourceId)); WriteObject(new PSAzureEnvironment(profileClient.AddOrSetEnvironment(newEnvironment))); diff --git a/src/Accounts/Accounts/help/Add-AzEnvironment.md b/src/Accounts/Accounts/help/Add-AzEnvironment.md index ae6f04de7ff0..14055caea1aa 100644 --- a/src/Accounts/Accounts/help/Add-AzEnvironment.md +++ b/src/Accounts/Accounts/help/Add-AzEnvironment.md @@ -27,8 +27,9 @@ Add-AzEnvironment [-Name] [[-PublishSettingsFileUrl] ] [[-Servi [[-AzureOperationalInsightsEndpoint] ] [-AzureAnalysisServicesEndpointSuffix ] [-AzureAnalysisServicesEndpointResourceId ] [-AzureAttestationServiceEndpointSuffix ] [-AzureAttestationServiceEndpointResourceId ] [-AzureSynapseAnalyticsEndpointSuffix ] - [-AzureSynapseAnalyticsEndpointResourceId ] [-Scope ] - [-DefaultProfile ] [-WhatIf] [-Confirm] [] + [-ContainerRegistryEndpointSuffix ] [-AzureSynapseAnalyticsEndpointResourceId ] + [-Scope ] [-DefaultProfile ] [-WhatIf] [-Confirm] + [] ``` ### ARMEndpoint @@ -39,14 +40,14 @@ Add-AzEnvironment [-Name] [[-StorageEndpoint] ] [-ARMEndpoint] [[-AzureOperationalInsightsEndpointResourceId] ] [[-AzureOperationalInsightsEndpoint] ] [-AzureAnalysisServicesEndpointSuffix ] [-AzureAnalysisServicesEndpointResourceId ] [-AzureAttestationServiceEndpointSuffix ] [-AzureAttestationServiceEndpointResourceId ] - [-AzureSynapseAnalyticsEndpointSuffix ] [-AzureSynapseAnalyticsEndpointResourceId ] - [-Scope ] [-DefaultProfile ] [-WhatIf] [-Confirm] - [] + [-AzureSynapseAnalyticsEndpointSuffix ] [-ContainerRegistryEndpointSuffix ] + [-AzureSynapseAnalyticsEndpointResourceId ] [-Scope ] + [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` ### Discovery ``` -Add-AzEnvironment -AutoDiscover [-Uri ] [-Scope {Process | CurrentUser}] +Add-AzEnvironment [-AutoDiscover] [-Uri ] [-Scope ] [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` @@ -429,6 +430,21 @@ Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` +### -ContainerRegistryEndpointSuffix +Suffix of Azure Container Registry. + +```yaml +Type: System.String +Parameter Sets: Name, ARMEndpoint +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: True (ByPropertyName) +Accept wildcard characters: False +``` + ### -DataLakeAudience The audience for tokens authenticating with the AD Data Lake services Endpoint. diff --git a/src/Accounts/Accounts/help/Set-AzEnvironment.md b/src/Accounts/Accounts/help/Set-AzEnvironment.md index 0dceadd1d673..eb048006e871 100644 --- a/src/Accounts/Accounts/help/Set-AzEnvironment.md +++ b/src/Accounts/Accounts/help/Set-AzEnvironment.md @@ -27,8 +27,9 @@ Set-AzEnvironment [-Name] [[-PublishSettingsFileUrl] ] [[-Servi [[-AzureOperationalInsightsEndpoint] ] [-AzureAnalysisServicesEndpointSuffix ] [-AzureAnalysisServicesEndpointResourceId ] [-AzureAttestationServiceEndpointSuffix ] [-AzureAttestationServiceEndpointResourceId ] [-AzureSynapseAnalyticsEndpointSuffix ] - [-AzureSynapseAnalyticsEndpointResourceId ] [-Scope ] - [-DefaultProfile ] [-WhatIf] [-Confirm] [] + [-ContainerRegistryEndpointSuffix ] [-AzureSynapseAnalyticsEndpointResourceId ] + [-Scope ] [-DefaultProfile ] [-WhatIf] [-Confirm] + [] ``` ### ARMEndpoint @@ -39,9 +40,9 @@ Set-AzEnvironment [-Name] [[-StorageEndpoint] ] [-ARMEndpoint] [[-AzureOperationalInsightsEndpointResourceId] ] [[-AzureOperationalInsightsEndpoint] ] [-AzureAnalysisServicesEndpointSuffix ] [-AzureAnalysisServicesEndpointResourceId ] [-AzureAttestationServiceEndpointSuffix ] [-AzureAttestationServiceEndpointResourceId ] - [-AzureSynapseAnalyticsEndpointSuffix ] [-AzureSynapseAnalyticsEndpointResourceId ] - [-Scope ] [-DefaultProfile ] [-WhatIf] [-Confirm] - [] + [-AzureSynapseAnalyticsEndpointSuffix ] [-ContainerRegistryEndpointSuffix ] + [-AzureSynapseAnalyticsEndpointResourceId ] [-Scope ] + [-DefaultProfile ] [-WhatIf] [-Confirm] [] ``` ## DESCRIPTION @@ -187,6 +188,7 @@ Default value: None Accept pipeline input: False Accept wildcard characters: False ``` + ### -AzureAttestationServiceEndpointResourceId The The resource identifier of the Azure Attestation service that is the recipient of the requested token. @@ -198,7 +200,7 @@ Aliases: Required: False Position: Named Default value: None -Accept pipeline input: False +Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` @@ -213,7 +215,7 @@ Aliases: Required: False Position: Named Default value: None -Accept pipeline input: False +Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` @@ -318,7 +320,7 @@ Aliases: Required: False Position: Named Default value: None -Accept pipeline input: False +Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` @@ -333,7 +335,7 @@ Aliases: Required: False Position: Named Default value: None -Accept pipeline input: False +Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` @@ -352,6 +354,21 @@ Accept pipeline input: True (ByPropertyName) Accept wildcard characters: False ``` +### -ContainerRegistryEndpointSuffix +Suffix of Azure Container Registry. + +```yaml +Type: System.String +Parameter Sets: (All) +Aliases: + +Required: False +Position: Named +Default value: None +Accept pipeline input: True (ByPropertyName) +Accept wildcard characters: False +``` + ### -DataLakeAudience The audience for tokens authenticating with the AD Data Lake services Endpoint. @@ -609,7 +626,7 @@ Accept wildcard characters: False ``` ### CommonParameters -This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216). +This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216). ## INPUTS diff --git a/src/Accounts/Authentication.ResourceManager/ContextModelExtensions.cs b/src/Accounts/Authentication.ResourceManager/ContextModelExtensions.cs index db4cf2048ac2..fee0ec08f27a 100644 --- a/src/Accounts/Authentication.ResourceManager/ContextModelExtensions.cs +++ b/src/Accounts/Authentication.ResourceManager/ContextModelExtensions.cs @@ -137,7 +137,8 @@ public static IAzureEnvironment Merge(this IAzureEnvironment environment1, IAzur ServiceManagementUrl = environment1.ServiceManagementUrl ?? environment2.ServiceManagementUrl, SqlDatabaseDnsSuffix = environment1.SqlDatabaseDnsSuffix ?? environment2.SqlDatabaseDnsSuffix, StorageEndpointSuffix = environment1.StorageEndpointSuffix ?? environment2.StorageEndpointSuffix, - TrafficManagerDnsSuffix = environment1.TrafficManagerDnsSuffix ?? environment2.TrafficManagerDnsSuffix + TrafficManagerDnsSuffix = environment1.TrafficManagerDnsSuffix ?? environment2.TrafficManagerDnsSuffix, + ContainerRegistryEndpointSuffix = environment1.ContainerRegistryEndpointSuffix ?? environment2.ContainerRegistryEndpointSuffix }; foreach (var property in environment1.ExtendedProperties.Keys.Union(environment2.ExtendedProperties.Keys)) diff --git a/tools/Common.Netcore.Dependencies.targets b/tools/Common.Netcore.Dependencies.targets index 873343ee127d..a73db06bbdf5 100644 --- a/tools/Common.Netcore.Dependencies.targets +++ b/tools/Common.Netcore.Dependencies.targets @@ -3,21 +3,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -32,7 +32,7 @@ - $(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.28-preview\tools\ + $(NugetPackageRoot)\microsoft.azure.powershell.storage\1.3.29-preview\tools\