Merge pull request #20 from BrianFarnhill/dev

Updated syntax from PSScriptAnalyzer

Author: BrianFarnhill

Modules/xSharePoint/DSCResources/MSFT_xSPBCSServiceApp/MSFT_xSPBCSServiceApp.psm1

@@ -17,15 +17,15 @@ function Get-TargetResource
         $InstallAccount
     )
 
-    Write-Verbose "Getting BCS service app '$Name'"
+    Write-Verbose -Message "Getting BCS service app '$Name'"
 
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
 
     $result = Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
         $params = $args[0]
         $serviceApp = Get-SPServiceApplication -Name $params.Name -ErrorAction SilentlyContinue |
                         Where-Object { $_.TypeName -eq "Business Data Connectivity Service Application" }
-        If ($serviceApp -eq $null)
+        If ($null -eq $serviceApp)
         {
             return @{}
         }
@@ -68,9 +68,9 @@ function Set-TargetResource
     )
 
     $result = Get-TargetResource -Name $Name -ApplicationPool $ApplicationPool -InstallAccount $InstallAccount
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
     if ($result.Count -eq 0) { 
-        Write-Verbose "Creating BCS Service Application $Name"
+        Write-Verbose -Message "Creating BCS Service Application $Name"
         Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
             $params = $args[0]
             $params.Remove("InstallAccount") | Out-Null
@@ -79,7 +79,7 @@ function Set-TargetResource
     }
     else {
         if ($ApplicationPool -ne $result.ApplicationPool) {
-            Write-Verbose "Updating BCS Service Application $Name"
+            Write-Verbose -Message "Updating BCS Service Application $Name"
             Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
                 $params = $args[0]
                 $serviceApp = Get-SPServiceApplication -Name $params.Name -ErrorAction SilentlyContinue |
@@ -118,7 +118,7 @@ function Test-TargetResource
     )
     $result = Get-TargetResource -Name $Name -ApplicationPool $ApplicationPool -InstallAccount $InstallAccount
 
-    Write-Verbose "Testing for BCS Service Application '$Name'"
+    Write-Verbose -Message "Testing for BCS Service Application '$Name'"
     if ($result.Count -eq 0) { return $false }
     else {
         if ($ApplicationPool -ne $result.ApplicationPool) { return $false }

Modules/xSharePoint/DSCResources/MSFT_xSPCacheAccounts/MSFT_xSPCacheAccounts.psm1

@@ -21,15 +21,15 @@ function Get-TargetResource
         $InstallAccount
     )
 
-    Write-Verbose "Getting cache accounts for $WebAppUrl"
+    Write-Verbose -Message "Getting cache accounts for $WebAppUrl"
 
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
 
     $result = Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
         $params = $args[0]
         $wa = Get-SPWebApplication $params.WebAppUrl -ErrorAction SilentlyContinue
 
-        if ($wa -eq $null) { return @{} }
+        if ($null -eq $wa) { return @{} }
 
         $returnVal = @{}
         $returnVal.Add("WebAppUrl", $params.WebAppUrl)
@@ -72,9 +72,9 @@ function Set-TargetResource
         $InstallAccount
     )
 
-    Write-Verbose "Setting cache accounts for $WebAppUrl"
+    Write-Verbose -Message "Setting cache accounts for $WebAppUrl"
 
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
 
     $result = Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
 
@@ -121,7 +121,7 @@ function Test-TargetResource
     )
 
     $result = Get-TargetResource -WebAppUrl $WebAppUrl -SuperUserAlias $SuperUserAlias -SuperReaderAlias $SuperReaderAlias -InstallAccount $InstallAccount
-    Write-Verbose "Testing cache accounts for $WebAppUrl"
+    Write-Verbose -Message "Testing cache accounts for $WebAppUrl"
 
     if ($result.Count -eq 0) { return $false }
     else {

Modules/xSharePoint/DSCResources/MSFT_xSPCreateFarm/MSFT_xSPCreateFarm.psm1

@@ -29,16 +29,18 @@ function Get-TargetResource
         $AdminContentDatabaseName
     )
 
-    Write-Verbose "Checking for local SP Farm"
+    Write-Verbose -Message "Checking for local SP Farm"
 
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
 
     $result = Invoke-Command -Session $session -ScriptBlock {
         try {
             $spFarm = Get-SPFarm -ErrorAction SilentlyContinue
-        } catch {}
+        } catch {
+            Write-Verbose -Message "Unable to detect local farm."
+        }
 
-        if ($spFarm -eq $null) {return @{ }}
+        if ($null -eq $spFarm) {return @{ }}
 
         $returnValue = @{
             FarmName = $spFarm.Name
@@ -79,45 +81,45 @@ function Set-TargetResource
         $AdminContentDatabaseName
     )
 
-    $session = Get-xSharePointAuthenticatedPSSession $InstallAccount
+    $session = Get-xSharePointAuthenticatedPSSession -Credential $InstallAccount
 
-    Write-Verbose "Creating new configuration database"
+    Write-Verbose -Message "Creating new configuration database"
     Invoke-Command -Session $session -ArgumentList $PSBoundParameters -ScriptBlock {
         $params = $args[0]
         New-SPConfigurationDatabase -DatabaseName $params.FarmConfigDatabaseName `
                                     -DatabaseServer $params.DatabaseServer `
-                                    -Passphrase (ConvertTo-SecureString $params.Passphrase -AsPlainText -force) `
+                                    -Passphrase (ConvertTo-SecureString -String $params.Passphrase -AsPlainText -force) `
                                     -FarmCredentials $params.FarmAccount `
                                     -SkipRegisterAsDistributedCacheHost:$true `
                                     -AdministrationContentDatabaseName $params.AdminContentDatabaseName
     }
 
-    Write-Verbose "Installing help collection"
+    Write-Verbose -Message "Installing help collection"
     Invoke-Command -Session $session -ScriptBlock {
         Install-SPHelpCollection -All
     }
 
-    Write-Verbose "Initialising farm resource security"
+    Write-Verbose -Message "Initialising farm resource security"
     Invoke-Command -Session $session -ScriptBlock {
         Initialize-SPResourceSecurity
     }
 
-    Write-Verbose "Installing farm services"
+    Write-Verbose -Message "Installing farm services"
     Invoke-Command -Session $session -ScriptBlock {
         Install-SPService
     }
 
-    Write-Verbose "Installing farm features"
+    Write-Verbose -Message "Installing farm features"
     Invoke-Command -Session $session -ScriptBlock {
         Install-SPFeature -AllExistingFeatures -Force
     }
 
-    Write-Verbose "Creating Central Administration Website"
+    Write-Verbose -Message "Creating Central Administration Website"
     Invoke-Command -Session $session -ScriptBlock {
         New-SPCentralAdministration -Port 9999 -WindowsAuthProvider NTLM
     }
 
-    Write-Verbose "Installing application content"
+    Write-Verbose -Message "Installing application content"
     Invoke-Command -Session $session -ScriptBlock {
         Install-SPApplicationContent
     }