Rollback class sorting in build pipeline

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

Author: MariusStorhaug

.github/actions/Build-PSModule/src/helpers/Build/Add-ContentFromItem.ps1

@@ -20,11 +20,7 @@ function Add-ContentFromItem {
 
         # The root path of the module.
         [Parameter(Mandatory)]
-        [string] $RootPath,
-
-        # Whether the folder should be loaded using dependency ordering (class/enum aware).
-        [Parameter()]
-        [switch] $DependencyAware
+        [string] $RootPath
     )
     $separators = [char[]]@([System.IO.Path]::DirectorySeparatorChar, [System.IO.Path]::AltDirectorySeparatorChar)
 
@@ -37,12 +33,7 @@ function Add-ContentFromItem {
 Write-Debug "[`$scriptName] - $relativeFolderPath - Processing folder"
 "@
 
-    if ($DependencyAware) {
-        $files = $Path | Get-ChildItem -Recurse -File -Force -Filter '*.ps1' | Sort-Object -Property FullName
-        $files = Get-DependencyOrderedScriptFile -Files $files
-    } else {
-        $files = $Path | Get-ChildItem -File -Force -Filter '*.ps1' | Sort-Object -Property FullName
-    }
+    $files = $Path | Get-ChildItem -File -Force -Filter '*.ps1' | Sort-Object -Property FullName
 
     foreach ($file in $files) {
         $relativeFilePath = [System.IO.Path]::GetRelativePath($RootPath, $file.FullName)
@@ -61,11 +52,9 @@ Write-Debug "[`$scriptName] - $relativeFilePath - Done"
 "@
     }
 
-    if (-not $DependencyAware) {
-        $subFolders = $Path | Get-ChildItem -Directory -Force | Sort-Object -Property Name
-        foreach ($subFolder in $subFolders) {
-            Add-ContentFromItem -Path $subFolder.FullName -RootModuleFilePath $RootModuleFilePath -RootPath $RootPath
-        }
+    $subFolders = $Path | Get-ChildItem -Directory -Force | Sort-Object -Property Name
+    foreach ($subFolder in $subFolders) {
+        Add-ContentFromItem -Path $subFolder.FullName -RootModuleFilePath $RootModuleFilePath -RootPath $RootPath
     }
     Add-Content -Path $RootModuleFilePath -Force -Value @"
 Write-Debug "[`$scriptName] - $relativeFolderPath - Done"

.github/actions/Build-PSModule/src/helpers/Build/Build-PSModuleRootModule.ps1

@@ -10,14 +10,15 @@
 
         1. Module header from header.ps1 file. Usually to suppress code analysis warnings/errors and to add [CmdletBinding()] to the module.
         2. Data loader is added if data files are available.
-        3. Combines *.ps1 files from the following folders:
+        3. Combines *.ps1 files from the following folders in alphabetical order from each folder:
             1. init
-            2. classes (dependency-aware ordering for class/enum references)
-            3. functions/private
-            4. functions/public
-            5. variables/private
-            6. variables/public
-            7. Any remaining *.ps1 on module root.
+            2. classes/private
+            3. classes/public
+            4. functions/private
+            5. functions/public
+            6. variables/private
+            7. variables/public
+            8. Any remaining *.ps1 on module root.
         4. Adds a class loader for classes found in the classes/public folder.
         5. Export-ModuleMember by using the functions, cmdlets, variables and aliases found in the source files.
             - `Functions` will only contain functions that are from the `functions/public` folder.
@@ -174,26 +175,20 @@ Write-Debug "[$scriptName] - [data] - Done"
         #region - Add content from subfolders
         $scriptFoldersToProcess = @(
             'init',
-            'classes',
+            'classes/private',
+            'classes/public',
             'functions/private',
             'functions/public',
             'variables/private',
             'variables/public'
         )
 
         foreach ($scriptFolder in $scriptFoldersToProcess) {
-            $dependencyAware = $scriptFolder -eq 'classes'
             $scriptFolderPath = Join-Path -Path $ModuleOutputFolder -ChildPath $scriptFolder
             if (-not (Test-Path -Path $scriptFolderPath)) {
                 continue
             }
-            $addContentParams = @{
-                Path               = $scriptFolderPath
-                RootModuleFilePath = $rootModuleFile
-                RootPath           = $ModuleOutputFolder
-                DependencyAware    = $dependencyAware
-            }
-            Add-ContentFromItem @addContentParams
+            Add-ContentFromItem -Path $scriptFolderPath -RootModuleFilePath $rootModuleFile -RootPath $ModuleOutputFolder
             Remove-Item -Path $scriptFolderPath -Force -Recurse
         }
         #endregion - Add content from subfolders