diff --git a/.hgignore b/.hgignore
index 9f5c3496..3020542c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -19,3 +19,4 @@ WebsitePanel/Build
WebsitePanel.Installer/Build
WebsitePanel/Bin
msbuild.log
+_ReSharper.*
diff --git a/WebsitePanel/Lib/Microsoft.Web.PlatformInstaller.dll b/WebsitePanel/Lib/Microsoft.Web.PlatformInstaller.dll
deleted file mode 100644
index a94eef6f..00000000
Binary files a/WebsitePanel/Lib/Microsoft.Web.PlatformInstaller.dll and /dev/null differ
diff --git a/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.Deployment.dll b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.Deployment.dll
index 5a16662c..aa11e386 100644
Binary files a/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.Deployment.dll and b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.Deployment.dll differ
diff --git a/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.WebDeployShim.dll b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.WebDeployShim.dll
new file mode 100644
index 00000000..b7b81017
Binary files /dev/null and b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.WebDeployShim.dll differ
diff --git a/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.dll b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.dll
new file mode 100644
index 00000000..e7b0d807
Binary files /dev/null and b/WebsitePanel/Lib/References/Microsoft/Microsoft.Web.PlatformInstaller.dll differ
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebsitePanel.Providers.Web.IIs70.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebsitePanel.Providers.Web.IIs70.csproj
index 370f612d..eee780ba 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebsitePanel.Providers.Web.IIs70.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIS70/WebsitePanel.Providers.Web.IIs70.csproj
@@ -67,10 +67,7 @@
False
..\..\Lib\References\Microsoft\Microsoft.Web.Management.dll
-
-
- False
- ..\..\Lib\Microsoft.Web.PlatformInstaller.dll
+ True
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
index 6e19a004..8aa2ccd3 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WPIWebApplicationGallery/WPIApplicationGallery.cs
@@ -43,6 +43,7 @@ using WebsitePanel.Server.Utils;
using System.Web;
using System.Diagnostics;
using Microsoft.Practices.EnterpriseLibrary.Caching.Expirations;
+using DeploymentParameter = WebsitePanel.Providers.WebAppGallery.DeploymentParameter;
namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
{
@@ -399,6 +400,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
r.FriendlyName = d.FriendlyName;
r.DefaultValue = d.DefaultValue;
r.Description = d.Description;
+#pragma warning disable 612,618
r.WellKnownTags = (DeploymentParameterWellKnownTag) d.Tags;
if (null != d.Validation)
{
@@ -409,6 +411,7 @@ namespace WebsitePanel.Providers.Web.WPIWebApplicationGallery
{
r.ValidationKind = DeploymentParameterValidationKind.None;
}
+#pragma warning restore 612,618
return r;
}
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
index 79f48e11..227f56dc 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebsitePanel.Providers.Web.IIs60.csproj
@@ -70,10 +70,17 @@
False
..\..\Lib\References\Microsoft\Microsoft.Web.Deployment.dll
+ True
-
+
False
- ..\..\Lib\Microsoft.Web.PlatformInstaller.dll
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.dll
+ True
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.WebDeployShim.dll
+ True
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
index dd23de4b..e5ada2a5 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
@@ -36,10 +36,17 @@
False
..\..\Lib\References\Microsoft\Microsoft.Web.Deployment.dll
+ True
-
+
False
- ..\..\Lib\Microsoft.Web.PlatformInstaller.dll
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.dll
+ True
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.WebDeployShim.dll
+ True
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
index e37445b8..2bf09ed6 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
@@ -682,9 +682,11 @@ namespace WebsitePanel.Server.Code
private static bool IsAlienDbTaggedParameter(DeploymentWellKnownTag dbTag, DeclaredParameter parameter)
{
+#pragma warning disable 612,618
return (parameter.Tags & databaseEngineTags) != DeploymentWellKnownTag.None
&&
(parameter.Tags & dbTag) == DeploymentWellKnownTag.None;
+#pragma warning restore 612,618
}
private static void RemoveUnusedProviders(MSDeployPackage msDeployPackage, DeploymentWellKnownTag dbTag)
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
index 0953eeaa..08c84bd4 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server/WebsitePanel.Server.csproj
@@ -45,10 +45,17 @@
False
..\..\Lib\References\Microsoft\Microsoft.Web.Deployment.dll
+ True
-
+
False
- ..\..\Lib\Microsoft.Web.PlatformInstaller.dll
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.dll
+ True
+
+
+ False
+ ..\..\Lib\References\Microsoft\Microsoft.Web.PlatformInstaller.WebDeployShim.dll
+ True
False