Sync tools code from main branch to generation branch

build.proj

@@ -44,6 +44,10 @@
     <!-- Flags -->
     <CodeSign Condition ="'$(CodeSign)' == ''">false</CodeSign>
     <SkipHelp Condition ="'$(SkipHelp)' != 'true'">false</SkipHelp>
+    <TargetBuild Condition="Exists($(TargetModule))">true</TargetBuild>
+    <TargetBuild Condition="!Exists($(TargetModule))">false</TargetBuild>
+
+
     <!-- Set this true only if you want to test the CodeSign workflow locally -->
     <DelaySign Condition ="'$(DelaySign)' == ''">false</DelaySign>
     <NetCore Condition="'$(NetCore)' != 'false'">true</NetCore>
@@ -262,7 +266,7 @@
     <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/CleanupBuild.ps1 -BuildConfig $(Configuration) -GenerateDocumentationFile $(GenerateDocumentationFile) &quot;" />
 
     <Error Condition="'$(NuGetKey)' == ''" Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
-    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/PublishModules.ps1 -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope $(Scope) -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot;&quot; -NugetExe $(NuGetCommand)" />
+    <Exec Command="$(PowerShellCoreCommandPrefix) &quot;. $(RepoTools)/PublishModules.ps1 -TargetBuild $(TargetBuild) -IsNetCore:$$(NetCore) -BuildConfig $(Configuration) -Scope $(Scope) -ApiKey $(NuGetKey) -RepositoryLocation \&quot;$(NuGetPublishingSource)\&quot;&quot; -NugetExe $(NuGetCommand)" />
   </Target>
 
   <Target Name="BuildInstaller" AfterTargets="Publish" Condition="('$(Scope)' == 'All' or '$(Scope)' == 'Latest' or '$(Scope)' == 'Netcore')">

tools/Az/Az.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/30/2024
+# Generated on: 2/8/2024
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '11.3.0'
+ModuleVersion = '11.3.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -121,7 +121,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.15.1'; },
                @{ModuleName = 'Az.RedisEnterpriseCache'; RequiredVersion = '1.2.0'; }, 
                @{ModuleName = 'Az.Relay'; RequiredVersion = '2.0.0'; }, 
                @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.2.0'; }, 
-               @{ModuleName = 'Az.Resources'; RequiredVersion = '6.15.0'; }, 
+               @{ModuleName = 'Az.Resources'; RequiredVersion = '6.15.1'; }, 
                @{ModuleName = 'Az.Security'; RequiredVersion = '1.5.1'; }, 
                @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '3.1.1'; }, 
                @{ModuleName = 'Az.ServiceBus'; RequiredVersion = '3.0.0'; }, 
@@ -194,89 +194,9 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '11.3.0 - February 2024
-Az.Accounts
-* Upgraded the reference of Azure PowerShell Common to 1.3.90-preview.
-* Upgraded Azure.Identity to 1.10.3 [#23018].
-  - Renamed token cache from ''msal.cache'' to ''msal.cache.cae'' or ''masl.cache.nocae''.
-* Enabled Continue Access Evaluation (CAE) for all Service Principals login methods.
-* Supported signing in with Microsoft Account (MSA) via Web Account Manager (WAM). Enable it by ''Set-AzConfig -EnableLoginByWam True''.
-* Adjusted output format to be more user-friendly for ''Get-AzContext/Tenant/Subscription'' and ''Invoke-AzRestMethod''.
-* Fixed the multiple ''x-ms-unique-id'' values issue.
-
-Az.Aks
-* Fixed the resolve path issue in ''Install-AzAksCliTool''.
-
-Az.DataFactory
-* Added metadata Into StoreWriteSettings For Bug Fix
-* Supported ADF Warehouse, Mysql V2 and Salesforce V2 in ADF
-
-Az.ElasticSan
-* General availability for module Az.ElasticSan
-
-Az.KeyVault
-* Supported authentication via User Managed Identity by adding parameter ''UseUserManagedIdentity'' and making ''SasToken'' optional.
-
-Az.Migrate
-* Added support for ''Data.Replication''
-
-Az.Monitor
-* Remove outdated breaking change warning [#24033]
-
-Az.Network
-* Fixed a few minor issues
-* Updated ''New-AzApplicationGateway'' to include ''EnableRequestBuffering'' and ''EnableResponseBuffering'' parameters
-* Changed the Default Rule Set from CRS3.0 to DRS2.1 in ''NewAzureApplicationGatewayFirewallPolicy''
-* Added optional property ''Profile'' to ''New-AzFirewallPolicyIntrusionDetection'' 
-* Added new cmdlet to update Connection child resource of Network Virtual Appliance. - ''Update-AzNetworkVirtualApplianceConnection''
-* Added support of ''InternetIngressIp'' Property in New-AzNetworkVirtualAppliance
-* Added the new cmdlet for supporting ''InternetIngressIp'' Property with Network Virtual Appliances -''New-AzVirtualApplianceInternetIngressIpsProperty''
-* Added a new AuxiliaryMode value ''AuxiliaryMode.Floating''
-* Added support for AzureFirewallPacketCapture
-
-Az.Nginx
-* General availability of ''Az.Nginx'' module
-
-Az.RecoveryServices
-* Added CRR support for taiwannorth, taiwannorthwest region.
-* Added breaking change notification for cmdlets whose output type is ''ASRVaultSettings''.
-* Added warning for Standard to Enhanced policy migration for AzureVMs.
-* Updated Unregister-AzRecoveryServicesBackupContainer cmdlet to ouptput Job object if PassThru not given.
-* Fixed issue with Get-AzRecoveryServicesVaultSettingsFile cmdlet to return private endpoint state for backup.
-
+        ReleaseNotes = '11.3.1 - February 2024
 Az.Resources
-* Supported ''-SkipClientSideScopeValidation'' in RoleAssignment and RoleDefinition related commands. [#22473]
-* Updated Bicep build logic to use --stdout flag instead of creating a temporary file on disk.
-* Fixed exception when ''-ApiVersion'' is specified for ''Get-AzResource'', affected by some resource types.
-
-Az.Sql
-* Added ''DatabaseFormat'' and ''PricingModel'' parameters to ''New-AzSqlInstance'', ''Set-AzSqlInstance''
-* Added breaking change message for ''New-AzSqlDatabaseFailoverGroup'' and ''Set-AzSqlDatabaseFailoverGroup''
-    - The default value of ''FailoverPolicy'' parameter will be changed from ''Automatic'' to ''Manual''
-* Added a new cmdlet for Azure SQL Managed Instance refresh external governance status
-  - ''Invoke-AzSqlInstanceExternalGovernanceStatusRefresh''
-* Updated ''Get-AzSqlInstance'' to support returning the ''ExternalGovernanceStatus'' property
-
-Az.SqlVirtualMachine
-* Fixed a bug of parameter ''VirtualMachineResourceId'' of cmdlet ''New-AzSqlVM''.
-
-Az.StackHCI
-* Fixed issue for WAC.
-* Restricted registration for 23H2 devices exclusively to cloud deployment.
-
-Az.StackHCIVM
-* General availability for module Az.StackHCIVM
-
-Az.Storage
-* Removed some code branches referencing Microsoft.Azure.Storage.Blob
-    - ''Get-AzStorageBlob''
-* Updated the prompt message when deleting a share snapshot and the output format when listing 
-    - ''Remove-AzStorageShare''
-    - ''Remove-AzRmStorageShare''
-    - ''Get-AzRmStorageShare''
-
-Az.Websites
-* Fixed Ambiguous Positional Argument for ''New-AzWebAppSlot''
+* Fixed deadlock in Bicep CLI execution. [#24133]
 '
 
         # Prerelease string of this module

tools/AzPreview/AzPreview.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '11.3.0'
+ModuleVersion = '11.3.1'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -189,7 +189,7 @@ RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '2.15.1'; },
             @{ModuleName = 'Az.Reservations'; RequiredVersion = '0.12.0'; }, 
             @{ModuleName = 'Az.ResourceGraph'; RequiredVersion = '0.13.0'; }, 
             @{ModuleName = 'Az.ResourceMover'; RequiredVersion = '1.2.0'; }, 
-            @{ModuleName = 'Az.Resources'; RequiredVersion = '6.15.0'; }, 
+            @{ModuleName = 'Az.Resources'; RequiredVersion = '6.15.1'; }, 
             @{ModuleName = 'Az.Search'; RequiredVersion = '0.10.0'; }, 
             @{ModuleName = 'Az.Security'; RequiredVersion = '1.5.1'; }, 
             @{ModuleName = 'Az.SecurityInsights'; RequiredVersion = '3.1.1'; }, 

tools/AzPreview/ChangeLog.md

@@ -1,3 +1,7 @@
+## 11.3.1 - February 2024
+#### Az.Resources 6.15.1
+* Fixed deadlock in Bicep CLI execution. [#24133]
+
 ## 11.3.0 - February 2024
 #### Az.Accounts 2.15.1
 * Upgraded the reference of Azure PowerShell Common to 1.3.90-preview.

tools/Docs/az-ps-latest.csv

@@ -135,7 +135,7 @@ pac133,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-rele
 pac134,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Reservations.0.12.0.nupkg;sourceType=sa]Az.Reservations,0.12.0
 pac135,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ResourceGraph.0.13.0.nupkg;sourceType=sa]Az.ResourceGraph,0.13.0
 pac136,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.ResourceMover.1.2.0.nupkg;sourceType=sa]Az.ResourceMover,1.2.0
-pac137,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Resources.6.15.0.nupkg;sourceType=sa]Az.Resources,6.15.0
+pac137,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Resources.6.15.1.nupkg;sourceType=sa]Az.Resources,6.15.1
 pac138,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Search.0.10.0.nupkg;sourceType=sa]Az.Search,0.10.0
 pac139,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.Security.1.5.1.nupkg;sourceType=sa]Az.Security,1.5.1
 pac140,[ps=true;customSource=https://azpspackage.blob.core.windows.net/docs-release/Az.SecurityInsights.3.1.1.nupkg;sourceType=sa]Az.SecurityInsights,3.1.1

tools/PublishModules.ps1

@@ -56,7 +56,10 @@ param(
     [string]$RepositoryLocation,
 
     [Parameter(Mandatory = $false, Position = 5)]
-    [string]$NugetExe
+    [string]$NugetExe, 
+
+    [Parameter(Mandatory = $false, Position = 6)]
+    [string]$TargetBuild
 )
 
 Import-Module "$PSScriptRoot\PublishModules.psm1"
@@ -117,7 +120,7 @@ $env:PSModulePath = "$env:PSModulePath;$tempRepoPath"
 $Errors = $null
 
 try {
-    $modules = Get-AllModules -BuildConfig $BuildConfig -Scope $Scope -PublishLocal:$PublishLocal -IsNetCore:$IsNetCore
+    $modules = Get-AllModules -BuildConfig $BuildConfig -Scope $Scope -TargetBuild $TargetBuild -PublishLocal:$PublishLocal -IsNetCore:$IsNetCore
     Add-AllModules -ModulePaths $modules -TempRepo $tempRepoName -TempRepoPath $tempRepoPath -NugetExe $NugetExe
     Publish-AllModules -ModulePaths $modules -ApiKey $apiKey -TempRepoPath $tempRepoPath -RepoLocation $repositoryLocation -NugetExe $NugetExe -PublishLocal:$PublishLocal
 } catch {

tools/PublishModules.psm1

@@ -267,6 +267,8 @@ function Get-AllModules {
         [ValidateNotNullOrEmpty()]
         [String]$Scope,
 
+        [String]$TargetBuild,
+
         [switch]$PublishLocal,
 
         [switch]$IsNetCore
@@ -275,7 +277,7 @@ function Get-AllModules {
     $clientModules = Get-ClientModules -BuildConfig $BuildConfig -Scope $Scope -PublishLocal:$PublishLocal -IsNetCore:$isNetCore
     Write-Host " "
 
-    if($clientModules.Length -le 2) {
+    if($clientModules.Length -le 2 -and  $TargetBuild -eq "true") {
         return @{
             ClientModules = $clientModules
         }