[Eng] Fix AutoRest suffix (#28038)

Author: VeryEarly

tools/BuildScripts/AdaptAutorestModule.ps1

@@ -48,9 +48,10 @@ if ($ModuleRootName -in $rootToParentMap.keys) {
     $parentModuleName = $rootToParentMap[$ModuleRootName]
 }
 
-$subModuleNameTrimmed = $SubModuleName
-$SubModuleName = "$SubModuleName.Autorest"
 $moduleRootPath = Join-Path $SourceDirectory $ModuleRootName
+$subModuleNameTrimmed = $SubModuleName
+$subModuleName = Get-ChildItem -Path $moduleRootPath -Directory | Where-Object { $_.Name -match '$(subModuleNameTrimmed)\.' } | ForEach-Object { $_.Name }
+
 $parentModulePath = Join-Path $moduleRootPath $parentModuleName
 $subModulePath = Join-Path $moduleRootPath $SubModuleName
 $slnPath = Join-Path $moduleRootPath "$ModuleRootName.sln"
@@ -177,7 +178,7 @@ try{
     $subModuleCsprojPath = Join-Path $subModulePath $csprojName
     $tempCsprojPath = Join-Path $subModulePath 'tmpCsproj'
     Move-Item $subModuleCsprojPath $tempCsprojPath -Force
-    New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $subModulePath -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed
+    New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $subModulePath -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $subModuleName
 
     dotnet sln $slnPath add $subModuleCsprojPath
     Write-Host "Building $slnPath ..." -ForegroundColor DarkGreen

tools/BuildScripts/BuildScripts.psm1

@@ -161,7 +161,7 @@ function Update-GeneratedSubModule {
         Copy-Item -Path $moveFrom -Destination $moveTo -Recurse -Force
     }
     # regenerate csproj
-    New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName "Az.$subModuleNameTrimmed.csproj" -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed
+    New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName "Az.$subModuleNameTrimmed.csproj" -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $SubModuleName
 
     # revert guid in psd1 so that no conflict in updating this file
     if ($guid) {
@@ -189,7 +189,9 @@ function New-GeneratedFileFromTemplate {
         [string]
         $ModuleRootName,
         [string]
-        $SubModuleName
+        $SubModuleName,
+        [string]
+        $SubModuleNameFull
     )
     $TemplatePath = Join-Path $PSScriptRoot "Templates"
     $templateFile = Join-Path $TemplatePath $TemplateName
@@ -201,7 +203,11 @@ function New-GeneratedFileFromTemplate {
     }
     $templateFile = $templateFile -replace '{ModuleNamePlaceHolder}', $SubModuleName
     $templateFile = $templateFile -replace '{LowCaseModuleNamePlaceHolder}', $SubModuleName.ToLower()
-    $templateFile = $templateFile -replace '{ModuleFolderPlaceHolder}', "$SubModuleName.Autorest"
+    if ($SubModuleNameFull) {
+        $templateFile = $templateFile -replace '{ModuleFolderPlaceHolder}', $SubModuleNameFull
+    } else {
+        $templateFile = $templateFile -replace '{ModuleFolderPlaceHolder}', "$SubModuleName.Autorest"
+    }
     $templateFile = $templateFile -replace '{RootModuleNamePlaceHolder}', $ModuleRootName
     Write-Host "Copying template: $TemplateName." -ForegroundColor Yellow
     $templateFile | Set-Content $GeneratedFile -force