GH-124 - Merge changes to master (#136)

* Update valid versions * Update CHANGELOG.md * GH-121: Update valid-supported versions (add not released 14.0.1, 14.0.2) * GH-126: Restore mock database has a fixed sqlserver2014 path to the demo or empty database * GH-126: Update CHANGELOG * GH-128: Update valid/supported versions (released 14.0.2, unreleased 15.0.0 and 14.0.3) * Install .NET Core Hosting (#130) * fix ISHServerVersion ValidateSet (#131) * Revert "Install-ISHDotNetHosting for 14.0.3 (#132)" (#134) * GH-123 - Review-README,-CHANGELOG,-RELEASNOTES, ... (#135) Co-authored-by: Pascal Beutels <pbeutels@sdl.com> Co-authored-by: Alexander Kuzmin <42138790+olekuz@users.noreply.github.com> Co-authored-by: Oleksandr Kuzmin <okuzmin@sdl.com>
RWS · Nov 26, 2020 · 4637f15 · 4637f15
1 parent 1f3dcfe
commit 4637f15
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,16 @@
 # Change log
 
+## release v1.4
+
+- GH-130: Install .NET Core Hosting (future v15.0.0)
+- GH-128: Update valid/supported versions (released 14.0.2, 14.0.3 and unreleased 15.0.0)
+- GH-119: Update valid/supported versions (released: 13.0.1, 13.0.2, 14.0.0, not released 14.0.1)
+- GH-121: Update valid/supported versions (add not released 14.0.2)
+- GH-126: Restore mock database has a fixed sqlserver2014 path to the demo or empty database. Use wildcard.
+
 ## release v1.3
 
+- GH-111: Packer - Provide the correct ps_java_... inputparameters
 - GH-107: Changes required for new 'ISHCS' web application (InstallTool inputparameters)
 - GH-102: Database - Add the option to restore the Demo or and Empty database from the ISHCD as local/'mock' database
 - GH-101: DevelopFriendly - Improve PowerShell scripts to help in troubleshooting instances

diff --git a/Source/Bake-ISHFromAWSS3.ps1 b/Source/Bake-ISHFromAWSS3.ps1
@@ -3,7 +3,7 @@
 param(
     [Parameter(Mandatory=$true,ParameterSetName="Default Authorization")]
     [Parameter(Mandatory=$true,ParameterSetName="Custom Authorization")]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion,
     [Parameter(Mandatory=$false,ParameterSetName="Default Authorization")]
     [Parameter(Mandatory=$false,ParameterSetName="Custom Authorization")]
@@ -61,4 +61,3 @@ if($PSCmdlet.ParameterSetName -eq "Custom Authorization")
 $hash.ConnectionString=$MockConnectionString
 
 & $buildersPath\Initialize-ISHImage.ps1 @hash -ISHVersion $ishVersion
-
diff --git a/Source/Builders/Database/Install-MockDatabaseServer.ps1 b/Source/Builders/Database/Install-MockDatabaseServer.ps1
@@ -1,6 +1,6 @@
 param(
     [Parameter(Mandatory=$true,ParameterSetName="Database")]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion,
     [Parameter(Mandatory=$false,ParameterSetName="Database")]
     [string]$MockConnectionString=$null
@@ -29,7 +29,7 @@ if($mockDatabase)
     switch -regex ($ISHVersion) {
         '12.0.3|12.0.4' {$sql_express_download_url= $sql_express_2014_download_url}
         '13.0.0|13.0.1' {$sql_express_download_url= $sql_express_2016_download_url}
-        '13.0.2|14.0.0' {$sql_express_download_url= $sql_express_2017_download_url}
+        '13.0.2|14.0.0|14.0.1|14.0.2|14.0.3|15.0.0' {$sql_express_download_url= $sql_express_2017_download_url}
         default         {$sql_express_download_url= $sql_express_2017_download_url}
     }
     $sqlExpressPath=Join-Path $PSScriptRoot "sqlexpress.exe"

diff --git a/Source/Builders/Database/Restore-MockDatabase.ps1 b/Source/Builders/Database/Restore-MockDatabase.ps1
@@ -1,6 +1,6 @@
 param(
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion,
     [Parameter(Mandatory=$false)]
     [switch]$EmptyDB
@@ -57,7 +57,7 @@ $segments=@(
     $ishCDPath
     "Database"
     "Dump"
-    "SQLServer2014"
+    "SQLServer*"
 )
 
 if ($EmptyDB.IsPresent)

diff --git a/Source/Builders/Default/Install-ISHBootstrapPrerequisites.ps1 b/Source/Builders/Default/Install-ISHBootstrapPrerequisites.ps1
@@ -3,7 +3,7 @@
 param(
     [Parameter(Mandatory=$true,ParameterSetName="From AWS S3")]
     [Parameter(Mandatory=$true,ParameterSetName="From FTP")]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion,
     [Parameter(Mandatory=$false,ParameterSetName="From AWS S3")]
     [Parameter(Mandatory=$false,ParameterSetName="From FTP")]

diff --git a/Source/Builders/Default/New-ISHBootstrapAWSReferences.ps1 b/Source/Builders/Default/New-ISHBootstrapAWSReferences.ps1
@@ -1,6 +1,6 @@
 param(
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion
 )
 
@@ -51,10 +51,42 @@ switch($ISHVersion) {
     }
     '14.0.0' {
         $hash=@{
-            BucketName="sct-notreleased"
+            BucketName="sct-released"
+            ISHServerFolder="InfoShare/14.0/PreRequisites"
+            ISHCDFolder="InfoShare/14.0/"
+            ISHCDFileName="20190705.CD.InfoShare.14.0.3105.0.Trisoft-DITA-OT.exe"
+        }
+    }
+    '14.0.1' {
+        $hash=@{
+            BucketName="sct-released"
+            ISHServerFolder="InfoShare/14.0/PreRequisites"
+            ISHCDFolder="InfoShare/14.0/"
+            ISHCDFileName="20191206.CD.InfoShare.14.0.3606.1.Trisoft-DITA-OT.exe"
+        }
+    }
+    '14.0.2' {
+        $hash=@{
+            BucketName="sct-released"
+            ISHServerFolder="InfoShare/14.0/PreRequisites"
+            ISHCDFolder="InfoShare/14.0/"
+            ISHCDFileName="20200501.CD.InfoShare.14.0.4101.2.Trisoft-DITA-OT.exe"
+        }
+    }
+    '14.0.3' {
+        $hash=@{
+            BucketName="sct-released"
             ISHServerFolder="InfoShare/14.0/PreRequisites"
             ISHCDFolder="InfoShare/14.0/"
-            ISHCDFileName="20181026a.CD.InfoShare.14.0.2226.0.Test.Trisoft-DITA-OT.exe"
+            ISHCDFileName="20200701.CD.InfoShare.14.0.4301.3.Trisoft-DITA-OT.exe"
+        }
+    }
+    '15.0.0' {
+        $hash=@{
+            BucketName="sct-notreleased"
+            ISHServerFolder="InfoShare/15.0/PreRequisites"
+            ISHCDFolder="InfoShare/15.0/"
+            ISHCDFileName="20200630.CD.InfoShare.15.0.630.0.Trisoft-DITA-OT.exe"
         }
     }
 }

diff --git a/Source/Builders/Initialize-ISHImage.ps1 b/Source/Builders/Initialize-ISHImage.ps1
@@ -9,7 +9,7 @@
 param(
     [Parameter(Mandatory=$true,ParameterSetName="From FTP")]
     [Parameter(Mandatory=$true,ParameterSetName="From AWS S3")]
-    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0")]
+    [ValidateSet("12.0.3","12.0.4","13.0.0","13.0.1","13.0.2","14.0.0","14.0.1","14.0.2","14.0.3","15.0.0")]
     [string]$ISHVersion,
     [Parameter(Mandatory=$false,ParameterSetName="From FTP")]
     [Parameter(Mandatory=$false,ParameterSetName="From AWS S3")]

diff --git a/Source/Server/ISHServer/Copy-ISHCD.ps1 b/Source/Server/ISHServer/Copy-ISHCD.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$false)]
     [pscredential]$Credential=$null,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion,
     [Parameter(Mandatory=$true,ParameterSetName="From FTP")]
     [string]$FTPHost,

diff --git a/Source/Server/ISHServer/Get-ISHServerPrerequisites.ps1 b/Source/Server/ISHServer/Get-ISHServerPrerequisites.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$false)]
     [pscredential]$Credential=$null,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion,
     [Parameter(Mandatory=$true,ParameterSetName="From FTP")]
     [string]$FTPHost,

diff --git a/Source/Server/ISHServer/Initialize-ISHServerOSUser.ps1 b/Source/Server/ISHServer/Initialize-ISHServerOSUser.ps1
@@ -28,7 +28,7 @@ param (
     [PSCredential]$OSUserCredential,
     [Parameter(Mandatory=$true,ParameterSetName="Local")]
     [Parameter(ParameterSetName="Remote")]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion
 )    
 $cmdletsPaths="$PSScriptRoot\..\..\Cmdlets"

diff --git a/Source/Server/ISHServer/Initialize-ISHServerOSUserRegion.ps1 b/Source/Server/ISHServer/Initialize-ISHServerOSUserRegion.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$true)]
     [PSCredential]$OSUserCredential,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion
 )    
 $cmdletsPaths="$PSScriptRoot\..\..\Cmdlets"

diff --git a/Source/Server/ISHServer/Install-ISHServerPrerequisites.ps1 b/Source/Server/ISHServer/Install-ISHServerPrerequisites.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$false)]
     [pscredential]$Credential=$null,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion,
     [Parameter(Mandatory=$false)]
     [switch]$InstallOracle=$false,
@@ -64,7 +64,7 @@ try
     {
         Install-ISHToolMSXML4
     }
-    if($ISHServerVersion -eq "14")
+    if($ISHServerVersion -ge "14")
     {
         Install-ISHToolAdoptOpenJRE
         Install-ISHToolAdoptOpenJDK
@@ -80,7 +80,10 @@ try
     {
         Install-ISHToolOracleODAC
     }
-
+    if($ISHServerVersion -eq "15")
+    {
+        Install-ISHDotNetHosting 
+    }
     Write-Progress @scriptProgress -Status "Initializing"
     Initialize-ISHLocale
     Initialize-ISHIIS

diff --git a/Source/Server/ISHServer/Set-ISHAntennaHouseLicense.ps1 b/Source/Server/ISHServer/Set-ISHAntennaHouseLicense.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$false)]
     [pscredential]$Credential=$null,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion,
     [Parameter(Mandatory=$true,ParameterSetName="From FTP")]
     [string]$FTPHost,

diff --git a/Source/Server/ISHServer/Test-SupportedServer.ps1 b/Source/Server/ISHServer/Test-SupportedServer.ps1
@@ -20,7 +20,7 @@ param (
     [Parameter(Mandatory=$false)]
     [pscredential]$Credential=$null,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion
 )    
 $cmdletsPaths="$PSScriptRoot\..\..\Cmdlets"

diff --git a/Source/Server/ISHServer/Upload-ISHServerPrerequisites.ps1 b/Source/Server/ISHServer/Upload-ISHServerPrerequisites.ps1
@@ -22,7 +22,7 @@ param (
     [Parameter(Mandatory=$true)]
     [string]$PrerequisitesSourcePath,
     [Parameter(Mandatory=$true)]
-    [ValidateSet("12","13","14")]
+    [ValidateSet("12","13","14","15")]
     [string]$ISHServerVersion
 )    
 $cmdletsPaths="$PSScriptRoot\..\..\Cmdlets"