diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfacd4d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.vsix \ No newline at end of file diff --git a/SqlReportingServices/SqlReportingServicesDeployment/SqlReportingServicesDeployment.ps1 b/SqlReportingServices/SqlReportingServicesDeployment/SqlReportingServicesDeployment.ps1 index c5e62c3..1f70777 100644 --- a/SqlReportingServices/SqlReportingServicesDeployment/SqlReportingServicesDeployment.ps1 +++ b/SqlReportingServices/SqlReportingServicesDeployment/SqlReportingServicesDeployment.ps1 @@ -21,7 +21,8 @@ param( [string]$WsPassword, [string]$UseVerbose, [string]$OverrideExisting, - [string]$AddResourceExtension + [string]$AddResourceExtension, + [string]$IgnoreSQLVersion ) function Verbose-WriteLine{ [cmdletbinding()] @@ -50,6 +51,7 @@ param( Verbose-WriteLine "Using following parameters:" Verbose-WriteLine "ReportFiles: $ReportFiles"; Verbose-WriteLine "Upload path: $ReportUploadRootPath"; + Verbose-WriteLine "Ignore SQL Version: $IgnoreSQLVersion"; Verbose-WriteLine "IncludeDataSource: $IncludeDataSource"; Verbose-WriteLine "DataSourcePath: $DataSourcePath"; @@ -336,9 +338,15 @@ param( }catch [System.Exception]{ - Write-Error $_.Exception.Message; - #Terminate script - exit -1; + if($_.Exception.Message -Match "The definition of this report is not valid or supported by this version of Reporting Services." -and $IgnoreSQLVersion -and $IgnoreSQLVersion -eq $true){ + Write-Host $_.Exception.Message; + Write-Host "Ignore SQL Version errors is enabled, continuing..."; + } + else { + Write-Error $_.Exception.Message; + #Terminate script + exit -1; + } } } diff --git a/SqlReportingServices/SqlReportingServicesDeployment/task.json b/SqlReportingServices/SqlReportingServicesDeployment/task.json index 5a64db1..19cc9eb 100644 --- a/SqlReportingServices/SqlReportingServicesDeployment/task.json +++ b/SqlReportingServices/SqlReportingServicesDeployment/task.json @@ -26,8 +26,8 @@ "demands": [], "version": { "Major": "1", - "Minor": "4", - "Patch": "3" + "Minor": "5", + "Patch": "5" }, "minimumAgentVersion": "1.95.0", "instanceNameFormat": "Deploy SQL Server reporting files", @@ -228,6 +228,15 @@ "defaultValue": false, "groupName": "advanced", "helpMarkDown": "Enable or disable verbose logging" + }, + { + "name": "IgnoreSQLVersion", + "type": "boolean", + "label": "Ignore SQL Version", + "required": false, + "defaultValue": false, + "groupName": "advanced", + "helpMarkDown": "Ignore SQL Version mismatch between Server and Reports" } ], diff --git a/SqlReportingServices/SqlReportingServicesFolderDeployment/SqlReportingServicesFolderDeployment.ps1 b/SqlReportingServices/SqlReportingServicesFolderDeployment/SqlReportingServicesFolderDeployment.ps1 index 0648550..bf46e92 100644 --- a/SqlReportingServices/SqlReportingServicesFolderDeployment/SqlReportingServicesFolderDeployment.ps1 +++ b/SqlReportingServices/SqlReportingServicesFolderDeployment/SqlReportingServicesFolderDeployment.ps1 @@ -7,7 +7,8 @@ param( [string]$WsPassword, [string]$UseVerbose, [string]$OverrideExisting, - [string]$AddResourceExtension + [string]$AddResourceExtension, + [string]$IgnoreSQLVersion ) function Verbose-WriteLine{ [cmdletbinding()] @@ -40,6 +41,7 @@ Add-Type -Path .\DirectoryHelpers.cs -ErrorAction SilentlyContinue; #Errors can Verbose-WriteLine "Remote root path: $RemoteRootPath"; Verbose-WriteLine "Local root path: $LocalRootPath"; Verbose-WriteLine "Attempt to update the datasource path: $UpdateDataSourceToRemote"; + Verbose-WriteLine "Ignore SQL Version: $IgnoreSQLVersion"; $hasWsPassword = "N/A"; if([System.String]::IsNullOrWhiteSpace($WsPassword) -eq $false){ #Check if the Webservice HAS a password and mark it with some stars @@ -316,9 +318,15 @@ $reports | ForEach-Object{ } } }catch [System.Exception]{ - Write-Error $_.Exception.Message; - #Terminate script - exit -1; + if($_.Exception.Message -Match "The definition of this report is not valid or supported by this version of Reporting Services." -and $IgnoreSQLVersion -and $IgnoreSQLVersion -eq $true){ + Write-Host $_.Exception.Message; + Write-Host "Ignore SQL Version errors is enabled, continuing..."; + } + else { + Write-Error $_.Exception.Message; + #Terminate script + exit -1; + } } } } diff --git a/SqlReportingServices/SqlReportingServicesFolderDeployment/task.json b/SqlReportingServices/SqlReportingServicesFolderDeployment/task.json index 59c68fe..7f7c0f1 100644 --- a/SqlReportingServices/SqlReportingServicesFolderDeployment/task.json +++ b/SqlReportingServices/SqlReportingServicesFolderDeployment/task.json @@ -26,8 +26,8 @@ "demands": [], "version": { "Major": "1", - "Minor": "0", - "Patch": "4" + "Minor": "5", + "Patch": "5" }, "minimumAgentVersion": "1.95.0", "instanceNameFormat": "Deploy SQL Server reporting folder structure", @@ -124,6 +124,15 @@ "defaultValue": false, "groupName": "advanced", "helpMarkDown": "Enable or disable verbose logging" + }, + { + "name": "IgnoreSQLVersion", + "type": "boolean", + "label": "Ignore SQL Version", + "required": false, + "defaultValue": false, + "groupName": "advanced", + "helpMarkDown": "Ignore SQL Version mismatch between Server and Reports" } ], diff --git a/SqlReportingServices/vss-extension.json b/SqlReportingServices/vss-extension.json index cf515c7..4accfe5 100644 --- a/SqlReportingServices/vss-extension.json +++ b/SqlReportingServices/vss-extension.json @@ -2,7 +2,7 @@ "manifestVersion": 1, "id": "SqlReportngServices", "name": "SQL Server Reporting Services Deployment", - "version": "1.5.3", + "version": "1.5.5", "publisher": "tobania", "targets": [ {