fixing the test issues and resolving the merges

Thank you!

Author: SQLDBAWithABeard

.github/workflows/deploy-module.yml

@@ -36,6 +36,7 @@ jobs:
       with:
         ref: ${{ github.head_ref }}   # checkout the correct branch name
         fetch-depth: 0
+        token: ${{ secrets.REPO_TOKEN }}
     - name: Install GitVersion
       uses: gittools/actions/gitversion/[email protected]
       with:
@@ -67,6 +68,7 @@ jobs:
       with:
         ref: ${{ github.head_ref }}   # checkout the correct branch name
         fetch-depth: 0
+        token: ${{ secrets.REPO_TOKEN }}
     - name: Download Build Artifact
       uses: actions/download-artifact@v4
       with:
@@ -78,6 +80,17 @@ jobs:
       env:
         GitHubToken: ${{ secrets.GitHubToken }}
         GalleryApiToken: ${{ secrets.GalleryApiToken }}
+    - name: Merge main -> develop
+        # This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
+      run: |
+        git config --local user.email "[email protected]"
+        git config --local user.name "Automated Jess Did this"
+        git checkout main
+        git pull
+        git checkout develop
+        git pull
+        git merge --no-ff main -m "Auto-merge main back to dev"
+        git push
     - name: Send Changelog PR
       shell: pwsh
       run: ./build.ps1 -tasks Create_ChangeLog_GitHub_PR
@@ -86,11 +99,3 @@ jobs:
         GalleryApiToken: ${{ secrets.GalleryApiToken }}
         ReleaseBranch: main
         MainGitBranch: main
-    - name: Merge main -> develop
-    # This step merges the main branch into the develop branch after a successful deployment. This ensures that the develop branch includes the tag for the latest release.
-      uses: devmasx/[email protected]
-      with:
-        type: now
-        from_branch: main
-        target_branch: develop
-        github_token: ${{ secrets.REPO_TOKEN }}

source/Public/Config/Get-FabricConfig.ps1

@@ -7,12 +7,12 @@ Gets the configuration for use with all functions in the PSFabricTools module.
 Gets the configuration for use with all functions in the PSFabricTools module.
 
 .PARAMETER ConfigName
-The name of the configuration to retrieve.
+The name of the configuration to be retrieved.
 
 .EXAMPLE
 PS> Get-FabricConfig
 
-Gets all the configuration values for the PSFabricTools module and outputs them
+Gets all the configuration values for the PSFabricTools module and outputs them.
 
 .EXAMPLE
 PS> Get-FabricConfig -ConfigName BaseUrl

source/Public/Config/Set-FabricConfig.ps1

@@ -25,12 +25,11 @@ Registers the specified Fabric Data Warehouse configuration for use with all fun
 .EXAMPLE
 PS> Set-FabricConfig -WorkspaceGUID 'GUID-GUID-GUID-GUID' -DataWarehouseGUID 'GUID-GUID-GUID-GUID' -SkipPersist
 
-Registers the specified Fabric Data Warehouse configuration for use with all functions in the PSFabricTools module - but does not persist the values, only uses them for the current session.
+Registers the specified Fabric Data Warehouse configuration for use with all functions in the PSFabricTools module - but it does not persist the values, only uses them for the current session.
 
 .NOTES
 
 Author: Jess Pomfret
-
 #>
 
 function Set-FabricConfig {

source/Public/Get-SHA256.ps1

@@ -1,5 +1,5 @@
 function Get-Sha256 ($string) {
-    <#
+<#
 .SYNOPSIS
 Calculates the SHA256 hash of a string.
 
@@ -19,7 +19,7 @@ The function creates a new SHA256CryptoServiceProvider object, converts the stri
 
 Author: Ioana Bouariu
 
-    #>
+#>
 
     # Create a new SHA256CryptoServiceProvider object.
     $sha256 = New-Object System.Security.Cryptography.SHA256CryptoServiceProvider