Merge branch 'master' into acs-and-spo-app-proxies

dsccommunity · Feb 17, 2020 · 02b00ea · 02b00ea
2 parents 1ccccf6 + 230407d
commit 02b00ea
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,7 +23,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - SharePointDsc
-  - Updated all resources to load Utils module, which broke with the new CI
+  - Updated all resources and Invoke-SPDscCommand function to automatically
+    load Utils module, which broke with the new CI
 - SPConfigWizard
   - Updated checks in Set method to make sure the resource also runs when
     a language pack is installed

diff --git a/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1 b/SharePointDsc/Modules/SharePointDsc.Util/SharePointDsc.Util.psm1
@@ -412,6 +412,11 @@ function Invoke-SPDscCommand
             Add-PSSnapin Microsoft.SharePoint.PowerShell
         }
 
+        `$SaveVerbosePreference = `$VerbosePreference
+        `$VerbosePreference = 'SilentlyContinue'
+        Import-Module "$(Join-Path -Path $PSScriptRoot -ChildPath 'SharePointDsc.Util.psm1')"
+        `$VerbosePreference = `$SaveVerbosePreference
+
 "@
 
     $invokeArgs = @{

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerADResourcePoolSync.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerADResourcePoolSync.Tests.ps1
@@ -70,7 +70,7 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     try

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerAdditionalSettings.tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerAdditionalSettings.tests.ps1
@@ -70,11 +70,11 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     [System.Reflection.Assembly]::LoadWithPartialName("System.ServiceModel") | Out-Null
-                    $psDllPath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
+                    $psDllPath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
                     $fullDllPath = Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $psDllPath -Resolve
                     $bytes = [System.IO.File]::ReadAllBytes($fullDllPath)
                     [System.Reflection.Assembly]::Load($bytes) | Out-Null

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerConnector.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerConnector.Tests.ps1
@@ -22,6 +22,8 @@ function Invoke-TestSetup
                 -ChildPath "..\UnitTestHelper.psm1" `
                 -Resolve)
 
+        $moduleVersionFolder = ($ModuleVersion -split "-")[0]
+
         $Global:SPDscHelper = New-SPDscUnitTestHelper -SharePointStubModule $SharePointCmdletModule `
             -SubModulePath "Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1" `
             -ExcludeInvokeHelper `

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerGlobalPermissions.tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerGlobalPermissions.tests.ps1
@@ -70,11 +70,11 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     [System.Reflection.Assembly]::LoadWithPartialName("System.ServiceModel") | Out-Null
-                    $psDllPath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
+                    $psDllPath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
                     $fullDllPath = Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $psDllPath -Resolve
                     $bytes = [System.IO.File]::ReadAllBytes($fullDllPath)
                     [System.Reflection.Assembly]::Load($bytes) | Out-Null

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerGroup.tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerGroup.tests.ps1
@@ -70,11 +70,11 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     [System.Reflection.Assembly]::LoadWithPartialName("System.ServiceModel") | Out-Null
-                    $psDllPath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
+                    $psDllPath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerServices.dll"
                     $fullDllPath = Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $psDllPath -Resolve
                     $bytes = [System.IO.File]::ReadAllBytes($fullDllPath)
                     [System.Reflection.Assembly]::Load($bytes) | Out-Null

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerTimeSheetSettings.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerTimeSheetSettings.Tests.ps1
@@ -70,7 +70,7 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     Mock -CommandName "Import-Module" -MockWith { }

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerUserSyncSettings.tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerUserSyncSettings.tests.ps1
@@ -70,7 +70,7 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     Mock -CommandName "Import-Module" -MockWith { }

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerWssSettings.tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPProjectServerWssSettings.tests.ps1
@@ -70,7 +70,7 @@ try
                 }
                 16
                 {
-                    $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                    $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                     Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
 
                     Mock -CommandName "Import-Module" -MockWith { }

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.Util.Tests.ps1
@@ -24,6 +24,8 @@ function Invoke-TestSetup
                 -ChildPath "..\UnitTestHelper.psm1" `
                 -Resolve)
 
+        $moduleVersionFolder = ($ModuleVersion -split "-")[0]
+
         $Global:SPDscHelper = New-SPDscUnitTestHelper -SharePointStubModule $SharePointCmdletModule `
                 -SubModulePath "Modules\SharePointDsc.Util\SharePointDsc.Util.psm1" `
                 -ExcludeInvokeHelper `
-Original file line number
+Diff line change
@@ Expand Up / @@ -70,7 +70,7 @@ try @@
                     }
                     {
-                        $modulePath = "Modules\SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
+                        $modulePath = "SharePointDsc\Modules\SharePointDsc.ProjectServer\ProjectServerConnector.psm1"
                         Import-Module -Name (Join-Path -Path $Global:SPDscHelper.RepoRoot -ChildPath $modulePath -Resolve)
                         try
@@ Expand Down @@