Skip to content

Commit 72d4bf6

Browse files
committed
Update Plesk 9, Update WebsitePanel MSSQL
1 parent 0da8fb0 commit 72d4bf6

20 files changed

+807
-17
lines changed

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
22
[Bb]in/
33
[Oo]bj/
4+
[Bb]in/Debug
5+
[Oo]bj/Debug
6+
[Bb]in/Release
7+
[Oo]bj/Release
48

59
# mstest test results
610
TestResults
@@ -36,6 +40,9 @@ x64/
3640
*.vspscc
3741
*.vssscc
3842
.builds
43+
*.cache
44+
*.pdb
45+
*.exe
3946

4047
# Visual C++ cache files
4148
ipch/

MpImport.v11.suo

-62 KB
Binary file not shown.

MpMigrate.Core/Discovery/Plesk_9_Discover.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private DatabaseProviders PleskDatabaseProvider(string databaseProviderName)
3434
case "MySQL":
3535
provider = DatabaseProviders.MYSQL;
3636
break;
37-
case "MsSQL":
37+
case "MSSQL":
3838
provider = DatabaseProviders.MSSQL;
3939
break;
4040
case "Jet":

MpMigrate.Core/Discovery/WebsitePanel_Discover.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace MpMigrate.Core.Discovery
22
{
3-
using Microsoft.Web.Administration;
3+
/*using Microsoft.Web.Administration;
44
using System;
55
using System.Collections.Generic;
66
using System.Diagnostics;
@@ -141,4 +141,5 @@ public void SetDatabase()
141141
}
142142
}
143143
}
144+
*/
144145
}

MpMigrate.Core/MigrateManager.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,10 @@ private void LoadVariations()
418418
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
419419
(PanelTypes.Plesk_95, DatabaseProviders.MYSQL, new Plesk_9_MySql(), new Plesk_9_Discover()));
420420

421+
//MSSQL Plesk 9
422+
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
423+
(PanelTypes.Plesk_95, DatabaseProviders.MSSQL, new Plesk_9_MsSQL(), new Plesk_9_Discover()));
424+
421425
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
422426
(PanelTypes.Plesk_11, DatabaseProviders.MYSQL, new Plesk_11_MySql(), new Plesk_11_Discover()));
423427

@@ -442,8 +446,10 @@ private void LoadVariations()
442446
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
443447
(PanelTypes.Helm, DatabaseProviders.MSSQL, new Helm_MsSQL(), new Helm_Discover()));
444448

449+
/*
445450
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
446451
(PanelTypes.WebsitePanel, DatabaseProviders.MSSQL, new WebSitePanel_MsSQL(), new WebsitePanel_Discover()));
452+
*/
447453

448454
variationList.Add(new Tuple<PanelTypes, DatabaseProviders, DboFactory, IDiscovery>
449455
(PanelTypes.Plesk_82, DatabaseProviders.OLEDB_ACCESS, new Plesk_82_Access(), new Plesk_86_Discover()));

MpMigrate.Core/MpMigrate.Core.csproj

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34-
<Reference Include="Microsoft.Web.Administration, Version=7.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
35-
<SpecificVersion>False</SpecificVersion>
36-
<HintPath>..\..\Maestro\assembly\Microsoft.Web.Administration.dll</HintPath>
37-
</Reference>
3834
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
3935
<SpecificVersion>False</SpecificVersion>
4036
<HintPath>..\MySql.Data.dll</HintPath>
@@ -82,6 +78,9 @@
8278
<Name>MpMigrate.MaestroPanel.Api</Name>
8379
</ProjectReference>
8480
</ItemGroup>
81+
<ItemGroup>
82+
<None Include="app.config" />
83+
</ItemGroup>
8584
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8685
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8786
Other similar extension points exist, see Microsoft.Common.targets.

MpMigrate.Core/app.config

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-1.0.77.0" newVersion="1.0.77.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
</configuration>
Binary file not shown.

0 commit comments

Comments
 (0)