Merge branch 'master' into develop

roshvets · web-flow · commit 4e1346d34610 · 2021-11-23T18:30:07.000+02:00
diff --git a/Source/Builders/Initialize-ISH.Instance.ps1 b/Source/Builders/Initialize-ISH.Instance.ps1
@@ -3,7 +3,6 @@
 param(
     [Parameter(Mandatory=$true,ParameterSetName="External Database")]
     [string]$ConnectionString,
-    [ValidateSet("sqlserver2014")]
     [Parameter(Mandatory=$false,ParameterSetName="External Database")]
     [string]$DbType="sqlserver2014",
     [Parameter(Mandatory=$true,ParameterSetName="External Database")]
diff --git a/Source/Server/ISHServer/Install-ISHServerPrerequisites.ps1 b/Source/Server/ISHServer/Install-ISHServerPrerequisites.ps1
@@ -64,7 +64,7 @@ try
     {
         Install-ISHToolMSXML4
     }
-    if($ISHServerVersion -eq "14")
+    if($ISHServerVersion -ge "14")
     {
         Install-ISHToolAdoptOpenJRE
         Install-ISHToolAdoptOpenJDK

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ try`
`64`	`64`	`{`
`65`	`65`	`Install-ISHToolMSXML4`
`66`	`66`	`}`
`67`		`- if($ISHServerVersion -eq "14")`
	`67`	`+ if($ISHServerVersion -ge "14")`
`68`	`68`	`{`
`69`	`69`	`Install-ISHToolAdoptOpenJRE`
`70`	`70`	`Install-ISHToolAdoptOpenJDK`