Fix Deploy Pipeline Step (#60)

* Update files from Sampler

* See if this fixes the manifest

* Update changelog

* Add sampler config for MainGitBranch

Author: dan-hughes

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - Updated repository files from Sampler template.
   - Fixed README.
   - Use PublishCodeCoverageResults@2.
+  - Fix deploy step. [Fixes #45](https://github.com/dsccommunity/SChannelDsc/issues/45)
   - Renamed `master` branch to `main` - Fixes [Issue #41](https://github.com/dsccommunity/SChannelDsc/issues/41)
 
 ## [1.4.0] - 2022-05-17

Resolve-Dependency.ps1

@@ -233,7 +233,7 @@ if ($UseModuleFast -and -not (Get-Module -Name 'ModuleFast'))
 
             $moduleFastBootstrapScriptBlockParameters.UseMain = $true
         }
-        elseif($ModuleFastVersion)
+        elseif ($ModuleFastVersion)
         {
             if ($ModuleFastVersion -notmatch 'v')
             {
@@ -345,7 +345,7 @@ if ($UsePSResourceGet)
                 Force           = $true
             }
 
-            Expand-Archive @expandArchiveParameters
+            Microsoft.PowerShell.Archive\Expand-Archive @expandArchiveParameters
 
             Remove-Item -Path $psResourceGetZipArchivePath
 
@@ -866,9 +866,24 @@ try
                 if ($moduleFastPlan)
                 {
                     # Clear all modules in plan from the current session so they can be fetched again.
-                    $moduleFastPlan.Name | Get-Module | Remove-Module -Force
-
-                    $moduleFastPlan | Install-ModuleFast @installModuleFastParameters
+                    try
+                    {
+                        $moduleFastPlan.Name | Get-Module | Remove-Module -Force
+                        $moduleFastPlan | Install-ModuleFast @installModuleFastParameters
+                    }
+                    catch
+                    {
+                        Write-Warning -Message 'ModuleFast could not save one or more dependencies. Retrying...'
+                        try
+                        {
+                            $moduleFastPlan.Name | Get-Module | Remove-Module -Force
+                            $moduleFastPlan | Install-ModuleFast @installModuleFastParameters
+                        }
+                        catch
+                        {
+                            Write-Error 'ModuleFast could not save one or more dependencies even after a retry.'
+                        }
+                    }
                 }
                 else
                 {

build.ps1

@@ -10,7 +10,7 @@
         The default value is '' (empty string).
 
     .PARAMETER BuildConfig
-        Not yet written.
+        Path to a file with configuration. Supported extensions : psd1, yaml, yml, json, jsonc.
 
     .PARAMETER OutputDirectory
         Specifies the folder to build the artefact into. The default value is 'output'.
@@ -22,7 +22,7 @@
     .PARAMETER RequiredModulesDirectory
         Can be a path (relative to $PSScriptRoot or absolute) to tell Resolve-Dependency
         and PSDepend where to save the required modules. It is also possible to use
-        'CurrentUser' och 'AllUsers' to install missing dependencies. You can override
+        'CurrentUser' or 'AllUsers' to install missing dependencies. You can override
         the value for PSDepend in the Build.psd1 build manifest. The default value is
         'output/RequiredModules'.
 
@@ -49,13 +49,13 @@
         used in the DscResource.Test.build.ps1 tasks.
 
     .PARAMETER ResolveDependency
-        Not yet written.
+        Resolve missing dependencies.
 
     .PARAMETER BuildInfo
         The build info object from ModuleBuilder. Defaults to an empty hashtable.
 
     .PARAMETER AutoRestore
-        Not yet written.
+        Specifies to restore the required modules by running build.ps1 with ResolveDependency switch and empty task `noop`.
 
     .PARAMETER UseModuleFast
         Specifies to use ModuleFast instead of PowerShellGet to resolve dependencies
@@ -70,6 +70,7 @@
         only works then the method of downloading dependencies is PSResourceGet.
         This can also be configured in Resolve-Dependency.psd1.
 #>
+[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseDeclaredVarsMoreThanAssignments', '', Justification = 'Suppressing this rule because how $PSDependTarget is assigned to splatting variable $resolveDependencyParams.')]
 [CmdletBinding()]
 param
 (
@@ -296,14 +297,17 @@ process
 
                     foreach ($TaskToExport in $BuildInfo['ModuleBuildTasks'].($module))
                     {
-                        $loadedModule.ExportedAliases.GetEnumerator().Where{
-                            Write-Host -Object "`t Loading $($_.Key)..." -ForegroundColor DarkGray
-
+                        $aliasTasks = $loadedModule.ExportedAliases.GetEnumerator().Where{
                             # Using -like to support wildcard.
                             $_.Key -like $TaskToExport
-                        }.ForEach{
+                        }
+
+                        foreach ($aliasTask in $aliasTasks)
+                        {
+                            Write-Host -Object "`t Loading $($aliasTask.Key)..." -ForegroundColor DarkGray
+
                             # Dot-sourcing the Tasks via their exported aliases.
-                            . (Get-Alias $_.Key)
+                            . (Get-Alias $aliasTask.Key)
                         }
                     }
                 }
@@ -317,12 +321,13 @@ process
         }
 
         # Loading Build Tasks defined in the .build/ folder (will override the ones imported above if same task name).
-        Get-ChildItem -Path '.build/' -Recurse -Include '*.ps1' -ErrorAction Ignore |
-            ForEach-Object {
-                "Importing file $($_.BaseName)" | Write-Verbose
+        $taskFiles = Get-ChildItem -Path '.build/' -Recurse -Include '*.ps1' -ErrorAction Ignore
+        foreach ($taskFile in $taskFiles)
+        {
+            "Importing file $($taskFile.BaseName)" | Write-Verbose
 
-                . $_.FullName
-            }
+            . $taskFile.FullName
+        }
 
         # Synopsis: Empty task, useful to test the bootstrap process.
         task noop { }
@@ -352,7 +357,6 @@ process
         }
 
         Write-Host -Object "[build] Executing requested workflow: $($Tasks -join ', ')" -ForeGroundColor Magenta
-
     }
     finally
     {
@@ -493,7 +497,7 @@ begin
             {
                 $paramValue = $MyInvocation.BoundParameters.Item($cmdParameter)
 
-                Write-Debug " adding  $cmdParameter :: $paramValue [from user-provided parameters to Build.ps1]"
+                Write-Debug -Message " adding  $cmdParameter :: $paramValue [from user-provided parameters to Build.ps1]"
 
                 $resolveDependencyParams.Add($cmdParameter, $paramValue)
             }
@@ -504,7 +508,7 @@ begin
 
                 if ($paramValue)
                 {
-                    Write-Debug " adding  $cmdParameter :: $paramValue [from default Build.ps1 variable]"
+                    Write-Debug -Message " adding  $cmdParameter :: $paramValue [from default Build.ps1 variable]"
 
                     $resolveDependencyParams.Add($cmdParameter, $paramValue)
                 }

build.yaml

@@ -84,6 +84,7 @@ DscTest:
     - output
   ExcludeModuleFile:
     - Modules/DscResource.Common
+  MainGitBranch: main
 
 # Import ModuleBuilder tasks from a specific PowerShell module using the build
 # task's alias. Wildcard * can be used to specify all tasks that has a similar

source/SChannelDsc.psd1

@@ -1,15 +1,6 @@
-#
-# Module manifest for module 'SChannelDsc'
-#
-# Generated by: DSC Community
-#
-# Generated on: 10/02/2022
-#
-
 @{
-
     # Script module or binary module file associated with this manifest.
-    RootModule           = 'SchannelDsc.psm1'
+    RootModule           = 'SChannelDsc.psm1'
 
     # Version number of this module.
     ModuleVersion        = '0.0.1'
@@ -27,7 +18,7 @@
     CompanyName          = 'DSC Community'
 
     # Copyright statement for this module
-    Copyright            = '(c) DSC Community. All rights reserved.'
+    Copyright            = 'Copyright the DSC Community contributors. All rights reserved.'
 
     # Description of the functionality provided by this module
     Description          = 'This DSC module is used to manage Secure Channel (SChannel) configurations.'
@@ -51,22 +42,19 @@
     # ProcessorArchitecture = ''
 
     # Modules that must be imported into the global environment prior to importing this module
-    RequiredModules = @()
+    RequiredModules      = @()
 
     # Assemblies that must be loaded prior to importing this module
-    # RequiredAssemblies = @()
+    RequiredAssemblies   = @()
 
     # 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 = @()
-
-    # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-    NestedModules        = @()
+    FormatsToProcess     = @()
 
     # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
     FunctionsToExport    = @()
@@ -87,7 +75,7 @@
     # ModuleList = @()
 
     # List of all files packaged with this module
-    # FileList = @()
+    FileList             = @()
 
     # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
     PrivateData          = @{