Skip to content

Commit e218e19

Browse files
author
Peet Whittaker
committed
Fix installation of CLR types for SQL Server 2012 SP1
1 parent c9226aa commit e218e19

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

appveyor.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ install:
1818
- cmd: SQLEXPR_x64_ENU.exe /QUIET /IACCEPTSQLSERVERLICENSETERMS /ACTION=INSTALL /FEATURES=SQL /INSTANCENAME=SQL2012SP1 /TCPENABLED=1 /SECURITYMODE=SQL /SAPWD=Password12! /ADDCURRENTUSERASSQLADMIN /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /AGTSVCACCOUNT="NT AUTHORITY\Network Service"
1919

2020
# install x86 CLR types for SQL Server 2012 SP1 (required when running dotnet test for MsSql tests)
21-
- cmd: curl -L -O -S -s https://download.microsoft.com/download/4/B/1/4B1E9B0E-A4F3-4715-B417-31C82302A70A/ENU/x86/SQLSysClrTypes.msi
21+
- cmd: curl -L -O -S -s https://download.microsoft.com/download/F/E/D/FEDB200F-DE2A-46D8-B661-D019DFE9D470/ENU/x86/SQLSysClrTypes.msi
2222
- cmd: SQLSysClrTypes.msi /passive
2323

2424
# enable dynamic TCP ports for 2008 and 2012 SQL Server instances (so they can be run simultaneously)
@@ -31,15 +31,15 @@ install:
3131
# - cmd: curl -L -O -S -s https://dev.mysql.com/get/Downloads/MySQLInstaller/mysql-installer-web-community-5.6.36.0.msi
3232
# - cmd: msiexec /i mysql-installer-web-community-5.6.36.0.msi /quiet
3333
# - cmd: "C:\Program Files (x86)\MySQL\MySQL Installer for Windows\MySQLInstallerConsole.exe" community install server;5.6.36;x64:*:port=3306;passwd=Password12! -silent
34-
34+
3535
# change default port for MySQL 5.7 (so it can run simultaneously with MySQL 5.6)
3636
# - ps: if ($isWindows) { $iniPath = 'C:\ProgramData\MySQL\MySQL Server 5.7\my.ini' }
3737
# - ps: if ($isWindows) { (Get-Content $iniPath).replace('port=3306', 'port=3307') | Set-Content $iniPath }
38-
38+
3939
# install PostgreSQL 8.4
4040
- cmd: curl -L -O -S -s https://get.enterprisedb.com/postgresql/postgresql-8.4.22-1-windows.exe
4141
- cmd: postgresql-8.4.22-1-windows.exe --mode unattended --superpassword Password12! --serverport 5431
42-
42+
4343
# install PostGIS 1.5.5 for PostgreSQL 8.4
4444
- cmd: curl -L -O -S -s http://download.osgeo.org/postgis/windows/pg84/postgis-pg84-binaries-1.5.5.zip
4545
- cmd: 7z x postgis-pg84-binaries-1.5.5.zip > nul
@@ -50,12 +50,12 @@ install:
5050
- cmd: createdb -p 5431 -U postgres template_postgis
5151
- cmd: psql -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\postgis.sql"
5252
- cmd: psql -q -p 5431 -U postgres -d template_postgis -f "%PGDIR%\share\contrib\postgis-1.5\spatial_ref_sys.sql"
53-
53+
5454
# install PostGIS 2.3.2 for PostgreSQL 9.6 on Windows
5555
- cmd: curl -L -O -S -s http://download.osgeo.org/postgis/windows/pg96/archive/postgis-bundle-pg96-2.3.2x64.zip
5656
- cmd: 7z x postgis-bundle-pg96-2.3.2x64.zip > nul
5757
- cmd: xcopy /s /y /q postgis-bundle-pg96-2.3.2x64 "C:\Program Files\PostgreSQL\9.6"
58-
58+
5959
# install PostgreSQL 9.6 and PostGIS 2.4 on Ubuntu
6060
# note: PostGIS 2.3 not available in Ubuntu Bionic 18.04 repository
6161
- sh: sudo add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -sc)-pgdg main"
@@ -90,25 +90,25 @@ before_build:
9090
before_test:
9191
# setup SQL Server 2008
9292
- cmd: sqlcmd -S (local)\SQL2008R2SP2 -i Tests.NHibernate.Spatial.MsSql2008\nhsp_test.sql
93-
93+
9494
# setup SQL Server 2012
9595
- cmd: sqlcmd -S (local)\SQL2012SP1 -i Tests.NHibernate.Spatial.MsSql2012\nhsp_test.sql
96-
96+
9797
# setup MySQL 5.6
9898
# - cmd: net start mysql56
9999
# - cmd: SET MYSQL_PWD=Password12!
100100
# - cmd: SET mysql="C:\Program Files\MySQL\MySQL Server 5.6\bin\mysql.exe"
101101
# - cmd: '%mysql% -P 3306 -u root < Tests.NHibernate.Spatial.MySQL\nhsp_test.sql'
102-
102+
103103
# setup MySQL 5.7
104104
# - cmd: net start mysql57
105105
# - cmd: SET mysql="C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql.exe"
106106
# - cmd: '%mysql% -P 3307 -u root < Tests.NHibernate.Spatial.MySQL57\nhsp_test.sql'
107-
107+
108108
# setup PostgreSQL 8.4
109109
- cmd: SET psql="C:\Program Files (x86)\PostgreSQL\8.4\bin\psql.exe"
110110
- cmd: '%psql% -q -p 5431 -U postgres -f Tests.NHibernate.Spatial.PostGis\nhsp_test.sql'
111-
111+
112112
# setup PostgreSQL 9.6 on Windows
113113
- cmd: net start postgresql-x64-9.6
114114
- cmd: SET psql="C:\Program Files\PostgreSQL\9.6\bin\psql.exe"

0 commit comments

Comments
 (0)