Cleanup BuildOptions

icsharpcode · Sep 9, 2012 · 4513040 · 4513040
1 parent 87dd383
commit 4513040
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml.cs
@@ -38,7 +38,7 @@ public partial class BuildOptions : ProjectOptionPanel
 		private System.Windows.Input.ICommand baseIntermediateOutputPathCommand;
 		private System.Windows.Input.ICommand intermediateOutputPathCommand;
 
-		private MSBuildBasedProject project;
+//		private MSBuildBasedProject project;
 
 		public BuildOptions()
 		{
@@ -192,8 +192,6 @@ private void Initialize()
 		protected override void Load(MSBuildBasedProject project, string configuration, string platform)
 		{
 			base.Load(project, configuration, platform);
-			this.project = project;
-
 			int val;
 			if (!int.TryParse(BaseAddress.Value, NumberStyles.Integer, NumberFormatInfo.InvariantInfo, out val)) {
 				val = 0x400000;
@@ -240,7 +238,7 @@ private void XmlDocHelper()
 		{
 			if (DocumentFileIsChecked) {
 				this.xmlDocumentationTextBox.Text = MSBuildInternals.Escape(
-					Path.ChangeExtension(ICSharpCode.Core.FileUtility.GetRelativePath(project.Directory, project.OutputAssemblyFullPath),
+					Path.ChangeExtension(ICSharpCode.Core.FileUtility.GetRelativePath(base.Project.Directory, base.Project.OutputAssemblyFullPath),
 					                     ".xml"));
 			} else {
 				this.xmlDocumentationTextBox.Text = string.Empty;
@@ -262,13 +260,13 @@ private void XmlDocHelper()
 
 		private void UpdateProjectExecute ()
 		{
-			UpgradeViewContent.Show(project.ParentSolution).Select(project as IUpgradableProject);
+			UpgradeViewContent.Show(base.Project.ParentSolution).Select(base.Project as IUpgradableProject);
 			this.UpdateTargetFrameworkCombo();
 		}
 
 		private void UpdateTargetFrameworkCombo()
 		{
-			TargetFramework fx = ((IUpgradableProject)project).CurrentTargetFramework;
+			TargetFramework fx = ((IUpgradableProject)base.Project).CurrentTargetFramework;
 			if (fx != null) {
 				targetFrameworkComboBox.Items.Add(fx.DisplayName);
 				targetFrameworkComboBox.SelectedIndex = 0;

diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/OptionPanels/BuildOptionsXaml.xaml
@@ -240,17 +240,6 @@
 							<Label Grid.Row="4" Grid.Column="1" HorizontalAlignment="Right"
 							       Content="{core:Localize Dialog.ProjectOptions.Build.DLLBaseAddress}"></Label>
 
-							<!-- Hex binding -->
-							<!--x:Name="dllBaseAddressTextBox"
-							<TextBox Grid.Row="4" Grid.Column="2">
-								<TextBox.Text>
-									<Binding Path="DllBaseAdress" UpdateSourceTrigger="LostFocus">
-										<Binding.ValidationRules>
-											<optionpanels:BaseAdressValidator />
-										</Binding.ValidationRules>
-									</Binding>
-								</TextBox.Text>
-							</TextBox>-->
 
 							<!-- Hex binding -->
 							<TextBox Grid.Row="4" Grid.Column="2"