3 files changed, 48 insertions, 39 deletions
diff --git a/main/src/addins/VBNetBinding/Project/Import.cs b/main/src/addins/VBNetBinding/Project/Import.cs
index f8685402fa..227b7a27a1 100644
--- a/main/src/addins/VBNetBinding/Project/Import.cs
+++ b/main/src/addins/VBNetBinding/Project/Import.cs
@@ -30,14 +30,14 @@ using MonoDevelop.Projects;
 
 namespace MonoDevelop.VBNetBinding
 {
-	[DataItem ("Import")]
-	public class Import: SimpleProjectItem
+	public class Import: ProjectItem
 	{
 		public Import ()
 		{
+			ItemName = "Import";
 		}
 		
-		public Import (string include)
+		public Import (string include): this ()
 		{
 			Include = include;
 		}
diff --git a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
index 386f8cab79..1dc141c777 100644
--- a/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
+++ b/main/src/addins/VBNetBinding/Project/VBCompilerParameters.cs
@@ -36,7 +36,7 @@ using MonoDevelop.Core.Serialization;
 
 namespace MonoDevelop.VBNetBinding
 {
-	public class VBCompilerParameters: ConfigurationParameters
+	public class VBCompilerParameters: DotNetCompilerParameters
 	{
 		//
 		// Project level properties:
diff --git a/main/src/addins/VBNetBinding/Project/VBProjectParameters.cs b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
index f3e8dd95ff..b10b0d0300 100644
--- a/main/src/addins/VBNetBinding/Project/VBProjectParameters.cs
+++ b/main/src/addins/VBNetBinding/Project/VBProjectExtension.cs
@@ -1,21 +1,21 @@
-// 
-// VBProjectParameters.cs
-//  
+//
+// VBProjectExtension.cs
+//
 // Author:
-//       Lluis Sanchez Gual <lluis@novell.com>
-// 
-// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-// 
+//       Lluis Sanchez Gual <lluis@xamarin.com>
+//
+// Copyright (c) 2014 Xamarin, Inc (http://www.xamarin.com)
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
 // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 // copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -23,54 +23,44 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 using System;
-using MonoDevelop.Core.Serialization;
 using MonoDevelop.Projects;
+using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Core.Serialization;
 
 namespace MonoDevelop.VBNetBinding
 {
-	public class VBProjectParameters: DotNetProjectParameters
+	public class VBProjectExtension: DotNetProjectExtension
 	{
-		public override bool DefaultNamespaceIsImplicit {
-			get {
-				return true;
-			}
-		}
-
 		[ItemProperty ("OptionInfer", DefaultValue="Off")]
 		string optionInfer = "Off";
-		
+
 		[ItemProperty ("OptionExplicit", DefaultValue="On")]
 		string optionExplicit = "On";
-		
+
 		[ItemProperty ("OptionCompare", DefaultValue="Binary")]
 		string optionCompare = "Binary";
-		
+
 		[ItemProperty ("OptionStrict", DefaultValue="Off")]
 		string optionStrict = "Off";
-		
+
 		[ItemProperty ("MyType", DefaultValue="")]
 		string myType = string.Empty;
-		
+
 		[ItemProperty ("StartupObject", DefaultValue="")]
 		string startupObject = string.Empty;
-		
+
 		[ProjectPathItemProperty ("ApplicationIcon", DefaultValue="")]
 		string applicationIcon = string.Empty;
-		
+
 		[ItemProperty ("CodePage", DefaultValue="")]
 		string codePage = string.Empty;
-		
-		public VBProjectParameters()
-		{
-		}
-		
+
 		public bool OptionInfer {
 			get { return optionInfer == "On"; }
 			set { optionInfer = value ? "On" : "Off"; }
 		}
-		
+
 		public bool OptionExplicit {
 			get { return optionExplicit == "On"; }
 			set { optionExplicit = value ? "On" : "Off"; }
@@ -85,25 +75,44 @@ namespace MonoDevelop.VBNetBinding
 			get { return optionStrict == "On"; }
 			set { optionStrict = value ? "On" : "Off"; }
 		}
-		
+
 		public string MyType {
 			get { return myType; }
 			set { myType = value ?? string.Empty; }
 		}
-		
+
 		public string StartupObject {
 			get { return startupObject; }
 			set { startupObject = value ?? string.Empty; }
 		}
-		
+
 		public string ApplicationIcon {
 			get { return applicationIcon; }
 			set { applicationIcon = value ?? string.Empty; }
 		}
-		
+
 		public string CodePage {
 			get { return codePage; }
 			set { codePage = value ?? string.Empty; }
 		}
+
+		protected override void Initialize ()
+		{
+			base.Initialize ();
+			Project.DefaultNamespaceIsImplicit = true;
+		}
+
+		protected override void OnReadProject (MonoDevelop.Core.ProgressMonitor monitor, MSBuildProject msproject)
+		{
+			base.OnReadProject (monitor, msproject);
+			msproject.GetGlobalPropertyGroup ().ReadObjectProperties (this, typeof(VBProjectExtension));
+		}
+
+		protected override void OnWriteProject (MonoDevelop.Core.ProgressMonitor monitor, MSBuildProject msproject)
+		{
+			base.OnWriteProject (monitor, msproject);
+			msproject.GetGlobalPropertyGroup ().WriteObjectProperties (this, typeof(VBProjectExtension));
+		}
 	}
 }
+