1.5.0 Powershell Versioning Updates

NikoNeugebauer · Sep 3, 2017 · e5cff53 · e5cff53
1 parent 0fe3b93
commit e5cff53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/setup_all.ps1 b/setup_all.ps1
@@ -85,7 +85,7 @@ Get-Content $scriptRootPath\Azure\StoredProcs\cstore_GetAlignment.sql, $scriptRo
 
 Get-Content -Path "$($scriptRootPath)\Azure\Extended Events\*.*" -Include *.sql -Exclude setup_all_extended_events.sql | Set-Content "$($scriptRootPath)\Azure\Extended Events\setup_all_extended_events.sql"
 
-#$cred = Get-Credential -errorAction SilentlyContinue;
+$cred = Get-Credential -errorAction SilentlyContinue;
 
 $InstallCISLExists = Get-Command Install-CISL -errorAction SilentlyContinue;
 if( $InstallCISLExists )
@@ -95,5 +95,5 @@ if( $InstallCISLExists )
     Install-CISL -SQLInstance .\SQL16
 }
 if ( $cred ){
-    Install-CISL -SQLInstance "columnstore.database.windows.net" -cred $cred 
+    Install-CISL -SQLInstance "columnstore.database.windows.net" -cred $cred -installDBs "cisl"
 }
diff --git a/setup_dac.ps1 b/setup_dac.ps1
@@ -16,15 +16,15 @@
 #    See the License for the specific lan guage governing permissions and
 #    limitations under the License.
 
-$CISLVersion = "141"
+$CISLVersion = "150"
 $sqlPackageLocation = "C:\Program Files (x86)\Microsoft SQL Server\130\DAC\bin\sqlpackage.exe"
 $dacpacLocation = "Z:\MEOCloud\CISL GitHub\CISL\Releases\DacPacs\"
 $sql2012 = ".\SQL12"
 $sql2014 = ".\SQL14"
 $sql2016 = ".\SQL16"
-$sqlAzure = "x.database.windows.net"
-$sqlAzureUser = "x"
-$sqlAzurePass = "x"
+$sqlAzure = "#.database.windows.net"
+$sqlAzureUser = "#"
+$sqlAzurePass = "#"
 
 # Verify if the SQLPackage.exe location is correctly specified
 if( !(Test-Path $sqlPackageLocation) ){