Merge branch 'main' into Daily/Release_20250528064449

Author: msJinLei

src/Compute/Compute/ChangeLog.md

@@ -20,6 +20,7 @@
 
 -->
 ## Upcoming Release
+* Added breaking change message for `New-AzVM` and `New-AzVmss` cmdlets.
 
 ## Version 10.0.1
 * Added breaking change message for `New-AzVM` and `New-AzVmss` cmdlets.

src/SelfHelp/SelfHelp/Az.SelfHelp.psd1

@@ -51,16 +51,17 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
+
 RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '5.0.2'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = 'SelfHelp.Autorest/bin/Az.SelfHelp.private.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+ScriptsToProcess = @()
 
 # Type files (.ps1xml) to be loaded when importing this module
-# TypesToProcess = @()
+TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
 FormatsToProcess = 'SelfHelp.Autorest/Az.SelfHelp.format.ps1xml'
@@ -105,7 +106,7 @@ PrivateData = @{
     PSData = @{
 
         # Tags applied to this module. These help with module discovery in online galleries.
-        Tags = 'Azure','ResourceManager','ARM','PSModule','SelfHelp'
+        Tags = 'Azure', 'ResourceManager', 'ARM', 'PSModule', 'SelfHelp'
 
         # A URL to the license for this module.
         LicenseUri = 'https://aka.ms/azps-license'
@@ -130,7 +131,7 @@ PrivateData = @{
 
     } # End of PSData hashtable
 
- } # End of PrivateData hashtable
+} # End of PrivateData hashtable
 
 # HelpInfo URI of this module
 # HelpInfoURI = ''

src/SelfHelp/SelfHelp/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Introduced various new features by upgrading code generator. Please see details [here](https://github.com/Azure/azure-powershell/blob/main/documentation/Autorest-powershell-v4-new-features.md).
 
 ## Version 0.3.0
 * Introduced various new features by upgrading code generator. Please see details [here](https://github.com/Azure/azure-powershell/blob/main/documentation/Autorest-powershell-v4-new-features.md).

tools/BuildScripts/AdaptAutorestModule.ps1

@@ -74,41 +74,53 @@ if (-not (Test-Path $slnPath)) {
 if (-not (Test-Path $parentModulePath)) {
     Write-Host "New module detected, creating parent module $parentModulePath ..." -ForegroundColor DarkGreen
     New-Item -ItemType Directory -Force -Path $parentModulePath
-    <#
-        create csproj for parent module if not existed
-    #>
-    $parentModuleCsprojPath = Join-Path $parentModulePath "$parentModuleName.csproj"
+}
+
+<#
+    create csproj for parent module if not existed
+#>
+$parentModuleCsprojPath = Join-Path $parentModulePath "$parentModuleName.csproj"
+if (-not (Test-Path $parentModuleCsprojPath)) {
     Write-Host "Creating $parentModuleCsprojPath ..." -ForegroundColor DarkGreen
     New-GeneratedFileFromTemplate -TemplateName 'HandcraftedModule.csproj' -GeneratedFileName "$parentModuleName.csproj" -GeneratedDirectory $parentModulePath -ModuleRootName $ModuleRootName -SubModuleName $parentModuleName
     dotnet sln $slnPath add $parentModuleCsprojPath
-    <#
-        create AsemblyInfo.cs for parent module if not existed
-    #>
-    $propertiesPath = Join-Path $parentModulePath 'Properties'
+}
+
+<#
+    create AsemblyInfo.cs for parent module if not existed
+#>
+$propertiesPath = Join-Path $parentModulePath 'Properties'
+if (-not (Test-Path $propertiesPath)) {
     New-Item -ItemType Directory -Force -Path $propertiesPath
-    Write-Host "Creating $propertiesPath/AssemblyInfo.cs ..." -ForegroundColor DarkGreen
-    New-GeneratedFileFromTemplate -TemplateName 'AssemblyInfo.cs' -GeneratedFileName "AssemblyInfo.cs" -GeneratedDirectory $propertiesPath -ModuleRootName $ModuleRootName -SubModuleName $parentModuleName
-    <#
-        create psd1 for parent module if not existed
-    #>
+    if (-not (Test-Path (Join-Path $propertiesPath 'AssemblyInfo.cs'))) {
+        Write-Host "Creating $propertiesPath/AssemblyInfo.cs ..." -ForegroundColor DarkGreen
+        New-GeneratedFileFromTemplate -TemplateName 'AssemblyInfo.cs' -GeneratedFileName "AssemblyInfo.cs" -GeneratedDirectory $propertiesPath -ModuleRootName $ModuleRootName -SubModuleName $parentModuleName
+    }
+}
+
+<#
+    create psd1 for parent module if not existed
+#>
+if (-not (Test-Path (Join-Path $parentModulePath "Az.$ModuleRootName.psd1"))) {
     Write-Host "Creating $parentModulePath/Az.$ModuleRootName.psd1 ..." -ForegroundColor DarkGreen
     New-GeneratedFileFromTemplate -TemplateName 'Module.psd1' -GeneratedFileName "Az.$ModuleRootName.psd1" -GeneratedDirectory $parentModulePath -ModuleRootName $ModuleRootName -SubModuleName $parentModuleName
-    <#
-        create ChangeLog.md for parent module if not existed
-    #>
+}
+
+<#
+    create ChangeLog.md for parent module if not existed
+#>
+if (-not (Test-Path (Join-Path $parentModulePath "ChangeLog.md"))) {
     Write-Host "Creating $parentModulePath/ChangeLog.md ..." -ForegroundColor DarkGreen
     New-GeneratedFileFromTemplate -TemplateName 'ChangeLog.md' -GeneratedFileName "ChangeLog.md" -GeneratedDirectory $parentModulePath -ModuleRootName $ModuleRootName -SubModuleName $parentModuleName
 }
+
 <#
     merge sub module to parent module psd1
 #>
-$parentModulePsd1Path = Join-Path $ParentModulePath "Az.$ModuleRootName.psd1"
+$parentModulePsd1Path = Join-Path $parentModulePath "Az.$ModuleRootName.psd1"
 Write-Host "Merging metadata of $SubModulePath/Az.$subModuleNameTrimmed.psd1 to $parentModulePsd1Path ..." -ForegroundColor DarkGreen
-if (Test-Path $parentModulePsd1Path) {
-    $parentModuleMetadata = Import-LocalizedData -BaseDirectory $ParentModulePath -FileName "Az.$ModuleRootName.psd1"
-} else {
-    $parentModuleMetadata = Import-LocalizedData -BaseDirectory $TemplatePath -FileName 'Module.psd1'
-}
+$parentModuleMetadata = Import-LocalizedData -BaseDirectory $ParentModulePath -FileName "Az.$ModuleRootName.psd1"
+
 $parentModuleMetadata.RequiredAssemblies = (@($parentModuleMetadata.RequiredAssemblies) + "$SubModuleName/bin/Az.$subModuleNameTrimmed.private.dll") | Select-Object -Unique
 $parentModuleMetadata.FormatsToProcess = (@($parentModuleMetadata.FormatsToProcess) + "$SubModuleName/Az.$subModuleNameTrimmed.format.ps1xml") | Select-Object -Unique
 $parentModuleMetadata.NestedModules = (@($parentModuleMetadata.NestedModules) + "$SubModuleName/Az.$subModuleNameTrimmed.psm1") | Select-Object -Unique