Replace Folder with Directory

eng/common/scripts/New-RegenerateMatrix.ps1

@@ -56,32 +56,32 @@ function Split-Items([array]$Items) {
 # ensure the output directory exists
 New-Item -ItemType Directory -Path $OutputDirectory -Force | Out-Null
 
-if (Test-Path "Function:$GetFoldersForGenerationFn") {
-  $foldersForGeneration = &$GetFoldersForGenerationFn -OnlyTypespec $OnlyTypespec
+if (Test-Path "Function:$GetDirectoriesForGenerationFn") {
+  $directoriesForGeneration = &$GetDirectoriesForGenerationFn
 }
 else {
-  $foldersForGeneration = Get-ChildItem "$RepoRoot/sdk" -Directory | Get-ChildItem -Directory
-  
-  if ($OnlyTypespec) {
-    $foldersForGeneration = $foldersForGeneration | Where-Object { Test-Path "$_/tsp-location.yaml" }
-  }
+  $directoriesForGeneration = Get-ChildItem "$RepoRoot/sdk" -Directory | Get-ChildItem -Directory
+}
+
+if ($OnlyTypespec) {
+  $directoriesForGeneration = $directoriesForGeneration | Where-Object { Test-Path "$_/tsp-location.yaml" }
 }
 
-[array]$packageFolders = $foldersForGeneration
+[array]$packageDirectories = $directoriesForGeneration
 | Sort-Object -Property FullName
 | ForEach-Object {
   [ordered]@{
-    "PackageFolder" = "$($_.Parent.Name)/$($_.Name)"
+    "PackageDirectory" = "$($_.Parent.Name)/$($_.Name)"
     "ServiceArea"   = $_.Parent.Name
   }
 }
 
-$batches = Split-Items -Items $packageFolders
+$batches = Split-Items -Items $packageDirectories
 
 $matrix = [ordered]@{}
 for ($i = 0; $i -lt $batches.Length; $i++) {
   $batch = $batches[$i]
-  $json = $batch.PackageFolder | ConvertTo-Json -AsArray
+  $json = $batch.PackageDirectory | ConvertTo-Json -AsArray
 
   $firstPrefix = $batch[0].ServiceArea.Substring(0, 2)
   $lastPrefix = $batch[-1].ServiceArea.Substring(0, 2)
@@ -95,7 +95,7 @@ for ($i = 0; $i -lt $batches.Length; $i++) {
   $json | Out-Host
   $json | Out-File "$OutputDirectory/$fileName"
 
-  $matrix[$key] = [ordered]@{ "JobKey" = $key; "FolderList" = $fileName }
+  $matrix[$key] = [ordered]@{ "JobKey" = $key; "DirectoryList" = $fileName }
 }
 
 $compressed = ConvertTo-Json $matrix -Depth 100 -Compress

eng/common/scripts/Update-GeneratedSdks.ps1

@@ -1,7 +1,7 @@
 [CmdLetBinding()]
 param(
   [Parameter(Mandatory)]
-  [string]$PackageFoldersFile
+  [string]$PackageDirectoriesFile
 )
 
 . $PSScriptRoot/common.ps1
@@ -10,7 +10,7 @@ param(
 $ErrorActionPreference = 'Stop'
 
 if (Test-Path "Function:$UpdateGeneratedSdksFn") {
-    &$UpdateGeneratedSdksFn $PackageFoldersFile
+    &$UpdateGeneratedSdksFn $PackageDirectoriesFile
 } else {
     Write-Error "Function $UpdateGeneratedSdksFn not implemented in Language-Settings.ps1"
 }

eng/common/scripts/common.ps1

@@ -60,7 +60,7 @@ $GetPackageLevelReadmeFn = "Get-${Language}-PackageLevelReadme"
 $GetRepositoryLinkFn = "Get-${Language}-RepositoryLink"
 $GetEmitterAdditionalOptionsFn = "Get-${Language}-EmitterAdditionalOptions"
 $GetEmitterNameFn = "Get-${Language}-EmitterName"
-$GetFoldersForGenerationFn = "Get-${Language}-FoldersForGeneration"
+$GetDirectoriesForGenerationFn = "Get-${Language}-DirectoriesForGeneration"
 $UpdateGeneratedSdksFn = "Update-${Language}-GeneratedSdks"
 
 # Expected to be set in eng/scripts/docs/Docs-Onboarding.ps1

eng/scripts/Language-Settings.ps1

@@ -419,7 +419,7 @@ function EnsureCustomSource($package) {
       -AllVersions `
       -AllowPrereleaseVersions
 
-      if (!$? -or !$existingVersions) { 
+      if (!$? -or !$existingVersions) {
         Write-Host "Failed to find package $($package.Name) in custom source $customPackageSource"
         return $package
       }
@@ -495,19 +495,19 @@ function UpdateDocsMsPackages($DocConfigFile, $Mode, $DocsMetadata) {
       continue
     }
 
-    if ($matchingPublishedPackage.Support -eq 'deprecated') { 
-      if ($Mode -eq 'legacy') { 
+    if ($matchingPublishedPackage.Support -eq 'deprecated') {
+      if ($Mode -eq 'legacy') {
 
         # Select the GA version, if none use the preview version
         $updatedVersion = $matchingPublishedPackage.VersionGA.Trim()
-        if (!$updatedVersion) { 
+        if (!$updatedVersion) {
           $updatedVersion = $matchingPublishedPackage.VersionPreview.Trim()
         }
         $package.Versions = @($updatedVersion)
 
         Write-Host "Add deprecated package to legacy moniker: $($package.Name)"
         $outputPackages += $package
-      } else { 
+      } else {
         Write-Host "Removing deprecated package: $($package.Name)"
       }
 
@@ -587,23 +587,23 @@ function Get-dotnet-EmitterAdditionalOptions([string]$projectDirectory) {
   return "--option @azure-tools/typespec-csharp.emitter-output-dir=$projectDirectory/src"
 }
 
-function Update-dotnet-GeneratedSdks([string]$PackageFoldersFile) {
-  $packageFolders = Get-Content $PackageFoldersFile | ConvertFrom-Json
+function Update-dotnet-GeneratedSdks([string]$PackageDirectoriesFile) {
+  $packageDirectories = Get-Content $PackageDirectoriesFile | ConvertFrom-Json
   $showSummary = ($env:SYSTEM_DEBUG -eq 'true') -or ($VerbosePreference -ne 'SilentlyContinue')
 
-  foreach ($folder in $packageFolders) {
+  foreach ($directory in $packageDirectories) {
     Push-Location $RepoRoot
     try {
       Write-Host 'Generating projects under folder ' -ForegroundColor Green -NoNewline
-      Write-Host "$folder" -ForegroundColor Yellow
+      Write-Host "$directory" -ForegroundColor Yellow
       if ($showSummary) {
-        Invoke-LoggedCommand "dotnet msbuild /restore /t:GenerateCode /p:Scope=`"$folder`" /v:n /ds eng\service.proj" -GroupOutput
+        Invoke-LoggedCommand "dotnet msbuild /restore /t:GenerateCode /p:Scope=`"$directory`" /v:n /ds eng\service.proj" -GroupOutput
       }
       else {
-        Invoke-LoggedCommand "dotnet msbuild /restore /t:GenerateCode /p:Scope=`"$folder`" eng\service.proj" -GroupOutput
+        Invoke-LoggedCommand "dotnet msbuild /restore /t:GenerateCode /p:Scope=`"$directory`" eng\service.proj" -GroupOutput
       }
       if ($LastExitCode -ne 0) {
-        Write-Error "Generation error in $folder"
+        Write-Error "Generation error in $directory"
         exit 1
       }
     }