Updated deployment scripts to delete any existing aborted jobs before…

… running

Visigo.Sharepoint.FormsBasedAuthentication/Visigo.Sharepoint.FormsBasedAuthentication/Deploy.ps1

@@ -20,8 +20,18 @@
     }
 }
 
+function DeleteTimerJob([string]$SolutionFileName)
+{ 
+    $JobName = "*solution-deployment*$SolutionFileName*"
+    $job = Get-SPTimerJob | ?{ $_.Name -like $JobName }
+    if ($job -ne $null) 
+    {
+        Write-Host 'Existing Timer job found. Deleting'
+		$job.Delete()
+    }
+}
+
 
-
 $url=$args[0]
 $solutionName="Visigo.Sharepoint.FormsBasedAuthentication.wsp"
 $featureName="FBAManagement"
@@ -31,14 +41,16 @@ $solutionPath=$pwd.ToString() + "\" + $solutionName
 
 Add-PsSnapin Microsoft.SharePoint.PowerShell -ErrorAction SilentlyContinue
 
+DeleteTimerJob($SolutionName)
+
 Write-Host 'Going to add solution'
 Add-SPSolution $solutionPath
 
 Write-Host 'Going to install solution to all web applications'
 Install-SPSolution –identity $solutionName –allwebapplications –GACDeployment
 
 Write-Host 'Waiting for job to finish' 
-WaitForJobToFinish 
+WaitForJobToFinish($SolutionName)
 
 Write-Host 'Going to enable Feature' 
 Enable-spfeature -identity $featureName -confirm:$false -url $url

Visigo.Sharepoint.FormsBasedAuthentication/Visigo.Sharepoint.FormsBasedAuthentication/UnDeploy.ps1

@@ -20,6 +20,17 @@
     }
 }
 
+function DeleteTimerJob([string]$SolutionFileName)
+{ 
+    $JobName = "*solution-deployment*$SolutionFileName*"
+    $job = Get-SPTimerJob | ?{ $_.Name -like $JobName }
+    if ($job -ne $null) 
+    {
+        Write-Host 'Existing Timer job found. Deleting'
+		$job.Delete()
+    }
+}
+
 Add-PsSnapin Microsoft.SharePoint.PowerShell -ErrorAction SilentlyContinue
 
 $url=$args[0]
@@ -31,6 +42,8 @@ $featureExists = Get-SPSolution $solutionName -ErrorAction SilentlyContinue
 if ($featureExists)
 {
 
+	DeleteTimerJob($solutionName)
+
 	Write-Host 'Going to disable feature'
 	disable-spfeature -identity $featureName -confirm:$false -url $url
 
@@ -41,7 +54,7 @@ if ($featureExists)
 	Uninstall-SPSolution -identity $solutionName  -allwebapplications -confirm:$false
 
 	Write-Host 'Waiting for job to finish'
-	WaitForJobToFinish 
+	WaitForJobToFinish($solutionName)
 
 	Write-Host 'Going to remove solution'
 	Remove-SPSolution –identity $solutionName -confirm:$false