Merge pull request #1180 from ruandersMSFT/master-1179

#1179 [skip ci]
dsccommunity · Mar 5, 2020 · 9d26732 · 9d26732
2 parents c8d1879 + 7cc690d
commit 9d26732
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- SPFarmSolution
+  - Corrected bug running Solution Job wait for an Absent solution.
+  - Corrected bug trying to remove an already Absent solution.
+
 ## [3.8.0] - 2020-02-27
 
 ### Added

diff --git a/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1 b/SharePointDsc/DSCResources/MSFT_SPFarmSolution/MSFT_SPFarmSolution.psm1
@@ -345,10 +345,16 @@ function Set-TargetResource
         }
     }
 
-    Wait-SPDscSolutionJob -SolutionName $Name -InstallAccount $InstallAccount
+    if ($Ensure -eq "Present")
+    {
+        Write-Verbose -Message "Waiting for farm solution '$Name' job"
+        Wait-SPDscSolutionJob -SolutionName $Name -InstallAccount $InstallAccount
+    }
 
-    if ($Ensure -eq "Absent")
+    if ($Ensure -eq "Absent" -and $CurrentValues.Ensure -ne "Absent")
     {
+        Write-Verbose -Message "Removing farm solution '$Name'"
+
         $result = Invoke-SPDscCommand -Credential $InstallAccount `
             -Arguments $PSBoundParameters `
             -ScriptBlock {