From cc12d9d7ab5d64bdaa0b79e29368fd17c85f0e3d Mon Sep 17 00:00:00 2001 From: Virtuworks Date: Tue, 21 Oct 2014 14:29:39 -0400 Subject: [PATCH] Add support for SQL 2014 in Installer --- .../Actions/StandaloneServerActionManager.cs | 4 ++++ .../Sources/WebsitePanel.Setup/Wizard/DatabasePage.cs | 4 ++-- .../Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs index f4485b20..fe63798b 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Actions/StandaloneServerActionManager.cs @@ -514,6 +514,10 @@ namespace WebsitePanel.Setup.Actions { serviceInfo.ProviderId = 209; } + else if (sqlVersion.StartsWith("12.")) + { + serviceInfo.ProviderId = 1203; + } serviceId = ES.Services.Servers.AddService(serviceInfo); } else diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/DatabasePage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/DatabasePage.cs index 933c0201..cc6399ff 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/DatabasePage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/DatabasePage.cs @@ -124,11 +124,11 @@ namespace WebsitePanel.Setup { // check SQL server version string sqlVersion = GetSqlServerVersion(connectionString); - if (!sqlVersion.StartsWith("9.") && !sqlVersion.StartsWith("10.") && !sqlVersion.StartsWith("11.")) + if (!sqlVersion.StartsWith("9.") && !sqlVersion.StartsWith("10.") && !sqlVersion.StartsWith("11.") && !sqlVersion.StartsWith("12.")) { // SQL Server 2005 engine required e.Cancel = true; - ShowWarning("This program can be installed on SQL Server 2005/2008/2012 only."); + ShowWarning("This program can be installed on SQL Server 2005/2008/2012/2014 only."); return; } int securityMode = GetSqlServerSecurityMode(connectionString); diff --git a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs index bb0c5e24..2d0a1a09 100644 --- a/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs +++ b/WebsitePanel.Installer/Sources/WebsitePanel.Setup/Wizard/ExpressInstallPage.cs @@ -954,6 +954,10 @@ namespace WebsitePanel.Setup { serviceInfo.ProviderId = 209; } + else if (sqlVersion.StartsWith("12.")) + { + serviceInfo.ProviderId = 1203; + } serviceId = ES.Services.Servers.AddService(serviceInfo); } else