vsaddin fix line ends with dos2unix

20 files changed, 3154 insertions, 3154 deletions

diff --git a/vsaddin/src/AssemblyInfo.cs b/vsaddin/src/AssemblyInfo.cs
index d5de5a1b3b8..ce2c7565048 100644
--- a/vsaddin/src/AssemblyInfo.cs
+++ b/vsaddin/src/AssemblyInfo.cs
@@ -1,27 +1,27 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Reflection;

-using System.Runtime.CompilerServices;

-using System.Runtime.InteropServices;

-using System.Resources;

-

-[assembly: AssemblyTitle("IceVisualStudioAddIn")]

-[assembly: AssemblyDescription("Ice Add-In for Visual Studio")]

-[assembly: AssemblyCompany("ZeroC, Inc.")]

-[assembly: AssemblyConfiguration("")]

-[assembly: AssemblyProduct("Ice Add-In for Visual Studio")]

-[assembly: AssemblyCopyright("Copyright (c) 2003-2011 ZeroC, Inc.")]

-[assembly: AssemblyTrademark("Ice")]

-[assembly: AssemblyCulture("")]

-[assembly: AssemblyVersion("3.4.2.0")]

-[assembly: AssemblyDelaySign(false)]

-[assembly: ComVisible(false)]

-[assembly: NeutralResourcesLanguageAttribute("en-US")]

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Resources;
+
+[assembly: AssemblyTitle("IceVisualStudioAddIn")]
+[assembly: AssemblyDescription("Ice Add-In for Visual Studio")]
+[assembly: AssemblyCompany("ZeroC, Inc.")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyProduct("Ice Add-In for Visual Studio")]
+[assembly: AssemblyCopyright("Copyright (c) 2003-2011 ZeroC, Inc.")]
+[assembly: AssemblyTrademark("Ice")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("3.4.2.0")]
+[assembly: AssemblyDelaySign(false)]
+[assembly: ComVisible(false)]
+[assembly: NeutralResourcesLanguageAttribute("en-US")]
diff --git a/vsaddin/src/Builder.cs b/vsaddin/src/Builder.cs
index 7773b62cdc5..e4e18447d5f 100644
--- a/vsaddin/src/Builder.cs
+++ b/vsaddin/src/Builder.cs
@@ -1555,59 +1555,59 @@ namespace Ice.VisualStudio
         }
         
         public static string getSliceCompilerVersion(Project project, string sliceCompiler)
-        {

-            System.Diagnostics.Process process = new System.Diagnostics.Process();

-            process.StartInfo.FileName = Path.Combine(Util.getIceHome(), "bin\\" +  sliceCompiler);

+        {
+            System.Diagnostics.Process process = new System.Diagnostics.Process();
+            process.StartInfo.FileName = Path.Combine(Util.getIceHome(), "bin\\" +  sliceCompiler);
             process.StartInfo.Arguments = "-v";
-            process.StartInfo.CreateNoWindow = true;

+            process.StartInfo.CreateNoWindow = true;
             process.StartInfo.UseShellExecute = false;
             process.StartInfo.RedirectStandardError = true;
             process.StartInfo.RedirectStandardOutput = true;
-            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);

-

-            StreamReader reader = new StreamReader();

-            process.OutputDataReceived += new DataReceivedEventHandler(reader.appendData);

-

-            try

-            {

-                process.Start();

-            }

-            catch(InvalidOperationException ex)

-            {

-                Util.write(project, Util.msgLevel.msgError,

-                           "An exception was thrown when trying to start the slice compiler\n" +

-                           ex.ToString());

-                

-                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,

-                         "An exception was thrown when trying to start slice compiler\n" +

-                         ex.ToString());

-                return "";

-            }

-            catch(System.ComponentModel.Win32Exception ex)

-            {

-                Util.write(project, Util.msgLevel.msgError,

-                           "An exception was thrown when trying to start the slice compiler\n" +

-                           ex.ToString());

-                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,

-                         "An exception was thrown when trying to start slice compiler\n" +

-                         ex.ToString());

-                return "";

-            }

-

-            // Start the asynchronous read of the standard output stream.

-            process.BeginOutputReadLine();

-            string version = process.StandardError.ReadToEnd();

+            process.StartInfo.WorkingDirectory = Path.GetDirectoryName(project.FileName);
+
+            StreamReader reader = new StreamReader();
+            process.OutputDataReceived += new DataReceivedEventHandler(reader.appendData);
+
+            try
+            {
+                process.Start();
+            }
+            catch(InvalidOperationException ex)
+            {
+                Util.write(project, Util.msgLevel.msgError,
+                           "An exception was thrown when trying to start the slice compiler\n" +
+                           ex.ToString());
+                
+                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,
+                         "An exception was thrown when trying to start slice compiler\n" +
+                         ex.ToString());
+                return "";
+            }
+            catch(System.ComponentModel.Win32Exception ex)
+            {
+                Util.write(project, Util.msgLevel.msgError,
+                           "An exception was thrown when trying to start the slice compiler\n" +
+                           ex.ToString());
+                Connect.getBuilder().addError(project, "", TaskErrorCategory.Error, 0, 0,
+                         "An exception was thrown when trying to start slice compiler\n" +
+                         ex.ToString());
+                return "";
+            }
+
+            // Start the asynchronous read of the standard output stream.
+            process.BeginOutputReadLine();
+            string version = process.StandardError.ReadToEnd();
             process.WaitForExit();
 
             if(String.IsNullOrEmpty(version))
-            {

-                //

-                // Some old version of slice compilers print version 

-                // to StdOut instead of StdErr

-                //

-                version = reader.data();

-                if(String.IsNullOrEmpty(version))

-                {

+            {
+                //
+                // Some old version of slice compilers print version 
+                // to StdOut instead of StdErr
+                //
+                version = reader.data();
+                if(String.IsNullOrEmpty(version))
+                {
                     return "";
                 }
             }
diff --git a/vsaddin/src/Connect.cs b/vsaddin/src/Connect.cs
index 11e097bb948..8c270e8b484 100644
--- a/vsaddin/src/Connect.cs
+++ b/vsaddin/src/Connect.cs
@@ -67,7 +67,7 @@ namespace Ice.VisualStudio
                         EnvDTE.Property prop = props.Item("ShowNoMatchingRuleDlg");
                         prop.Value = false;
 #endif
-                        _builder = new Builder();

+                        _builder = new Builder();
                         _builder.commandLine = connectMode == ext_ConnectMode.ext_cm_CommandLine;
                         _builder.init(_applicationObject, connectMode, _addInInstance);
                     }
@@ -143,7 +143,7 @@ namespace Ice.VisualStudio
                 if(executeOption == vsCommandExecOption.vsCommandExecOptionDoDefault)
                 {
                     if(commandName == "Ice.VisualStudio.Connect.IceConfiguration")
-                    {

+                    {
                         Project project = builder.getSelectedProject();
 
                         if(project == null)
diff --git a/vsaddin/src/ExtraCompilerOptionsView.Designer.cs b/vsaddin/src/ExtraCompilerOptionsView.Designer.cs
index 7715c91215c..4bbe66c1ae2 100644
--- a/vsaddin/src/ExtraCompilerOptionsView.Designer.cs
+++ b/vsaddin/src/ExtraCompilerOptionsView.Designer.cs
@@ -1,87 +1,87 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class ExtraCompilerOptionsView

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if(disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.groupExtraOptions = new System.Windows.Forms.GroupBox();

-            this.txtExtraOptions = new System.Windows.Forms.TextBox();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.groupExtraOptions.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // groupExtraOptions

-            // 

-            this.groupExtraOptions.Controls.Add(this.txtExtraOptions);

-            this.groupExtraOptions.Location = new System.Drawing.Point(5, 3);

-            this.groupExtraOptions.Name = "groupExtraOptions";

-            this.groupExtraOptions.Size = new System.Drawing.Size(487, 67);

-            this.groupExtraOptions.TabIndex = 0;

-            this.groupExtraOptions.TabStop = false;

-            this.groupExtraOptions.Text = "Extra Compiler Options";

-            // 

-            // txtExtraOptions

-            // 

-            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);

-            this.txtExtraOptions.Multiline = true;

-            this.txtExtraOptions.Name = "txtExtraOptions";

-            this.txtExtraOptions.Size = new System.Drawing.Size(475, 42);

-            this.txtExtraOptions.TabIndex = 0;

-            this.txtExtraOptions.TextChanged += new System.EventHandler(this.txtExtraOptions_TextChanged);

-            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Enter);

-            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);

-            // 

-            // ExtraCompilerOptionsView

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.Controls.Add(this.groupExtraOptions);

-            this.Name = "ExtraCompilerOptionsView";

-            this.Size = new System.Drawing.Size(495, 75);

-            this.groupExtraOptions.ResumeLayout(false);

-            this.groupExtraOptions.PerformLayout();

-            this.ResumeLayout(false);

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.GroupBox groupExtraOptions;

-        private System.Windows.Forms.TextBox txtExtraOptions;

-        private System.Windows.Forms.ToolTip toolTip;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class ExtraCompilerOptionsView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.groupExtraOptions = new System.Windows.Forms.GroupBox();
+            this.txtExtraOptions = new System.Windows.Forms.TextBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.groupExtraOptions.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupExtraOptions
+            // 
+            this.groupExtraOptions.Controls.Add(this.txtExtraOptions);
+            this.groupExtraOptions.Location = new System.Drawing.Point(5, 3);
+            this.groupExtraOptions.Name = "groupExtraOptions";
+            this.groupExtraOptions.Size = new System.Drawing.Size(487, 67);
+            this.groupExtraOptions.TabIndex = 0;
+            this.groupExtraOptions.TabStop = false;
+            this.groupExtraOptions.Text = "Extra Compiler Options";
+            // 
+            // txtExtraOptions
+            // 
+            this.txtExtraOptions.Location = new System.Drawing.Point(6, 19);
+            this.txtExtraOptions.Multiline = true;
+            this.txtExtraOptions.Name = "txtExtraOptions";
+            this.txtExtraOptions.Size = new System.Drawing.Size(475, 42);
+            this.txtExtraOptions.TabIndex = 0;
+            this.txtExtraOptions.TextChanged += new System.EventHandler(this.txtExtraOptions_TextChanged);
+            this.txtExtraOptions.Enter += new System.EventHandler(this.txtExtraOptions_Enter);
+            this.txtExtraOptions.LostFocus += new System.EventHandler(this.txtExtraOptions_LostFocus);
+            // 
+            // ExtraCompilerOptionsView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupExtraOptions);
+            this.Name = "ExtraCompilerOptionsView";
+            this.Size = new System.Drawing.Size(495, 75);
+            this.groupExtraOptions.ResumeLayout(false);
+            this.groupExtraOptions.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupExtraOptions;
+        private System.Windows.Forms.TextBox txtExtraOptions;
+        private System.Windows.Forms.ToolTip toolTip;
+    }
+}
diff --git a/vsaddin/src/ExtraCompilerOptionsView.cs b/vsaddin/src/ExtraCompilerOptionsView.cs
index c45c4b551b0..30d9e49a68f 100644
--- a/vsaddin/src/ExtraCompilerOptionsView.cs
+++ b/vsaddin/src/ExtraCompilerOptionsView.cs
@@ -1,146 +1,146 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Drawing;

-using System.Data;

-using System.Text;

-using System.Windows.Forms;

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class ExtraCompilerOptionsView : UserControl

-    {

-        public ExtraCompilerOptionsView()

-        {

-            InitializeComponent();

-            toolTip.SetToolTip(txtExtraOptions, "Extra options passed to slice compiler.");

-        }

-

-        public void init(IceConfigurationDialog dialog, Project project)

-        {

-            _dialog = dialog;

-            _project = project;

-        }

-

-        public void load()

-        {

-            txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);

-        }

-

-        public bool hasUnsavedChanges()

-        {

-            return !txtExtraOptions.Text.Trim().Equals(Util.getProjectProperty(_project, Util.PropertyIceExtraOptions),

-                                                       StringComparison.CurrentCulture);

-        }

-

-        public bool apply(ref bool changed)

-        {

-            changed = false;

-            if(hasUnsavedChanges())

-            {

-                if(!checkExtraOptions())

-                {

-                    txtExtraOptions.Focus();

-                    return false;

-                }

-                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);

-                if(Util.isCppProject(_project))

-                {

-                    //

-                    // If header or source extension has changed, we need to delete generated items

-                    // from the project. The new items will be added when the project is build, on dialog

-                    // close.

-                    //

-                    if(!Util.getHeaderExt(_project).Equals(_headerExt) ||

-                       !Util.getSourceExt(_project).Equals(_sourceExt))

-                    {

-                        Util.cleanProject(_project, true);

-                    }

-                    Util.setProjectProperty(_project, Util.PropertyIceHeaderExt, _headerExt);

-                    Util.setProjectProperty(_project, Util.PropertyIceSourceExt, _sourceExt);

-                }

-                changed = true;

-                _dialog.needSave();

-            }

-            return true;

-        }

-

-        public void setEnabled(bool enabled)

-        {

-            txtExtraOptions.Enabled = enabled;

-        }

-

-        private void txtExtraOptions_Enter(object sender, EventArgs e)

-        {

-            if(_dialog.editingIncludeDir())

-            {

-                _dialog.endEditIncludeDir(true);

-            }

-        }

-

-        private void txtExtraOptions_LostFocus(object sender, EventArgs e)

-        {

-            _dialog.needSave();

-        }

-

-        private void  txtExtraOptions_TextChanged(object sender, EventArgs e)

-        {

-            _dialog.needSave();

-        }

-

-        private bool parseSlice2slOptions()

-        {

-            Options opts = null;

-            return Util.parseSlice2slOptions(txtExtraOptions.Text, true, ref opts);

-        }

-

-        private bool parseSlice2csOptions()

-        {

-            Options opts = null;

-            return Util.parseSlice2csOptions(txtExtraOptions.Text, true, ref opts);

-        }

-

-        private bool parseSlice2cppOptions()

-        {

-            Options opts = null;

-            _headerExt = ".h";

-            _sourceExt = ".cpp";

-            return Util.parseSlice2cppOptions(txtExtraOptions.Text, true, ref opts, ref _headerExt, ref _sourceExt);

-        }

-

-        private bool checkExtraOptions()

-        {

-            if(Util.isCppProject(_project))

-            {

-                return parseSlice2cppOptions();

-            }

-            else if(Util.isCSharpProject(_project))

-            {

-                if(Util.isSilverlightProject(_project))

-                {

-                    return parseSlice2slOptions();

-                }

-                else

-                {

-                    return parseSlice2csOptions();

-                }

-            }

-            return true;

-        }

-

-        private IceConfigurationDialog _dialog;

-        private Project _project;

-        private string _headerExt = "h";

-        private string _sourceExt = "cpp";

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.Windows.Forms;
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class ExtraCompilerOptionsView : UserControl
+    {
+        public ExtraCompilerOptionsView()
+        {
+            InitializeComponent();
+            toolTip.SetToolTip(txtExtraOptions, "Extra options passed to slice compiler.");
+        }
+
+        public void init(IceConfigurationDialog dialog, Project project)
+        {
+            _dialog = dialog;
+            _project = project;
+        }
+
+        public void load()
+        {
+            txtExtraOptions.Text = Util.getProjectProperty(_project, Util.PropertyIceExtraOptions);
+        }
+
+        public bool hasUnsavedChanges()
+        {
+            return !txtExtraOptions.Text.Trim().Equals(Util.getProjectProperty(_project, Util.PropertyIceExtraOptions),
+                                                       StringComparison.CurrentCulture);
+        }
+
+        public bool apply(ref bool changed)
+        {
+            changed = false;
+            if(hasUnsavedChanges())
+            {
+                if(!checkExtraOptions())
+                {
+                    txtExtraOptions.Focus();
+                    return false;
+                }
+                Util.setProjectProperty(_project, Util.PropertyIceExtraOptions, txtExtraOptions.Text);
+                if(Util.isCppProject(_project))
+                {
+                    //
+                    // If header or source extension has changed, we need to delete generated items
+                    // from the project. The new items will be added when the project is build, on dialog
+                    // close.
+                    //
+                    if(!Util.getHeaderExt(_project).Equals(_headerExt) ||
+                       !Util.getSourceExt(_project).Equals(_sourceExt))
+                    {
+                        Util.cleanProject(_project, true);
+                    }
+                    Util.setProjectProperty(_project, Util.PropertyIceHeaderExt, _headerExt);
+                    Util.setProjectProperty(_project, Util.PropertyIceSourceExt, _sourceExt);
+                }
+                changed = true;
+                _dialog.needSave();
+            }
+            return true;
+        }
+
+        public void setEnabled(bool enabled)
+        {
+            txtExtraOptions.Enabled = enabled;
+        }
+
+        private void txtExtraOptions_Enter(object sender, EventArgs e)
+        {
+            if(_dialog.editingIncludeDir())
+            {
+                _dialog.endEditIncludeDir(true);
+            }
+        }
+
+        private void txtExtraOptions_LostFocus(object sender, EventArgs e)
+        {
+            _dialog.needSave();
+        }
+
+        private void  txtExtraOptions_TextChanged(object sender, EventArgs e)
+        {
+            _dialog.needSave();
+        }
+
+        private bool parseSlice2slOptions()
+        {
+            Options opts = null;
+            return Util.parseSlice2slOptions(txtExtraOptions.Text, true, ref opts);
+        }
+
+        private bool parseSlice2csOptions()
+        {
+            Options opts = null;
+            return Util.parseSlice2csOptions(txtExtraOptions.Text, true, ref opts);
+        }
+
+        private bool parseSlice2cppOptions()
+        {
+            Options opts = null;
+            _headerExt = ".h";
+            _sourceExt = ".cpp";
+            return Util.parseSlice2cppOptions(txtExtraOptions.Text, true, ref opts, ref _headerExt, ref _sourceExt);
+        }
+
+        private bool checkExtraOptions()
+        {
+            if(Util.isCppProject(_project))
+            {
+                return parseSlice2cppOptions();
+            }
+            else if(Util.isCSharpProject(_project))
+            {
+                if(Util.isSilverlightProject(_project))
+                {
+                    return parseSlice2slOptions();
+                }
+                else
+                {
+                    return parseSlice2csOptions();
+                }
+            }
+            return true;
+        }
+
+        private IceConfigurationDialog _dialog;
+        private Project _project;
+        private string _headerExt = "h";
+        private string _sourceExt = "cpp";
+    }
+}
diff --git a/vsaddin/src/IceCppConfigurationDialog.Designer.cs b/vsaddin/src/IceCppConfigurationDialog.Designer.cs
index d9dc37ba8b6..4ebb9cebced 100644
--- a/vsaddin/src/IceCppConfigurationDialog.Designer.cs
+++ b/vsaddin/src/IceCppConfigurationDialog.Designer.cs
@@ -36,348 +36,348 @@ namespace Ice.VisualStudio
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent()
-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceUtil = new System.Windows.Forms.CheckBox();

-            this.chkFreeze = new System.Windows.Forms.CheckBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.label1 = new System.Windows.Forms.Label();

-            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();

-            this.chkChecksum = new System.Windows.Forms.CheckBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.chkStreaming = new System.Windows.Forms.CheckBox();

-            this.btnCancel = new System.Windows.Forms.Button();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.grouDllExportSymbol = new System.Windows.Forms.GroupBox();

-            this.txtDllExportSymbol = new System.Windows.Forms.TextBox();

-            this.btnOk = new System.Windows.Forms.Button();

-            this.btnApply = new System.Windows.Forms.Button();

-            this.outputDirView = new Ice.VisualStudio.OutputDirView();

-            this.includePathView = new Ice.VisualStudio.IncludePathView();

-            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.grouDllExportSymbol.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceUtil);

-            this.groupBox3.Controls.Add(this.chkFreeze);

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(9, 424);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(488, 62);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceUtil

-            // 

-            this.chkIceUtil.AutoSize = true;

-            this.chkIceUtil.Location = new System.Drawing.Point(74, 39);

-            this.chkIceUtil.Name = "chkIceUtil";

-            this.chkIceUtil.Size = new System.Drawing.Size(56, 17);

-            this.chkIceUtil.TabIndex = 24;

-            this.chkIceUtil.TabStop = false;

-            this.chkIceUtil.Text = "IceUtil";

-            this.chkIceUtil.UseVisualStyleBackColor = true;

-            this.chkIceUtil.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkFreeze

-            // 

-            this.chkFreeze.AutoSize = true;

-            this.chkFreeze.Location = new System.Drawing.Point(7, 19);

-            this.chkFreeze.Name = "chkFreeze";

-            this.chkFreeze.Size = new System.Drawing.Size(58, 17);

-            this.chkFreeze.TabIndex = 16;

-            this.chkFreeze.Text = "Freeze";

-            this.chkFreeze.UseVisualStyleBackColor = true;

-            this.chkFreeze.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(7, 39);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 23;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(419, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 22;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(335, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 21;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(266, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 20;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(198, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 19;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(74, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 17;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(148, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 18;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.label1);

-            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);

-            this.groupBox4.Controls.Add(this.chkChecksum);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Controls.Add(this.chkStreaming);

-            this.groupBox4.Location = new System.Drawing.Point(11, 83);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // label1

-            // 

-            this.label1.AutoSize = true;

-            this.label1.Location = new System.Drawing.Point(286, 19);

-            this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(67, 13);

-            this.label1.TabIndex = 8;

-            this.label1.Text = "Trace Level:";

-            // 

-            // comboBoxVerboseLevel

-            // 

-            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.comboBoxVerboseLevel.FormattingEnabled = true;

-            this.comboBoxVerboseLevel.Items.AddRange(new object[] {

-            "Errors",

-            "Info",

-            "Debug"});

-            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(359, 15);

-            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";

-            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);

-            this.comboBoxVerboseLevel.TabIndex = 7;

-            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkChecksum

-            // 

-            this.chkChecksum.AutoSize = true;

-            this.chkChecksum.Location = new System.Drawing.Point(181, 19);

-            this.chkChecksum.Name = "chkChecksum";

-            this.chkChecksum.Size = new System.Drawing.Size(76, 17);

-            this.chkChecksum.TabIndex = 5;

-            this.chkChecksum.Text = "Checksum";

-            this.chkChecksum.UseVisualStyleBackColor = true;

-            this.chkChecksum.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 3;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkStreaming

-            // 

-            this.chkStreaming.AutoSize = true;

-            this.chkStreaming.Location = new System.Drawing.Point(86, 19);

-            this.chkStreaming.Name = "chkStreaming";

-            this.chkStreaming.Size = new System.Drawing.Size(73, 17);

-            this.chkStreaming.TabIndex = 4;

-            this.chkStreaming.Text = "Streaming";

-            this.chkStreaming.UseVisualStyleBackColor = true;

-            this.chkStreaming.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // btnCancel

-            // 

-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnCancel.Location = new System.Drawing.Point(421, 493);

-            this.btnCancel.Name = "btnCancel";

-            this.btnCancel.Size = new System.Drawing.Size(75, 23);

-            this.btnCancel.TabIndex = 25;

-            this.btnCancel.Text = "Cancel";

-            this.btnCancel.UseVisualStyleBackColor = true;

-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // grouDllExportSymbol

-            // 

-            this.grouDllExportSymbol.Controls.Add(this.txtDllExportSymbol);

-            this.grouDllExportSymbol.Location = new System.Drawing.Point(9, 379);

-            this.grouDllExportSymbol.Name = "grouDllExportSymbol";

-            this.grouDllExportSymbol.Size = new System.Drawing.Size(487, 43);

-            this.grouDllExportSymbol.TabIndex = 7;

-            this.grouDllExportSymbol.TabStop = false;

-            this.grouDllExportSymbol.Text = "DLL Export Symbol";

-            // 

-            // txtDllExportSymbol

-            // 

-            this.txtDllExportSymbol.Location = new System.Drawing.Point(6, 16);

-            this.txtDllExportSymbol.Name = "txtDllExportSymbol";

-            this.txtDllExportSymbol.Size = new System.Drawing.Size(474, 20);

-            this.txtDllExportSymbol.TabIndex = 15;

-            this.txtDllExportSymbol.TextChanged += new System.EventHandler(this.txtDllExportSymbol_Changed);

-            this.txtDllExportSymbol.Enter += new System.EventHandler(this.txtDllExportSymbol_Focus);

-            this.txtDllExportSymbol.LostFocus += new System.EventHandler(this.txtDllExportSymbol_Changed);

-            // 

-            // btnOk

-            // 

-            this.btnOk.Location = new System.Drawing.Point(260, 493);

-            this.btnOk.Name = "btnOk";

-            this.btnOk.Size = new System.Drawing.Size(75, 23);

-            this.btnOk.TabIndex = 26;

-            this.btnOk.Text = "Ok";

-            this.btnOk.UseVisualStyleBackColor = true;

-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);

-            // 

-            // btnApply

-            // 

-            this.btnApply.Location = new System.Drawing.Point(340, 493);

-            this.btnApply.Name = "btnApply";

-            this.btnApply.Size = new System.Drawing.Size(75, 23);

-            this.btnApply.TabIndex = 27;

-            this.btnApply.Text = "Apply";

-            this.btnApply.UseVisualStyleBackColor = true;

-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);

-            // 

-            // outputDirView

-            // 

-            this.outputDirView.Location = new System.Drawing.Point(5, 31);

-            this.outputDirView.Name = "outputDirView";

-            this.outputDirView.Size = new System.Drawing.Size(498, 52);

-            this.outputDirView.TabIndex = 31;

-            // 

-            // includePathView

-            // 

-            this.includePathView.Location = new System.Drawing.Point(6, 202);

-            this.includePathView.Name = "includePathView";

-            this.includePathView.Size = new System.Drawing.Size(493, 174);

-            this.includePathView.TabIndex = 29;

-            // 

-            // extraCompilerOptions

-            // 

-            this.extraCompilerOptions.Location = new System.Drawing.Point(3, 125);

-            this.extraCompilerOptions.Name = "extraCompilerOptions";

-            this.extraCompilerOptions.Size = new System.Drawing.Size(495, 79);

-            this.extraCompilerOptions.TabIndex = 28;

-            // 

-            // IceCppConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnCancel;

-            this.ClientSize = new System.Drawing.Size(515, 528);

-            this.Controls.Add(this.outputDirView);

-            this.Controls.Add(this.includePathView);

-            this.Controls.Add(this.extraCompilerOptions);

-            this.Controls.Add(this.btnApply);

-            this.Controls.Add(this.btnOk);

-            this.Controls.Add(this.grouDllExportSymbol);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.btnCancel);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceCppConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.grouDllExportSymbol.ResumeLayout(false);

-            this.grouDllExportSymbol.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceUtil = new System.Windows.Forms.CheckBox();
+            this.chkFreeze = new System.Windows.Forms.CheckBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();
+            this.chkChecksum = new System.Windows.Forms.CheckBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.chkStreaming = new System.Windows.Forms.CheckBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.grouDllExportSymbol = new System.Windows.Forms.GroupBox();
+            this.txtDllExportSymbol = new System.Windows.Forms.TextBox();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.btnApply = new System.Windows.Forms.Button();
+            this.outputDirView = new Ice.VisualStudio.OutputDirView();
+            this.includePathView = new Ice.VisualStudio.IncludePathView();
+            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.grouDllExportSymbol.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceUtil);
+            this.groupBox3.Controls.Add(this.chkFreeze);
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(9, 424);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(488, 62);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceUtil
+            // 
+            this.chkIceUtil.AutoSize = true;
+            this.chkIceUtil.Location = new System.Drawing.Point(74, 39);
+            this.chkIceUtil.Name = "chkIceUtil";
+            this.chkIceUtil.Size = new System.Drawing.Size(56, 17);
+            this.chkIceUtil.TabIndex = 24;
+            this.chkIceUtil.TabStop = false;
+            this.chkIceUtil.Text = "IceUtil";
+            this.chkIceUtil.UseVisualStyleBackColor = true;
+            this.chkIceUtil.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkFreeze
+            // 
+            this.chkFreeze.AutoSize = true;
+            this.chkFreeze.Location = new System.Drawing.Point(7, 19);
+            this.chkFreeze.Name = "chkFreeze";
+            this.chkFreeze.Size = new System.Drawing.Size(58, 17);
+            this.chkFreeze.TabIndex = 16;
+            this.chkFreeze.Text = "Freeze";
+            this.chkFreeze.UseVisualStyleBackColor = true;
+            this.chkFreeze.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(7, 39);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 23;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(419, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 22;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(335, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 21;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(266, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 20;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(198, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 19;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(74, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 17;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(148, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 18;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.label1);
+            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);
+            this.groupBox4.Controls.Add(this.chkChecksum);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Controls.Add(this.chkStreaming);
+            this.groupBox4.Location = new System.Drawing.Point(11, 83);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(286, 19);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(67, 13);
+            this.label1.TabIndex = 8;
+            this.label1.Text = "Trace Level:";
+            // 
+            // comboBoxVerboseLevel
+            // 
+            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxVerboseLevel.FormattingEnabled = true;
+            this.comboBoxVerboseLevel.Items.AddRange(new object[] {
+            "Errors",
+            "Info",
+            "Debug"});
+            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(359, 15);
+            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";
+            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);
+            this.comboBoxVerboseLevel.TabIndex = 7;
+            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkChecksum
+            // 
+            this.chkChecksum.AutoSize = true;
+            this.chkChecksum.Location = new System.Drawing.Point(181, 19);
+            this.chkChecksum.Name = "chkChecksum";
+            this.chkChecksum.Size = new System.Drawing.Size(76, 17);
+            this.chkChecksum.TabIndex = 5;
+            this.chkChecksum.Text = "Checksum";
+            this.chkChecksum.UseVisualStyleBackColor = true;
+            this.chkChecksum.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 3;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkStreaming
+            // 
+            this.chkStreaming.AutoSize = true;
+            this.chkStreaming.Location = new System.Drawing.Point(86, 19);
+            this.chkStreaming.Name = "chkStreaming";
+            this.chkStreaming.Size = new System.Drawing.Size(73, 17);
+            this.chkStreaming.TabIndex = 4;
+            this.chkStreaming.Text = "Streaming";
+            this.chkStreaming.UseVisualStyleBackColor = true;
+            this.chkStreaming.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(421, 493);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 25;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // grouDllExportSymbol
+            // 
+            this.grouDllExportSymbol.Controls.Add(this.txtDllExportSymbol);
+            this.grouDllExportSymbol.Location = new System.Drawing.Point(9, 379);
+            this.grouDllExportSymbol.Name = "grouDllExportSymbol";
+            this.grouDllExportSymbol.Size = new System.Drawing.Size(487, 43);
+            this.grouDllExportSymbol.TabIndex = 7;
+            this.grouDllExportSymbol.TabStop = false;
+            this.grouDllExportSymbol.Text = "DLL Export Symbol";
+            // 
+            // txtDllExportSymbol
+            // 
+            this.txtDllExportSymbol.Location = new System.Drawing.Point(6, 16);
+            this.txtDllExportSymbol.Name = "txtDllExportSymbol";
+            this.txtDllExportSymbol.Size = new System.Drawing.Size(474, 20);
+            this.txtDllExportSymbol.TabIndex = 15;
+            this.txtDllExportSymbol.TextChanged += new System.EventHandler(this.txtDllExportSymbol_Changed);
+            this.txtDllExportSymbol.Enter += new System.EventHandler(this.txtDllExportSymbol_Focus);
+            this.txtDllExportSymbol.LostFocus += new System.EventHandler(this.txtDllExportSymbol_Changed);
+            // 
+            // btnOk
+            // 
+            this.btnOk.Location = new System.Drawing.Point(260, 493);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 26;
+            this.btnOk.Text = "Ok";
+            this.btnOk.UseVisualStyleBackColor = true;
+            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            // 
+            // btnApply
+            // 
+            this.btnApply.Location = new System.Drawing.Point(340, 493);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Size = new System.Drawing.Size(75, 23);
+            this.btnApply.TabIndex = 27;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // outputDirView
+            // 
+            this.outputDirView.Location = new System.Drawing.Point(5, 31);
+            this.outputDirView.Name = "outputDirView";
+            this.outputDirView.Size = new System.Drawing.Size(498, 52);
+            this.outputDirView.TabIndex = 31;
+            // 
+            // includePathView
+            // 
+            this.includePathView.Location = new System.Drawing.Point(6, 202);
+            this.includePathView.Name = "includePathView";
+            this.includePathView.Size = new System.Drawing.Size(493, 174);
+            this.includePathView.TabIndex = 29;
+            // 
+            // extraCompilerOptions
+            // 
+            this.extraCompilerOptions.Location = new System.Drawing.Point(3, 125);
+            this.extraCompilerOptions.Name = "extraCompilerOptions";
+            this.extraCompilerOptions.Size = new System.Drawing.Size(495, 79);
+            this.extraCompilerOptions.TabIndex = 28;
+            // 
+            // IceCppConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(515, 528);
+            this.Controls.Add(this.outputDirView);
+            this.Controls.Add(this.includePathView);
+            this.Controls.Add(this.extraCompilerOptions);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.grouDllExportSymbol);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceCppConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.grouDllExportSymbol.ResumeLayout(false);
+            this.grouDllExportSymbol.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
        } 
 
         #endregion
@@ -404,9 +404,9 @@ namespace Ice.VisualStudio
         private System.Windows.Forms.ComboBox comboBoxVerboseLevel;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Button btnOk;
-        private System.Windows.Forms.Button btnApply;

+        private System.Windows.Forms.Button btnApply;
         private IncludePathView includePathView;
-        private OutputDirView outputDirView;

+        private OutputDirView outputDirView;
         private ExtraCompilerOptionsView extraCompilerOptions;
     }
 }
diff --git a/vsaddin/src/IceCppConfigurationDialog.cs b/vsaddin/src/IceCppConfigurationDialog.cs
index abfe0709e34..df94010aeb0 100644
--- a/vsaddin/src/IceCppConfigurationDialog.cs
+++ b/vsaddin/src/IceCppConfigurationDialog.cs
@@ -195,7 +195,7 @@ namespace Ice.VisualStudio
                 if(_initialized)
                 {
                     _initialized = false;
-                    setEnabled(chkEnableBuilder.Checked);

+                    setEnabled(chkEnableBuilder.Checked);
                     ComponentList components;
                     if(chkEnableBuilder.Checked)
                     {
@@ -221,14 +221,14 @@ namespace Ice.VisualStudio
                     else
                     {
                         components = iceComponents();
-                    }

-

-                    //

-                    // Enable / Disable the given set of components

-                    //

-                    for(int i = 0; i < components.Count; ++i)

-                    {

-                        checkComponent(components[i], chkEnableBuilder.Checked);

+                    }
+
+                    //
+                    // Enable / Disable the given set of components
+                    //
+                    for(int i = 0; i < components.Count; ++i)
+                    {
+                        checkComponent(components[i], chkEnableBuilder.Checked);
                     }
 
                     chkEnableBuilder.Enabled = true;
@@ -536,82 +536,82 @@ namespace Ice.VisualStudio
                 {
                     Util.setProjectProperty(_project, Util.PropertyIceDllExport, txtDllExportSymbol.Text);
                     _changed = true;
-                }

-

+                }
+
                 ComponentList components = new ComponentList();
                 if(!enabling)
                 {
                     
                     if(chkFreeze.Checked != Util.hasIceCppLib(_project, "Freeze"))
                     {
-                        componentChanged("Freeze", chkFreeze.Checked);

-                        if(!chkFreeze.Checked)

-                        {

-                            components.Add("Freeze");

+                        componentChanged("Freeze", chkFreeze.Checked);
+                        if(!chkFreeze.Checked)
+                        {
+                            components.Add("Freeze");
                         }
                     }
                     if(chkGlacier2.Checked != Util.hasIceCppLib(_project, "Glacier2"))
                     {
-                        componentChanged("Glacier2", chkGlacier2.Checked);

-                        if(!chkGlacier2.Checked)

-                        {

-                            components.Add("Glacier2");

+                        componentChanged("Glacier2", chkGlacier2.Checked);
+                        if(!chkGlacier2.Checked)
+                        {
+                            components.Add("Glacier2");
                         }
                     }
                     if(chkIce.Checked != Util.hasIceCppLib(_project, "Ice"))
                     {
-                        componentChanged("Ice", chkIce.Checked);

-                        if(!chkIce.Checked)

-                        {

-                            components.Add("Ice");

+                        componentChanged("Ice", chkIce.Checked);
+                        if(!chkIce.Checked)
+                        {
+                            components.Add("Ice");
                         }
                     }
                     if(chkIceBox.Checked != Util.hasIceCppLib(_project, "IceBox"))
                     {
-                        componentChanged("IceBox", chkIceBox.Checked);

-                        if(!chkIceBox.Checked)

-                        {

-                            components.Add("IceBox");

+                        componentChanged("IceBox", chkIceBox.Checked);
+                        if(!chkIceBox.Checked)
+                        {
+                            components.Add("IceBox");
                         }
                     }
                     if(chkIceGrid.Checked != Util.hasIceCppLib(_project, "IceGrid"))
                     {
-                        componentChanged("IceGrid", chkIceGrid.Checked);

-                        if(!chkIceGrid.Checked)

-                        {

-                            components.Add("IceGrid");

+                        componentChanged("IceGrid", chkIceGrid.Checked);
+                        if(!chkIceGrid.Checked)
+                        {
+                            components.Add("IceGrid");
                         }
                     }
                     if(chkIcePatch2.Checked != Util.hasIceCppLib(_project, "IcePatch2"))
                     {
-                        componentChanged("IcePatch2", chkIcePatch2.Checked);

-                        if(!chkIcePatch2.Checked)

-                        {

-                            components.Add("IcePatch2");

+                        componentChanged("IcePatch2", chkIcePatch2.Checked);
+                        if(!chkIcePatch2.Checked)
+                        {
+                            components.Add("IcePatch2");
                         }
                     }
                     if(chkIceSSL.Checked != Util.hasIceCppLib(_project, "IceSSL"))
                     {
-                        componentChanged("IceSSL", chkIceSSL.Checked);

-                        if(!chkIceSSL.Checked)

-                        {

-                            components.Add("IceSSL");

+                        componentChanged("IceSSL", chkIceSSL.Checked);
+                        if(!chkIceSSL.Checked)
+                        {
+                            components.Add("IceSSL");
                         }
                     }
                     if(chkIceStorm.Checked != Util.hasIceCppLib(_project, "IceStorm"))
                     {
-                        componentChanged("IceStorm", chkIceStorm.Checked);

-                        if(!chkIceStorm.Checked)

-                        {

-                            components.Add("IceStorm");

+                        componentChanged("IceStorm", chkIceStorm.Checked);
+                        if(!chkIceStorm.Checked)
+                        {
+                            components.Add("IceStorm");
                         }
                     }
                     if(chkIceUtil.Checked != Util.hasIceCppLib(_project, "IceUtil"))
                     {
-                        componentChanged("IceUtil", chkIceUtil.Checked);

-                        if(!chkIceUtil.Checked)

-                        {

-                            components.Add("IceUtil");

+                        componentChanged("IceUtil", chkIceUtil.Checked);
+                        if(!chkIceUtil.Checked)
+                        {
+                            components.Add("IceUtil");
                         }
                     }
                 }
diff --git a/vsaddin/src/IceCsharpConfigurationDialog.Designer.cs b/vsaddin/src/IceCsharpConfigurationDialog.Designer.cs
index 6f30e21ae26..fc35e696a08 100644
--- a/vsaddin/src/IceCsharpConfigurationDialog.Designer.cs
+++ b/vsaddin/src/IceCsharpConfigurationDialog.Designer.cs
@@ -36,308 +36,308 @@ namespace Ice.VisualStudio
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent()
-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.label1 = new System.Windows.Forms.Label();

-            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();

-            this.chkChecksum = new System.Windows.Forms.CheckBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.chkStreaming = new System.Windows.Forms.CheckBox();

-            this.chkTie = new System.Windows.Forms.CheckBox();

-            this.btnCancel = new System.Windows.Forms.Button();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.btnApply = new System.Windows.Forms.Button();

-            this.btnOk = new System.Windows.Forms.Button();

-            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();

-            this.includePathView = new Ice.VisualStudio.IncludePathView();

-            this.outputDirView = new Ice.VisualStudio.OutputDirView();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(12, 392);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 6;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 5;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 4;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 3;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(125, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 2;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 0;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(78, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 1;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.label1);

-            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);

-            this.groupBox4.Controls.Add(this.chkChecksum);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Controls.Add(this.chkStreaming);

-            this.groupBox4.Controls.Add(this.chkTie);

-            this.groupBox4.Location = new System.Drawing.Point(12, 95);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // label1

-            // 

-            this.label1.AutoSize = true;

-            this.label1.Location = new System.Drawing.Point(278, 20);

-            this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(75, 13);

-            this.label1.TabIndex = 7;

-            this.label1.Text = "Tracing Level:";

-            // 

-            // comboBoxVerboseLevel

-            // 

-            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.comboBoxVerboseLevel.FormattingEnabled = true;

-            this.comboBoxVerboseLevel.Items.AddRange(new object[] {

-            "Errors",

-            "Info",

-            "Debug"});

-            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(359, 15);

-            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";

-            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);

-            this.comboBoxVerboseLevel.TabIndex = 6;

-            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkChecksum

-            // 

-            this.chkChecksum.AutoSize = true;

-            this.chkChecksum.Location = new System.Drawing.Point(179, 19);

-            this.chkChecksum.Name = "chkChecksum";

-            this.chkChecksum.Size = new System.Drawing.Size(76, 17);

-            this.chkChecksum.TabIndex = 5;

-            this.chkChecksum.Text = "Checksum";

-            this.chkChecksum.UseVisualStyleBackColor = true;

-            this.chkChecksum.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(6, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 2;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkStreaming

-            // 

-            this.chkStreaming.AutoSize = true;

-            this.chkStreaming.Location = new System.Drawing.Point(100, 19);

-            this.chkStreaming.Name = "chkStreaming";

-            this.chkStreaming.Size = new System.Drawing.Size(73, 17);

-            this.chkStreaming.TabIndex = 1;

-            this.chkStreaming.Text = "Streaming";

-            this.chkStreaming.UseVisualStyleBackColor = true;

-            this.chkStreaming.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkTie

-            // 

-            this.chkTie.AutoSize = true;

-            this.chkTie.Location = new System.Drawing.Point(53, 19);

-            this.chkTie.Name = "chkTie";

-            this.chkTie.Size = new System.Drawing.Size(41, 17);

-            this.chkTie.TabIndex = 0;

-            this.chkTie.Text = "Tie";

-            this.chkTie.UseVisualStyleBackColor = true;

-            this.chkTie.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // btnCancel

-            // 

-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnCancel.Location = new System.Drawing.Point(424, 447);

-            this.btnCancel.Name = "btnCancel";

-            this.btnCancel.Size = new System.Drawing.Size(75, 23);

-            this.btnCancel.TabIndex = 5;

-            this.btnCancel.Text = "Cancel";

-            this.btnCancel.UseVisualStyleBackColor = true;

-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // btnApply

-            // 

-            this.btnApply.Location = new System.Drawing.Point(343, 447);

-            this.btnApply.Name = "btnApply";

-            this.btnApply.Size = new System.Drawing.Size(75, 23);

-            this.btnApply.TabIndex = 7;

-            this.btnApply.Text = "Apply";

-            this.btnApply.UseVisualStyleBackColor = true;

-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);

-            // 

-            // btnOk

-            // 

-            this.btnOk.Location = new System.Drawing.Point(262, 447);

-            this.btnOk.Name = "btnOk";

-            this.btnOk.Size = new System.Drawing.Size(75, 23);

-            this.btnOk.TabIndex = 8;

-            this.btnOk.Text = "Ok";

-            this.btnOk.UseVisualStyleBackColor = true;

-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);

-            // 

-            // extraCompilerOptions

-            // 

-            this.extraCompilerOptions.Location = new System.Drawing.Point(7, 145);

-            this.extraCompilerOptions.Name = "extraCompilerOptions";

-            this.extraCompilerOptions.Size = new System.Drawing.Size(494, 73);

-            this.extraCompilerOptions.TabIndex = 9;

-            // 

-            // includePathView

-            // 

-            this.includePathView.Location = new System.Drawing.Point(9, 217);

-            this.includePathView.Name = "includePathView";

-            this.includePathView.Size = new System.Drawing.Size(495, 174);

-            this.includePathView.TabIndex = 11;

-            // 

-            // outputDirView

-            // 

-            this.outputDirView.Location = new System.Drawing.Point(5, 33);

-            this.outputDirView.Name = "outputDirView";

-            this.outputDirView.Size = new System.Drawing.Size(498, 54);

-            this.outputDirView.TabIndex = 12;

-            // 

-            // IceCsharpConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnCancel;

-            this.ClientSize = new System.Drawing.Size(512, 479);

-            this.Controls.Add(this.outputDirView);

-            this.Controls.Add(this.includePathView);

-            this.Controls.Add(this.extraCompilerOptions);

-            this.Controls.Add(this.btnOk);

-            this.Controls.Add(this.btnApply);

-            this.Controls.Add(this.btnCancel);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceCsharpConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();
+            this.chkChecksum = new System.Windows.Forms.CheckBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.chkStreaming = new System.Windows.Forms.CheckBox();
+            this.chkTie = new System.Windows.Forms.CheckBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.btnApply = new System.Windows.Forms.Button();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();
+            this.includePathView = new Ice.VisualStudio.IncludePathView();
+            this.outputDirView = new Ice.VisualStudio.OutputDirView();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(12, 392);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 6;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 5;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 4;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 3;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(125, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 2;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 0;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(78, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 1;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.label1);
+            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);
+            this.groupBox4.Controls.Add(this.chkChecksum);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Controls.Add(this.chkStreaming);
+            this.groupBox4.Controls.Add(this.chkTie);
+            this.groupBox4.Location = new System.Drawing.Point(12, 95);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(278, 20);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 13);
+            this.label1.TabIndex = 7;
+            this.label1.Text = "Tracing Level:";
+            // 
+            // comboBoxVerboseLevel
+            // 
+            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxVerboseLevel.FormattingEnabled = true;
+            this.comboBoxVerboseLevel.Items.AddRange(new object[] {
+            "Errors",
+            "Info",
+            "Debug"});
+            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(359, 15);
+            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";
+            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);
+            this.comboBoxVerboseLevel.TabIndex = 6;
+            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkChecksum
+            // 
+            this.chkChecksum.AutoSize = true;
+            this.chkChecksum.Location = new System.Drawing.Point(179, 19);
+            this.chkChecksum.Name = "chkChecksum";
+            this.chkChecksum.Size = new System.Drawing.Size(76, 17);
+            this.chkChecksum.TabIndex = 5;
+            this.chkChecksum.Text = "Checksum";
+            this.chkChecksum.UseVisualStyleBackColor = true;
+            this.chkChecksum.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(6, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 2;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkStreaming
+            // 
+            this.chkStreaming.AutoSize = true;
+            this.chkStreaming.Location = new System.Drawing.Point(100, 19);
+            this.chkStreaming.Name = "chkStreaming";
+            this.chkStreaming.Size = new System.Drawing.Size(73, 17);
+            this.chkStreaming.TabIndex = 1;
+            this.chkStreaming.Text = "Streaming";
+            this.chkStreaming.UseVisualStyleBackColor = true;
+            this.chkStreaming.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkTie
+            // 
+            this.chkTie.AutoSize = true;
+            this.chkTie.Location = new System.Drawing.Point(53, 19);
+            this.chkTie.Name = "chkTie";
+            this.chkTie.Size = new System.Drawing.Size(41, 17);
+            this.chkTie.TabIndex = 0;
+            this.chkTie.Text = "Tie";
+            this.chkTie.UseVisualStyleBackColor = true;
+            this.chkTie.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(424, 447);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 5;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnApply
+            // 
+            this.btnApply.Location = new System.Drawing.Point(343, 447);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Size = new System.Drawing.Size(75, 23);
+            this.btnApply.TabIndex = 7;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // btnOk
+            // 
+            this.btnOk.Location = new System.Drawing.Point(262, 447);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 8;
+            this.btnOk.Text = "Ok";
+            this.btnOk.UseVisualStyleBackColor = true;
+            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            // 
+            // extraCompilerOptions
+            // 
+            this.extraCompilerOptions.Location = new System.Drawing.Point(7, 145);
+            this.extraCompilerOptions.Name = "extraCompilerOptions";
+            this.extraCompilerOptions.Size = new System.Drawing.Size(494, 73);
+            this.extraCompilerOptions.TabIndex = 9;
+            // 
+            // includePathView
+            // 
+            this.includePathView.Location = new System.Drawing.Point(9, 217);
+            this.includePathView.Name = "includePathView";
+            this.includePathView.Size = new System.Drawing.Size(495, 174);
+            this.includePathView.TabIndex = 11;
+            // 
+            // outputDirView
+            // 
+            this.outputDirView.Location = new System.Drawing.Point(5, 33);
+            this.outputDirView.Name = "outputDirView";
+            this.outputDirView.Size = new System.Drawing.Size(498, 54);
+            this.outputDirView.TabIndex = 12;
+            // 
+            // IceCsharpConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(512, 479);
+            this.Controls.Add(this.outputDirView);
+            this.Controls.Add(this.includePathView);
+            this.Controls.Add(this.extraCompilerOptions);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceCsharpConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -361,7 +361,7 @@ namespace Ice.VisualStudio
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox comboBoxVerboseLevel;
         private System.Windows.Forms.Button btnOk;
-        private System.Windows.Forms.Button btnApply;

+        private System.Windows.Forms.Button btnApply;
         private ExtraCompilerOptionsView extraCompilerOptions;
         private IncludePathView includePathView;
         private OutputDirView outputDirView;
diff --git a/vsaddin/src/IceCsharpConfigurationDialog.cs b/vsaddin/src/IceCsharpConfigurationDialog.cs
index 783d1130873..954326c2e38 100644
--- a/vsaddin/src/IceCsharpConfigurationDialog.cs
+++ b/vsaddin/src/IceCsharpConfigurationDialog.cs
@@ -455,8 +455,8 @@ namespace Ice.VisualStudio
                     _initialized = false;
                     loadComponents();
                     _initialized = true;
-                }

-

+                }
+
                 bool changed = false;
                 if(!outputDirView.apply(ref changed))
                 {
@@ -507,65 +507,65 @@ namespace Ice.VisualStudio
                     _changed = true;
                 }
 
-                bool development = Util.developmentMode(_project);

+                bool development = Util.developmentMode(_project);
                 ComponentList components = new ComponentList();
                 if(chkGlacier2.Checked != Util.hasDotNetReference(_project, "Glacier2"))
                 {
-                    componentChanged("Glacier2", chkGlacier2.Checked, development);

-                    if(!chkGlacier2.Checked)

-                    {

+                    componentChanged("Glacier2", chkGlacier2.Checked, development);
+                    if(!chkGlacier2.Checked)
+                    {
                         components.Add("Glacier2");
                     }
                 }
                 if(chkIce.Checked != Util.hasDotNetReference(_project, "Ice"))
                 {
-                    componentChanged("Ice", chkIce.Checked, development);

-                    if(!chkIce.Checked)

-                    {

-                        components.Add("Ice");

+                    componentChanged("Ice", chkIce.Checked, development);
+                    if(!chkIce.Checked)
+                    {
+                        components.Add("Ice");
                     }
                 }
                 if(chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox"))
                 {
-                    componentChanged("IceBox", chkIceBox.Checked, development);

-                    if(!chkIceBox.Checked)

-                    {

-                        components.Add("IceBox");

+                    componentChanged("IceBox", chkIceBox.Checked, development);
+                    if(!chkIceBox.Checked)
+                    {
+                        components.Add("IceBox");
                     }
                 }
                 if(chkIceGrid.Checked != Util.hasDotNetReference(_project, "IceGrid"))
                 {
-                    componentChanged("IceGrid", chkIceGrid.Checked, development);

-                    if(!chkIceGrid.Checked)

-                    {

-                        components.Add("IceGrid");

+                    componentChanged("IceGrid", chkIceGrid.Checked, development);
+                    if(!chkIceGrid.Checked)
+                    {
+                        components.Add("IceGrid");
                     }
                 }
                 if(chkIcePatch2.Checked != Util.hasDotNetReference(_project, "IcePatch2"))
                 {
-                    componentChanged("IcePatch2", chkIcePatch2.Checked, development);

-                    if(!chkIcePatch2.Checked)

-                    {

-                        components.Add("IcePatch2");

+                    componentChanged("IcePatch2", chkIcePatch2.Checked, development);
+                    if(!chkIcePatch2.Checked)
+                    {
+                        components.Add("IcePatch2");
                     }
                 }
                 if(!_compactFramework)
                 {
                     if(chkIceSSL.Checked != Util.hasDotNetReference(_project, "IceSSL"))
                     {
-                        componentChanged("IceSSL", chkIceSSL.Checked, development);

-                        if(!chkIceSSL.Checked)

-                        {

-                            components.Add("IceSSL");

+                        componentChanged("IceSSL", chkIceSSL.Checked, development);
+                        if(!chkIceSSL.Checked)
+                        {
+                            components.Add("IceSSL");
                         }
                     }
                 }
                 if(chkIceStorm.Checked != Util.hasDotNetReference(_project, "IceStorm"))
                 {
-                    componentChanged("IceStorm", chkIceStorm.Checked, development);

-                    if(!chkIceStorm.Checked)

-                    {

-                        components.Add("IceStorm");

+                    componentChanged("IceStorm", chkIceStorm.Checked, development);
+                    if(!chkIceStorm.Checked)
+                    {
+                        components.Add("IceStorm");
                     }
                 }
 
diff --git a/vsaddin/src/IceDialog.cs b/vsaddin/src/IceDialog.cs
index d9aefadb627..ebe69f17f26 100644
--- a/vsaddin/src/IceDialog.cs
+++ b/vsaddin/src/IceDialog.cs
@@ -1,25 +1,25 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.Text;

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public interface IceConfigurationDialog

-    {

-        void unsetCancelButton();

-        void setCancelButton();        

-        void needSave();

-        void endEditIncludeDir(bool save);

-        bool editingIncludeDir();

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public interface IceConfigurationDialog
+    {
+        void unsetCancelButton();
+        void setCancelButton();        
+        void needSave();
+        void endEditIncludeDir(bool save);
+        bool editingIncludeDir();
+    }
+}
diff --git a/vsaddin/src/IceSilverlightConfigurationDialog.Designer.cs b/vsaddin/src/IceSilverlightConfigurationDialog.Designer.cs
index 0961b88aa2c..5e0d8623fb8 100644
--- a/vsaddin/src/IceSilverlightConfigurationDialog.Designer.cs
+++ b/vsaddin/src/IceSilverlightConfigurationDialog.Designer.cs
@@ -36,185 +36,185 @@ namespace Ice.VisualStudio
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent()
-        {

-            this.components = new System.ComponentModel.Container();

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceSl = new System.Windows.Forms.CheckBox();

-            this.groupBox4 = new System.Windows.Forms.GroupBox();

-            this.label1 = new System.Windows.Forms.Label();

-            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();

-            this.chkIcePrefix = new System.Windows.Forms.CheckBox();

-            this.btnCancel = new System.Windows.Forms.Button();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();

-            this.includePathView = new Ice.VisualStudio.IncludePathView();

-            this.btnApply = new System.Windows.Forms.Button();

-            this.btnOk = new System.Windows.Forms.Button();

-            this.outputDirView = new Ice.VisualStudio.OutputDirView();

-            this.groupBox3.SuspendLayout();

-            this.groupBox4.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceSl);

-            this.groupBox3.Location = new System.Drawing.Point(12, 372);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceSl

-            // 

-            this.chkIceSl.AutoSize = true;

-            this.chkIceSl.Location = new System.Drawing.Point(10, 19);

-            this.chkIceSl.Name = "chkIceSl";

-            this.chkIceSl.Size = new System.Drawing.Size(50, 17);

-            this.chkIceSl.TabIndex = 1;

-            this.chkIceSl.TabStop = false;

-            this.chkIceSl.Text = "IceSl";

-            this.chkIceSl.UseVisualStyleBackColor = true;

-            this.chkIceSl.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // groupBox4

-            // 

-            this.groupBox4.Controls.Add(this.label1);

-            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);

-            this.groupBox4.Controls.Add(this.chkIcePrefix);

-            this.groupBox4.Location = new System.Drawing.Point(12, 83);

-            this.groupBox4.Name = "groupBox4";

-            this.groupBox4.Size = new System.Drawing.Size(487, 44);

-            this.groupBox4.TabIndex = 4;

-            this.groupBox4.TabStop = false;

-            this.groupBox4.Text = "Slice Compiler Options";

-            // 

-            // label1

-            // 

-            this.label1.AutoSize = true;

-            this.label1.Location = new System.Drawing.Point(279, 20);

-            this.label1.Name = "label1";

-            this.label1.Size = new System.Drawing.Size(75, 13);

-            this.label1.TabIndex = 4;

-            this.label1.Text = "Tracing Level:";

-            // 

-            // comboBoxVerboseLevel

-            // 

-            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;

-            this.comboBoxVerboseLevel.FormattingEnabled = true;

-            this.comboBoxVerboseLevel.Items.AddRange(new object[] {

-            "Errors",

-            "Info",

-            "Debug"});

-            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(360, 15);

-            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";

-            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);

-            this.comboBoxVerboseLevel.TabIndex = 3;

-            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePrefix

-            // 

-            this.chkIcePrefix.AutoSize = true;

-            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);

-            this.chkIcePrefix.Name = "chkIcePrefix";

-            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);

-            this.chkIcePrefix.TabIndex = 2;

-            this.chkIcePrefix.Text = "Ice";

-            this.chkIcePrefix.UseVisualStyleBackColor = true;

-            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // btnCancel

-            // 

-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnCancel.Location = new System.Drawing.Point(423, 426);

-            this.btnCancel.Name = "btnCancel";

-            this.btnCancel.Size = new System.Drawing.Size(75, 23);

-            this.btnCancel.TabIndex = 5;

-            this.btnCancel.Text = "Cancel";

-            this.btnCancel.UseVisualStyleBackColor = true;

-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // extraCompilerOptions

-            // 

-            this.extraCompilerOptions.Location = new System.Drawing.Point(6, 126);

-            this.extraCompilerOptions.Name = "extraCompilerOptions";

-            this.extraCompilerOptions.Size = new System.Drawing.Size(498, 75);

-            this.extraCompilerOptions.TabIndex = 7;

-            // 

-            // includePathView

-            // 

-            this.includePathView.Location = new System.Drawing.Point(8, 199);

-            this.includePathView.Name = "includePathView";

-            this.includePathView.Size = new System.Drawing.Size(495, 174);

-            this.includePathView.TabIndex = 8;

-            // 

-            // btnApply

-            // 

-            this.btnApply.Location = new System.Drawing.Point(342, 426);

-            this.btnApply.Name = "btnApply";

-            this.btnApply.Size = new System.Drawing.Size(75, 23);

-            this.btnApply.TabIndex = 9;

-            this.btnApply.Text = "Apply";

-            this.btnApply.UseVisualStyleBackColor = true;

-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);

-            // 

-            // btnOk

-            // 

-            this.btnOk.Location = new System.Drawing.Point(261, 426);

-            this.btnOk.Name = "btnOk";

-            this.btnOk.Size = new System.Drawing.Size(75, 23);

-            this.btnOk.TabIndex = 10;

-            this.btnOk.Text = "Ok";

-            this.btnOk.UseVisualStyleBackColor = true;

-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);

-            // 

-            // outputDirView

-            // 

-            this.outputDirView.Location = new System.Drawing.Point(6, 30);

-            this.outputDirView.Name = "outputDirView";

-            this.outputDirView.Size = new System.Drawing.Size(498, 52);

-            this.outputDirView.TabIndex = 11;

-            // 

-            // IceSilverlightConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnCancel;

-            this.ClientSize = new System.Drawing.Size(515, 457);

-            this.Controls.Add(this.outputDirView);

-            this.Controls.Add(this.btnOk);

-            this.Controls.Add(this.btnApply);

-            this.Controls.Add(this.includePathView);

-            this.Controls.Add(this.extraCompilerOptions);

-            this.Controls.Add(this.btnCancel);

-            this.Controls.Add(this.groupBox4);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceSilverlightConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.groupBox4.ResumeLayout(false);

-            this.groupBox4.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

+        {
+            this.components = new System.ComponentModel.Container();
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceSl = new System.Windows.Forms.CheckBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
+            this.comboBoxVerboseLevel = new System.Windows.Forms.ComboBox();
+            this.chkIcePrefix = new System.Windows.Forms.CheckBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.extraCompilerOptions = new Ice.VisualStudio.ExtraCompilerOptionsView();
+            this.includePathView = new Ice.VisualStudio.IncludePathView();
+            this.btnApply = new System.Windows.Forms.Button();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.outputDirView = new Ice.VisualStudio.OutputDirView();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceSl);
+            this.groupBox3.Location = new System.Drawing.Point(12, 372);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceSl
+            // 
+            this.chkIceSl.AutoSize = true;
+            this.chkIceSl.Location = new System.Drawing.Point(10, 19);
+            this.chkIceSl.Name = "chkIceSl";
+            this.chkIceSl.Size = new System.Drawing.Size(50, 17);
+            this.chkIceSl.TabIndex = 1;
+            this.chkIceSl.TabStop = false;
+            this.chkIceSl.Text = "IceSl";
+            this.chkIceSl.UseVisualStyleBackColor = true;
+            this.chkIceSl.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // groupBox4
+            // 
+            this.groupBox4.Controls.Add(this.label1);
+            this.groupBox4.Controls.Add(this.comboBoxVerboseLevel);
+            this.groupBox4.Controls.Add(this.chkIcePrefix);
+            this.groupBox4.Location = new System.Drawing.Point(12, 83);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.Size = new System.Drawing.Size(487, 44);
+            this.groupBox4.TabIndex = 4;
+            this.groupBox4.TabStop = false;
+            this.groupBox4.Text = "Slice Compiler Options";
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(279, 20);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(75, 13);
+            this.label1.TabIndex = 4;
+            this.label1.Text = "Tracing Level:";
+            // 
+            // comboBoxVerboseLevel
+            // 
+            this.comboBoxVerboseLevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxVerboseLevel.FormattingEnabled = true;
+            this.comboBoxVerboseLevel.Items.AddRange(new object[] {
+            "Errors",
+            "Info",
+            "Debug"});
+            this.comboBoxVerboseLevel.Location = new System.Drawing.Point(360, 15);
+            this.comboBoxVerboseLevel.Name = "comboBoxVerboseLevel";
+            this.comboBoxVerboseLevel.Size = new System.Drawing.Size(121, 21);
+            this.comboBoxVerboseLevel.TabIndex = 3;
+            this.comboBoxVerboseLevel.SelectedIndexChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePrefix
+            // 
+            this.chkIcePrefix.AutoSize = true;
+            this.chkIcePrefix.Location = new System.Drawing.Point(10, 19);
+            this.chkIcePrefix.Name = "chkIcePrefix";
+            this.chkIcePrefix.Size = new System.Drawing.Size(41, 17);
+            this.chkIcePrefix.TabIndex = 2;
+            this.chkIcePrefix.Text = "Ice";
+            this.chkIcePrefix.UseVisualStyleBackColor = true;
+            this.chkIcePrefix.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(423, 426);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 5;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // extraCompilerOptions
+            // 
+            this.extraCompilerOptions.Location = new System.Drawing.Point(6, 126);
+            this.extraCompilerOptions.Name = "extraCompilerOptions";
+            this.extraCompilerOptions.Size = new System.Drawing.Size(498, 75);
+            this.extraCompilerOptions.TabIndex = 7;
+            // 
+            // includePathView
+            // 
+            this.includePathView.Location = new System.Drawing.Point(8, 199);
+            this.includePathView.Name = "includePathView";
+            this.includePathView.Size = new System.Drawing.Size(495, 174);
+            this.includePathView.TabIndex = 8;
+            // 
+            // btnApply
+            // 
+            this.btnApply.Location = new System.Drawing.Point(342, 426);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Size = new System.Drawing.Size(75, 23);
+            this.btnApply.TabIndex = 9;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // btnOk
+            // 
+            this.btnOk.Location = new System.Drawing.Point(261, 426);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 10;
+            this.btnOk.Text = "Ok";
+            this.btnOk.UseVisualStyleBackColor = true;
+            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            // 
+            // outputDirView
+            // 
+            this.outputDirView.Location = new System.Drawing.Point(6, 30);
+            this.outputDirView.Name = "outputDirView";
+            this.outputDirView.Size = new System.Drawing.Size(498, 52);
+            this.outputDirView.TabIndex = 11;
+            // 
+            // IceSilverlightConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(515, 457);
+            this.Controls.Add(this.outputDirView);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.includePathView);
+            this.Controls.Add(this.extraCompilerOptions);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.groupBox4);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceSilverlightConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -226,7 +226,7 @@ namespace Ice.VisualStudio
         private System.Windows.Forms.CheckBox chkIcePrefix;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Label label1;

+        private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox comboBoxVerboseLevel;
         private ExtraCompilerOptionsView extraCompilerOptions;
         private IncludePathView includePathView;
diff --git a/vsaddin/src/IceSilverlightConfigurationDialog.cs b/vsaddin/src/IceSilverlightConfigurationDialog.cs
index 315810ca75b..4482c54e6fb 100644
--- a/vsaddin/src/IceSilverlightConfigurationDialog.cs
+++ b/vsaddin/src/IceSilverlightConfigurationDialog.cs
@@ -165,7 +165,7 @@ namespace Ice.VisualStudio
                         }
                     }
                     else
-                    {

+                    {
                         components = new ComponentList("IceSL");
                     }
 
diff --git a/vsaddin/src/IceVBConfigurationDialog.Designer.cs b/vsaddin/src/IceVBConfigurationDialog.Designer.cs
index 817459ba3bb..3d4e35dc3e3 100644
--- a/vsaddin/src/IceVBConfigurationDialog.Designer.cs
+++ b/vsaddin/src/IceVBConfigurationDialog.Designer.cs
@@ -36,186 +36,186 @@ namespace Ice.VisualStudio
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent()
-        {

-            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();

-            this.groupBox3 = new System.Windows.Forms.GroupBox();

-            this.chkIceStorm = new System.Windows.Forms.CheckBox();

-            this.chkIceSSL = new System.Windows.Forms.CheckBox();

-            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();

-            this.chkIceGrid = new System.Windows.Forms.CheckBox();

-            this.chkIceBox = new System.Windows.Forms.CheckBox();

-            this.chkGlacier2 = new System.Windows.Forms.CheckBox();

-            this.chkIce = new System.Windows.Forms.CheckBox();

-            this.btnCancel = new System.Windows.Forms.Button();

-            this.btnApply = new System.Windows.Forms.Button();

-            this.btnOk = new System.Windows.Forms.Button();

-            this.groupBox3.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // chkEnableBuilder

-            // 

-            this.chkEnableBuilder.AutoSize = true;

-            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);

-            this.chkEnableBuilder.Name = "chkEnableBuilder";

-            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);

-            this.chkEnableBuilder.TabIndex = 0;

-            this.chkEnableBuilder.Text = "Enable Ice Builder";

-            this.chkEnableBuilder.UseVisualStyleBackColor = true;

-            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);

-            // 

-            // groupBox3

-            // 

-            this.groupBox3.Controls.Add(this.chkIceStorm);

-            this.groupBox3.Controls.Add(this.chkIceSSL);

-            this.groupBox3.Controls.Add(this.chkIcePatch2);

-            this.groupBox3.Controls.Add(this.chkIceGrid);

-            this.groupBox3.Controls.Add(this.chkIceBox);

-            this.groupBox3.Controls.Add(this.chkGlacier2);

-            this.groupBox3.Controls.Add(this.chkIce);

-            this.groupBox3.Location = new System.Drawing.Point(11, 36);

-            this.groupBox3.Name = "groupBox3";

-            this.groupBox3.Size = new System.Drawing.Size(487, 47);

-            this.groupBox3.TabIndex = 3;

-            this.groupBox3.TabStop = false;

-            this.groupBox3.Text = "Ice Components";

-            // 

-            // chkIceStorm

-            // 

-            this.chkIceStorm.AutoSize = true;

-            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);

-            this.chkIceStorm.Name = "chkIceStorm";

-            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);

-            this.chkIceStorm.TabIndex = 6;

-            this.chkIceStorm.TabStop = false;

-            this.chkIceStorm.Text = "IceStorm";

-            this.chkIceStorm.UseVisualStyleBackColor = true;

-            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceSSL

-            // 

-            this.chkIceSSL.AutoSize = true;

-            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);

-            this.chkIceSSL.Name = "chkIceSSL";

-            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);

-            this.chkIceSSL.TabIndex = 5;

-            this.chkIceSSL.TabStop = false;

-            this.chkIceSSL.Text = "IceSSL";

-            this.chkIceSSL.UseVisualStyleBackColor = true;

-            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIcePatch2

-            // 

-            this.chkIcePatch2.AutoSize = true;

-            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);

-            this.chkIcePatch2.Name = "chkIcePatch2";

-            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);

-            this.chkIcePatch2.TabIndex = 4;

-            this.chkIcePatch2.TabStop = false;

-            this.chkIcePatch2.Text = "IcePatch2";

-            this.chkIcePatch2.UseVisualStyleBackColor = true;

-            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceGrid

-            // 

-            this.chkIceGrid.AutoSize = true;

-            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);

-            this.chkIceGrid.Name = "chkIceGrid";

-            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);

-            this.chkIceGrid.TabIndex = 3;

-            this.chkIceGrid.TabStop = false;

-            this.chkIceGrid.Text = "IceGrid";

-            this.chkIceGrid.UseVisualStyleBackColor = true;

-            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIceBox

-            // 

-            this.chkIceBox.AutoSize = true;

-            this.chkIceBox.Location = new System.Drawing.Point(125, 19);

-            this.chkIceBox.Name = "chkIceBox";

-            this.chkIceBox.Size = new System.Drawing.Size(59, 17);

-            this.chkIceBox.TabIndex = 2;

-            this.chkIceBox.TabStop = false;

-            this.chkIceBox.Text = "IceBox";

-            this.chkIceBox.UseVisualStyleBackColor = true;

-            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkGlacier2

-            // 

-            this.chkGlacier2.AutoSize = true;

-            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);

-            this.chkGlacier2.Name = "chkGlacier2";

-            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);

-            this.chkGlacier2.TabIndex = 0;

-            this.chkGlacier2.TabStop = false;

-            this.chkGlacier2.Text = "Glacier2";

-            this.chkGlacier2.UseVisualStyleBackColor = true;

-            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // chkIce

-            // 

-            this.chkIce.AutoSize = true;

-            this.chkIce.Location = new System.Drawing.Point(78, 19);

-            this.chkIce.Name = "chkIce";

-            this.chkIce.Size = new System.Drawing.Size(41, 17);

-            this.chkIce.TabIndex = 1;

-            this.chkIce.TabStop = false;

-            this.chkIce.Text = "Ice";

-            this.chkIce.UseVisualStyleBackColor = true;

-            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);

-            // 

-            // btnCancel

-            // 

-            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

-            this.btnCancel.Location = new System.Drawing.Point(417, 89);

-            this.btnCancel.Name = "btnCancel";

-            this.btnCancel.Size = new System.Drawing.Size(75, 23);

-            this.btnCancel.TabIndex = 5;

-            this.btnCancel.Text = "Cancel";

-            this.btnCancel.UseVisualStyleBackColor = true;

-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);

-            // 

-            // btnApply

-            // 

-            this.btnApply.Location = new System.Drawing.Point(334, 89);

-            this.btnApply.Name = "btnApply";

-            this.btnApply.Size = new System.Drawing.Size(75, 23);

-            this.btnApply.TabIndex = 7;

-            this.btnApply.Text = "Apply";

-            this.btnApply.UseVisualStyleBackColor = true;

-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);

-            // 

-            // btnOk

-            // 

-            this.btnOk.Location = new System.Drawing.Point(253, 89);

-            this.btnOk.Name = "btnOk";

-            this.btnOk.Size = new System.Drawing.Size(75, 23);

-            this.btnOk.TabIndex = 8;

-            this.btnOk.Text = "Ok";

-            this.btnOk.UseVisualStyleBackColor = true;

-            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);

-            // 

-            // IceVBConfigurationDialog

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.CancelButton = this.btnCancel;

-            this.ClientSize = new System.Drawing.Size(512, 124);

-            this.Controls.Add(this.btnOk);

-            this.Controls.Add(this.btnApply);

-            this.Controls.Add(this.btnCancel);

-            this.Controls.Add(this.groupBox3);

-            this.Controls.Add(this.chkEnableBuilder);

-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

-            this.MaximizeBox = false;

-            this.Name = "IceVBConfigurationDialog";

-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

-            this.Text = "Ice Configuration";

-            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);

-            this.groupBox3.ResumeLayout(false);

-            this.groupBox3.PerformLayout();

-            this.ResumeLayout(false);

-            this.PerformLayout();

-

+        {
+            this.chkEnableBuilder = new System.Windows.Forms.CheckBox();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.chkIceStorm = new System.Windows.Forms.CheckBox();
+            this.chkIceSSL = new System.Windows.Forms.CheckBox();
+            this.chkIcePatch2 = new System.Windows.Forms.CheckBox();
+            this.chkIceGrid = new System.Windows.Forms.CheckBox();
+            this.chkIceBox = new System.Windows.Forms.CheckBox();
+            this.chkGlacier2 = new System.Windows.Forms.CheckBox();
+            this.chkIce = new System.Windows.Forms.CheckBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnApply = new System.Windows.Forms.Button();
+            this.btnOk = new System.Windows.Forms.Button();
+            this.groupBox3.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // chkEnableBuilder
+            // 
+            this.chkEnableBuilder.AutoSize = true;
+            this.chkEnableBuilder.Location = new System.Drawing.Point(12, 13);
+            this.chkEnableBuilder.Name = "chkEnableBuilder";
+            this.chkEnableBuilder.Size = new System.Drawing.Size(112, 17);
+            this.chkEnableBuilder.TabIndex = 0;
+            this.chkEnableBuilder.Text = "Enable Ice Builder";
+            this.chkEnableBuilder.UseVisualStyleBackColor = true;
+            this.chkEnableBuilder.CheckedChanged += new System.EventHandler(this.chkEnableBuilder_CheckedChanged);
+            // 
+            // groupBox3
+            // 
+            this.groupBox3.Controls.Add(this.chkIceStorm);
+            this.groupBox3.Controls.Add(this.chkIceSSL);
+            this.groupBox3.Controls.Add(this.chkIcePatch2);
+            this.groupBox3.Controls.Add(this.chkIceGrid);
+            this.groupBox3.Controls.Add(this.chkIceBox);
+            this.groupBox3.Controls.Add(this.chkGlacier2);
+            this.groupBox3.Controls.Add(this.chkIce);
+            this.groupBox3.Location = new System.Drawing.Point(11, 36);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.Size = new System.Drawing.Size(487, 47);
+            this.groupBox3.TabIndex = 3;
+            this.groupBox3.TabStop = false;
+            this.groupBox3.Text = "Ice Components";
+            // 
+            // chkIceStorm
+            // 
+            this.chkIceStorm.AutoSize = true;
+            this.chkIceStorm.Location = new System.Drawing.Point(404, 19);
+            this.chkIceStorm.Name = "chkIceStorm";
+            this.chkIceStorm.Size = new System.Drawing.Size(68, 17);
+            this.chkIceStorm.TabIndex = 6;
+            this.chkIceStorm.TabStop = false;
+            this.chkIceStorm.Text = "IceStorm";
+            this.chkIceStorm.UseVisualStyleBackColor = true;
+            this.chkIceStorm.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceSSL
+            // 
+            this.chkIceSSL.AutoSize = true;
+            this.chkIceSSL.Location = new System.Drawing.Point(337, 19);
+            this.chkIceSSL.Name = "chkIceSSL";
+            this.chkIceSSL.Size = new System.Drawing.Size(61, 17);
+            this.chkIceSSL.TabIndex = 5;
+            this.chkIceSSL.TabStop = false;
+            this.chkIceSSL.Text = "IceSSL";
+            this.chkIceSSL.UseVisualStyleBackColor = true;
+            this.chkIceSSL.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIcePatch2
+            // 
+            this.chkIcePatch2.AutoSize = true;
+            this.chkIcePatch2.Location = new System.Drawing.Point(256, 19);
+            this.chkIcePatch2.Name = "chkIcePatch2";
+            this.chkIcePatch2.Size = new System.Drawing.Size(75, 17);
+            this.chkIcePatch2.TabIndex = 4;
+            this.chkIcePatch2.TabStop = false;
+            this.chkIcePatch2.Text = "IcePatch2";
+            this.chkIcePatch2.UseVisualStyleBackColor = true;
+            this.chkIcePatch2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceGrid
+            // 
+            this.chkIceGrid.AutoSize = true;
+            this.chkIceGrid.Location = new System.Drawing.Point(190, 19);
+            this.chkIceGrid.Name = "chkIceGrid";
+            this.chkIceGrid.Size = new System.Drawing.Size(60, 17);
+            this.chkIceGrid.TabIndex = 3;
+            this.chkIceGrid.TabStop = false;
+            this.chkIceGrid.Text = "IceGrid";
+            this.chkIceGrid.UseVisualStyleBackColor = true;
+            this.chkIceGrid.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIceBox
+            // 
+            this.chkIceBox.AutoSize = true;
+            this.chkIceBox.Location = new System.Drawing.Point(125, 19);
+            this.chkIceBox.Name = "chkIceBox";
+            this.chkIceBox.Size = new System.Drawing.Size(59, 17);
+            this.chkIceBox.TabIndex = 2;
+            this.chkIceBox.TabStop = false;
+            this.chkIceBox.Text = "IceBox";
+            this.chkIceBox.UseVisualStyleBackColor = true;
+            this.chkIceBox.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkGlacier2
+            // 
+            this.chkGlacier2.AutoSize = true;
+            this.chkGlacier2.Location = new System.Drawing.Point(7, 19);
+            this.chkGlacier2.Name = "chkGlacier2";
+            this.chkGlacier2.Size = new System.Drawing.Size(65, 17);
+            this.chkGlacier2.TabIndex = 0;
+            this.chkGlacier2.TabStop = false;
+            this.chkGlacier2.Text = "Glacier2";
+            this.chkGlacier2.UseVisualStyleBackColor = true;
+            this.chkGlacier2.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // chkIce
+            // 
+            this.chkIce.AutoSize = true;
+            this.chkIce.Location = new System.Drawing.Point(78, 19);
+            this.chkIce.Name = "chkIce";
+            this.chkIce.Size = new System.Drawing.Size(41, 17);
+            this.chkIce.TabIndex = 1;
+            this.chkIce.TabStop = false;
+            this.chkIce.Text = "Ice";
+            this.chkIce.UseVisualStyleBackColor = true;
+            this.chkIce.CheckedChanged += new System.EventHandler(this.component_Changed);
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+            this.btnCancel.Location = new System.Drawing.Point(417, 89);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(75, 23);
+            this.btnCancel.TabIndex = 5;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnApply
+            // 
+            this.btnApply.Location = new System.Drawing.Point(334, 89);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Size = new System.Drawing.Size(75, 23);
+            this.btnApply.TabIndex = 7;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // btnOk
+            // 
+            this.btnOk.Location = new System.Drawing.Point(253, 89);
+            this.btnOk.Name = "btnOk";
+            this.btnOk.Size = new System.Drawing.Size(75, 23);
+            this.btnOk.TabIndex = 8;
+            this.btnOk.Text = "Ok";
+            this.btnOk.UseVisualStyleBackColor = true;
+            this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
+            // 
+            // IceVBConfigurationDialog
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnCancel;
+            this.ClientSize = new System.Drawing.Size(512, 124);
+            this.Controls.Add(this.btnOk);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.groupBox3);
+            this.Controls.Add(this.chkEnableBuilder);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
+            this.MaximizeBox = false;
+            this.Name = "IceVBConfigurationDialog";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Ice Configuration";
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.formClosing);
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
         }
 
         #endregion
@@ -228,7 +228,7 @@ namespace Ice.VisualStudio
         private System.Windows.Forms.CheckBox chkIceGrid;
         private System.Windows.Forms.CheckBox chkIceBox;
         private System.Windows.Forms.CheckBox chkGlacier2;
-        private System.Windows.Forms.CheckBox chkIce;

+        private System.Windows.Forms.CheckBox chkIce;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnApply;
         private System.Windows.Forms.Button btnOk;
diff --git a/vsaddin/src/IceVBConfigurationDialog.cs b/vsaddin/src/IceVBConfigurationDialog.cs
index dd644250f2a..a6ac9d6cfdb 100644
--- a/vsaddin/src/IceVBConfigurationDialog.cs
+++ b/vsaddin/src/IceVBConfigurationDialog.cs
@@ -30,7 +30,7 @@ namespace Ice.VisualStudio
             if(_project != null)
             {
                 this.Text = "Ice Configuration - Project: " + _project.Name;
-                bool enabled = Util.isSliceBuilderEnabled(project);

+                bool enabled = Util.isSliceBuilderEnabled(project);
                 _compactFramework = Util.isVBSmartDeviceProject(_project);
                 setEnabled(enabled);
                 chkEnableBuilder.Checked = enabled;
@@ -89,12 +89,12 @@ namespace Ice.VisualStudio
             string[] dotNetNames = null;
             if(_compactFramework)
             {
-                dotNetNames = Util.getDotNetCompactNames();

+                dotNetNames = Util.getDotNetCompactNames();
                 checkComponent("IceSSL", false);
-            }

-            else

-            {

-                dotNetNames = Util.getDotNetNames();

+            }
+            else
+            {
+                dotNetNames = Util.getDotNetNames();
             }
         
             foreach(String s in dotNetNames)
@@ -212,17 +212,17 @@ namespace Ice.VisualStudio
             chkIce.Enabled = enabled;
             chkIceBox.Enabled = enabled;
             chkIceGrid.Enabled = enabled;
-            chkIcePatch2.Enabled = enabled;

-            //

-            // Ice .NET Compact Framework doesn't support SSL

-            //

-            if(_compactFramework)

-            {

-                chkIceSSL.Enabled = false;

-            }

-            else

-            {

-                chkIceSSL.Enabled = enabled;

+            chkIcePatch2.Enabled = enabled;
+            //
+            // Ice .NET Compact Framework doesn't support SSL
+            //
+            if(_compactFramework)
+            {
+                chkIceSSL.Enabled = false;
+            }
+            else
+            {
+                chkIceSSL.Enabled = enabled;
             }
             chkIceStorm.Enabled = enabled;
         }
@@ -294,65 +294,65 @@ namespace Ice.VisualStudio
                     return true;
                 }
 
-                bool development = Util.developmentMode(_project);

+                bool development = Util.developmentMode(_project);
                 ComponentList components = new ComponentList();
                 if(chkGlacier2.Checked != Util.hasDotNetReference(_project, "Glacier2"))
                 {
-                    componentChanged("Glacier2", chkGlacier2.Checked, development);

-                    if(!chkGlacier2.Checked)

-                    {

-                        components.Add("Glacier2");

+                    componentChanged("Glacier2", chkGlacier2.Checked, development);
+                    if(!chkGlacier2.Checked)
+                    {
+                        components.Add("Glacier2");
                     }
                 }
                 if(chkIce.Checked != Util.hasDotNetReference(_project, "Ice"))
                 {
-                    componentChanged("Ice", chkIce.Checked, development);

-                    if(!chkIce.Checked)

-                    {

-                        components.Add("Ice");

+                    componentChanged("Ice", chkIce.Checked, development);
+                    if(!chkIce.Checked)
+                    {
+                        components.Add("Ice");
                     }
                 }
                 if(chkIceBox.Checked != Util.hasDotNetReference(_project, "IceBox"))
                 {
-                    componentChanged("IceBox", chkIceBox.Checked, development);

-                    if(!chkIceBox.Checked)

-                    {

-                        components.Add("IceBox");

+                    componentChanged("IceBox", chkIceBox.Checked, development);
+                    if(!chkIceBox.Checked)
+                    {
+                        components.Add("IceBox");
                     }
                 }
                 if(chkIceGrid.Checked != Util.hasDotNetReference(_project, "IceGrid"))
                 {
-                    componentChanged("IceGrid", chkIceGrid.Checked, development);

-                    if(!chkIceGrid.Checked)

-                    {

-                        components.Add("IceGrid");

+                    componentChanged("IceGrid", chkIceGrid.Checked, development);
+                    if(!chkIceGrid.Checked)
+                    {
+                        components.Add("IceGrid");
                     }
                 }
                 if(chkIcePatch2.Checked != Util.hasDotNetReference(_project, "IcePatch2"))
                 {
-                    componentChanged("IcePatch2", chkIcePatch2.Checked, development);

-                    if(!chkIcePatch2.Checked)

-                    {

-                        components.Add("IcePatch2");

+                    componentChanged("IcePatch2", chkIcePatch2.Checked, development);
+                    if(!chkIcePatch2.Checked)
+                    {
+                        components.Add("IcePatch2");
                     }
                 }
                 if(!_compactFramework)
                 {
                     if(chkIceSSL.Checked != Util.hasDotNetReference(_project, "IceSSL"))
                     {
-                        componentChanged("IceSSL", chkIceSSL.Checked, development);

-                        if(!chkGlacier2.Checked)

-                        {

-                            components.Add("IceSSL");

+                        componentChanged("IceSSL", chkIceSSL.Checked, development);
+                        if(!chkGlacier2.Checked)
+                        {
+                            components.Add("IceSSL");
                         }
                     }
                 }
                 if(chkIceStorm.Checked != Util.hasDotNetReference(_project, "IceStorm"))
                 {
-                    componentChanged("IceStorm", chkIceStorm.Checked, development);

-                    if(!chkGlacier2.Checked)

-                    {

-                        components.Add("IceStorm");

+                    componentChanged("IceStorm", chkIceStorm.Checked, development);
+                    if(!chkGlacier2.Checked)
+                    {
+                        components.Add("IceStorm");
                     }
                 }
 
diff --git a/vsaddin/src/IncludePathView.Designer.cs b/vsaddin/src/IncludePathView.Designer.cs
index 5a420d8368f..181ce2c1287 100644
--- a/vsaddin/src/IncludePathView.Designer.cs
+++ b/vsaddin/src/IncludePathView.Designer.cs
@@ -1,160 +1,160 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class IncludePathView

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if(disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.groupBox1 = new System.Windows.Forms.GroupBox();

-            this.btnDown = new System.Windows.Forms.Button();

-            this.btnUp = new System.Windows.Forms.Button();

-            this.btnRemove = new System.Windows.Forms.Button();

-            this.btnEdit = new System.Windows.Forms.Button();

-            this.btnAdd = new System.Windows.Forms.Button();

-            this.includePathInfo = new System.Windows.Forms.Label();

-            this.sliceIncludeList = new System.Windows.Forms.CheckedListBox();

-            this.groupBox1.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // groupBox1

-            // 

-            this.groupBox1.Controls.Add(this.btnDown);

-            this.groupBox1.Controls.Add(this.btnUp);

-            this.groupBox1.Controls.Add(this.btnRemove);

-            this.groupBox1.Controls.Add(this.btnEdit);

-            this.groupBox1.Controls.Add(this.btnAdd);

-            this.groupBox1.Controls.Add(this.includePathInfo);

-            this.groupBox1.Controls.Add(this.sliceIncludeList);

-            this.groupBox1.Location = new System.Drawing.Point(3, 3);

-            this.groupBox1.Name = "groupBox1";

-            this.groupBox1.Size = new System.Drawing.Size(487, 166);

-            this.groupBox1.TabIndex = 0;

-            this.groupBox1.TabStop = false;

-            this.groupBox1.Text = "Slice Include Path";

-            // 

-            // btnDown

-            // 

-            this.btnDown.Location = new System.Drawing.Point(406, 135);

-            this.btnDown.Name = "btnDown";

-            this.btnDown.Size = new System.Drawing.Size(75, 23);

-            this.btnDown.TabIndex = 6;

-            this.btnDown.Text = "Down";

-            this.btnDown.UseVisualStyleBackColor = true;

-            this.btnDown.Click += new System.EventHandler(this.btnDown_Click);

-            // 

-            // btnUp

-            // 

-            this.btnUp.Location = new System.Drawing.Point(406, 106);

-            this.btnUp.Name = "btnUp";

-            this.btnUp.Size = new System.Drawing.Size(75, 23);

-            this.btnUp.TabIndex = 5;

-            this.btnUp.Text = "Up";

-            this.btnUp.UseVisualStyleBackColor = true;

-            this.btnUp.Click += new System.EventHandler(this.btnUp_Click);

-            // 

-            // btnRemove

-            // 

-            this.btnRemove.Location = new System.Drawing.Point(406, 77);

-            this.btnRemove.Name = "btnRemove";

-            this.btnRemove.Size = new System.Drawing.Size(75, 23);

-            this.btnRemove.TabIndex = 4;

-            this.btnRemove.Text = "Remove";

-            this.btnRemove.UseVisualStyleBackColor = true;

-            this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);

-            // 

-            // btnEdit

-            // 

-            this.btnEdit.Location = new System.Drawing.Point(406, 48);

-            this.btnEdit.Name = "btnEdit";

-            this.btnEdit.Size = new System.Drawing.Size(75, 23);

-            this.btnEdit.TabIndex = 3;

-            this.btnEdit.Text = "Edit";

-            this.btnEdit.UseVisualStyleBackColor = true;

-            this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);

-            // 

-            // btnAdd

-            // 

-            this.btnAdd.Location = new System.Drawing.Point(406, 19);

-            this.btnAdd.Name = "btnAdd";

-            this.btnAdd.Size = new System.Drawing.Size(75, 23);

-            this.btnAdd.TabIndex = 2;

-            this.btnAdd.Text = "Add";

-            this.btnAdd.UseVisualStyleBackColor = true;

-            this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);

-            // 

-            // includePathInfo

-            // 

-            this.includePathInfo.AutoSize = true;

-            this.includePathInfo.Location = new System.Drawing.Point(6, 150);

-            this.includePathInfo.Name = "includePathInfo";

-            this.includePathInfo.Size = new System.Drawing.Size(315, 13);

-            this.includePathInfo.TabIndex = 1;

-            this.includePathInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";

-            // 

-            // sliceIncludeList

-            // 

-            this.sliceIncludeList.FormattingEnabled = true;

-            this.sliceIncludeList.Location = new System.Drawing.Point(6, 19);

-            this.sliceIncludeList.Name = "sliceIncludeList";

-            this.sliceIncludeList.Size = new System.Drawing.Size(394, 124);

-            this.sliceIncludeList.TabIndex = 0;

-            this.sliceIncludeList.SelectedIndexChanged += new System.EventHandler(this.sliceIncludeList_SelectedIndexChanged);

-            this.sliceIncludeList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.sliceIncludeList_ItemCheck);

-            // 

-            // IncludePathView

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.Controls.Add(this.groupBox1);

-            this.Name = "IncludePathView";

-            this.Size = new System.Drawing.Size(495, 174);

-            this.groupBox1.ResumeLayout(false);

-            this.groupBox1.PerformLayout();

-            this.ResumeLayout(false);

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.GroupBox groupBox1;

-        private System.Windows.Forms.CheckedListBox sliceIncludeList;

-        private System.Windows.Forms.Label includePathInfo;

-        private System.Windows.Forms.Button btnUp;

-        private System.Windows.Forms.Button btnRemove;

-        private System.Windows.Forms.Button btnEdit;

-        private System.Windows.Forms.Button btnAdd;

-        private System.Windows.Forms.Button btnDown;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class IncludePathView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.btnDown = new System.Windows.Forms.Button();
+            this.btnUp = new System.Windows.Forms.Button();
+            this.btnRemove = new System.Windows.Forms.Button();
+            this.btnEdit = new System.Windows.Forms.Button();
+            this.btnAdd = new System.Windows.Forms.Button();
+            this.includePathInfo = new System.Windows.Forms.Label();
+            this.sliceIncludeList = new System.Windows.Forms.CheckedListBox();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            this.groupBox1.Controls.Add(this.btnDown);
+            this.groupBox1.Controls.Add(this.btnUp);
+            this.groupBox1.Controls.Add(this.btnRemove);
+            this.groupBox1.Controls.Add(this.btnEdit);
+            this.groupBox1.Controls.Add(this.btnAdd);
+            this.groupBox1.Controls.Add(this.includePathInfo);
+            this.groupBox1.Controls.Add(this.sliceIncludeList);
+            this.groupBox1.Location = new System.Drawing.Point(3, 3);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.Size = new System.Drawing.Size(487, 166);
+            this.groupBox1.TabIndex = 0;
+            this.groupBox1.TabStop = false;
+            this.groupBox1.Text = "Slice Include Path";
+            // 
+            // btnDown
+            // 
+            this.btnDown.Location = new System.Drawing.Point(406, 135);
+            this.btnDown.Name = "btnDown";
+            this.btnDown.Size = new System.Drawing.Size(75, 23);
+            this.btnDown.TabIndex = 6;
+            this.btnDown.Text = "Down";
+            this.btnDown.UseVisualStyleBackColor = true;
+            this.btnDown.Click += new System.EventHandler(this.btnDown_Click);
+            // 
+            // btnUp
+            // 
+            this.btnUp.Location = new System.Drawing.Point(406, 106);
+            this.btnUp.Name = "btnUp";
+            this.btnUp.Size = new System.Drawing.Size(75, 23);
+            this.btnUp.TabIndex = 5;
+            this.btnUp.Text = "Up";
+            this.btnUp.UseVisualStyleBackColor = true;
+            this.btnUp.Click += new System.EventHandler(this.btnUp_Click);
+            // 
+            // btnRemove
+            // 
+            this.btnRemove.Location = new System.Drawing.Point(406, 77);
+            this.btnRemove.Name = "btnRemove";
+            this.btnRemove.Size = new System.Drawing.Size(75, 23);
+            this.btnRemove.TabIndex = 4;
+            this.btnRemove.Text = "Remove";
+            this.btnRemove.UseVisualStyleBackColor = true;
+            this.btnRemove.Click += new System.EventHandler(this.btnRemove_Click);
+            // 
+            // btnEdit
+            // 
+            this.btnEdit.Location = new System.Drawing.Point(406, 48);
+            this.btnEdit.Name = "btnEdit";
+            this.btnEdit.Size = new System.Drawing.Size(75, 23);
+            this.btnEdit.TabIndex = 3;
+            this.btnEdit.Text = "Edit";
+            this.btnEdit.UseVisualStyleBackColor = true;
+            this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
+            // 
+            // btnAdd
+            // 
+            this.btnAdd.Location = new System.Drawing.Point(406, 19);
+            this.btnAdd.Name = "btnAdd";
+            this.btnAdd.Size = new System.Drawing.Size(75, 23);
+            this.btnAdd.TabIndex = 2;
+            this.btnAdd.Text = "Add";
+            this.btnAdd.UseVisualStyleBackColor = true;
+            this.btnAdd.Click += new System.EventHandler(this.btnAdd_Click);
+            // 
+            // includePathInfo
+            // 
+            this.includePathInfo.AutoSize = true;
+            this.includePathInfo.Location = new System.Drawing.Point(6, 150);
+            this.includePathInfo.Name = "includePathInfo";
+            this.includePathInfo.Size = new System.Drawing.Size(315, 13);
+            this.includePathInfo.TabIndex = 1;
+            this.includePathInfo.Text = "Select checkboxes for absolute paths, deselect for relative paths.";
+            // 
+            // sliceIncludeList
+            // 
+            this.sliceIncludeList.FormattingEnabled = true;
+            this.sliceIncludeList.Location = new System.Drawing.Point(6, 19);
+            this.sliceIncludeList.Name = "sliceIncludeList";
+            this.sliceIncludeList.Size = new System.Drawing.Size(394, 124);
+            this.sliceIncludeList.TabIndex = 0;
+            this.sliceIncludeList.SelectedIndexChanged += new System.EventHandler(this.sliceIncludeList_SelectedIndexChanged);
+            this.sliceIncludeList.ItemCheck += new System.Windows.Forms.ItemCheckEventHandler(this.sliceIncludeList_ItemCheck);
+            // 
+            // IncludePathView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupBox1);
+            this.Name = "IncludePathView";
+            this.Size = new System.Drawing.Size(495, 174);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.CheckedListBox sliceIncludeList;
+        private System.Windows.Forms.Label includePathInfo;
+        private System.Windows.Forms.Button btnUp;
+        private System.Windows.Forms.Button btnRemove;
+        private System.Windows.Forms.Button btnEdit;
+        private System.Windows.Forms.Button btnAdd;
+        private System.Windows.Forms.Button btnDown;
+    }
+}
diff --git a/vsaddin/src/IncludePathView.cs b/vsaddin/src/IncludePathView.cs
index 5683721c2de..55ac0330217 100644
--- a/vsaddin/src/IncludePathView.cs
+++ b/vsaddin/src/IncludePathView.cs
@@ -1,443 +1,443 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Drawing;

-using System.Data;

-

-using System.Text;

-using System.Windows.Forms;

-

-using System.IO;

-

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class IncludePathView : UserControl

-    {

-        public IncludePathView()

-        {

-            InitializeComponent();

-        }

-

-        public void load()

-        {

-            sliceIncludeList.Items.Clear();

-            IncludePathList list =

-                            new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));

-            foreach(String s in list)

-            {

-                sliceIncludeList.Items.Add(s.Trim());

-                if(Path.IsPathRooted(s.Trim()))

-                {

-                    sliceIncludeList.SetItemCheckState(sliceIncludeList.Items.Count - 1, CheckState.Checked);

-                }

-            }

-        }

-

-        public void setEnabled(bool enabled)

-        {

-            sliceIncludeList.Enabled = enabled;

-            btnAdd.Enabled = enabled;

-            btnEdit.Enabled = enabled;

-            btnRemove.Enabled = enabled;

-            btnUp.Enabled = enabled;

-            btnDown.Enabled = enabled;

-        }

-

-        public bool hasUnsavedChanges()

-        {

-            if(_editingIncludes && 

-                !_txtIncludeDir.Text.Trim().TrimEnd(Path.DirectorySeparatorChar).Equals(_editingIncludeDir))

-            {

-                return true;    

-            }

-

-            if(!sliceIncludes().Equal(new IncludePathList(

-               Util.getProjectProperty(_project, Util.PropertyIceIncludePath))))

-            {

-                return true;

-            }

-            return false;

-        }

-

-        public bool apply()

-        {

-            bool changed = false;

-            IncludePathList includes = sliceIncludes();

-            if(!includes.Equal(new IncludePathList(

-                               Util.getProjectProperty(_project, Util.PropertyIceIncludePath))))

-            {

-                String s = includes.ToString();

-                Util.setProjectProperty(_project, Util.PropertyIceIncludePath, s);

-                changed = true;

-            }

-            return changed;

-        }

-

-        public void setIceConfigurationDialog(IceConfigurationDialog dialog)

-        {

-            _dialog = dialog;

-        }

-

-        public bool editingIncludeDir()

-        {

-            return _editingIncludes;

-        }

-

-        private void sliceIncludeList_SelectedIndexChanged(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(true);

-            }

-        }

-

-        private void beginEditIncludeDir()

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(true);

-            }

-            _editingIncludes = true;

-            _dialog.unsetCancelButton();

-            if(_editingIndex != -1)

-            {

-                _txtIncludeDir = new TextBox();

-                _txtIncludeDir.Text = sliceIncludeList.Items[sliceIncludeList.SelectedIndex].ToString();

-                _editingIncludeDir = _txtIncludeDir.Text;

-                sliceIncludeList.SelectionMode = SelectionMode.One;

-

-                Rectangle rect = sliceIncludeList.GetItemRectangle(sliceIncludeList.SelectedIndex);

-                _txtIncludeDir.Location = new Point(sliceIncludeList.Location.X + 2,

-                                                    sliceIncludeList.Location.Y + rect.Y);

-                _txtIncludeDir.Width = sliceIncludeList.Width - 50;

-                _txtIncludeDir.Parent = sliceIncludeList;

-                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);

-                _txtIncludeDir.KeyUp += new KeyEventHandler(includeDirKeyUp);

-                groupBox1.Controls.Add(_txtIncludeDir);

-

-                _btnSelectInclude = new Button();

-                _btnSelectInclude.Text = "...";

-                _btnSelectInclude.Location = new Point(sliceIncludeList.Location.X + _txtIncludeDir.Width,

-                                                       sliceIncludeList.Location.Y + rect.Y);

-                _btnSelectInclude.Width = 49;

-                _btnSelectInclude.Height = _txtIncludeDir.Height;

-                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);

-                groupBox1.Controls.Add(_btnSelectInclude);

-

-

-                _txtIncludeDir.Show();

-                _txtIncludeDir.BringToFront();

-                _txtIncludeDir.Focus();

-

-                _btnSelectInclude.Show();

-                _btnSelectInclude.BringToFront();

-            }

-        }

-

-        public void endEditIncludeDir(bool saveChanges)

-        {

-            if(!_editingIncludes)

-            {

-                _dialog.needSave();

-                return;

-            }

-            _editingIncludes = false;

-            String path = null;

-            if(_editingIndex > -1 && _editingIndex < sliceIncludeList.Items.Count)

-            {

-                path = sliceIncludeList.Items[_editingIndex].ToString();

-            }

-

-            lock(this)

-            {

-                _dialog.setCancelButton();

-                if(_txtIncludeDir == null || _btnSelectInclude == null)

-                {

-                    _dialog.needSave();

-                    return;

-                }

-                if(saveChanges)

-                {

-                    path = _txtIncludeDir.Text;

-                    if(path != null)

-                    {

-                        path = path.Trim();

-                    }

-                }

-

-                this.groupBox1.Controls.Remove(_txtIncludeDir);

-                _txtIncludeDir = null;

-

-                this.groupBox1.Controls.Remove(_btnSelectInclude);

-                _btnSelectInclude = null;

-            }

-

-            if(String.IsNullOrEmpty(path))

-            {

-                if(_editingIndex != -1)

-                {

-                    sliceIncludeList.Items.RemoveAt(_editingIndex);

-                    sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;

-                    _editingIndex = -1;

-                }

-            }

-            else if(_editingIndex != -1 && saveChanges)

-            {

-                if(!path.Equals(sliceIncludeList.Items[_editingIndex].ToString(),

-                                               StringComparison.CurrentCultureIgnoreCase))

-                {

-                    IncludePathList includes = sliceIncludes();

-                    if(includes.Count > _editingIndex)

-                    {

-                        //

-                        // We don't want an item to be considered a duplicate of itself.

-                        //

-                        includes.RemoveAt(_editingIndex);

-                    }

-                    if(includes.Contains(_project, path))

-                    {

-                        MessageBox.Show(this, "The Slice Include Path doesn't allow duplicates.\n" +

-                                   "Value: `" + path + "' will be removed.\n",

-                                   "Ice Visual Studio Add-In", MessageBoxButtons.OK,

-                                   MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1,

-                                   (MessageBoxOptions)0);

-                        sliceIncludeList.Items.RemoveAt(_editingIndex);

-                        sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;

-                        _editingIndex = -1;

-                    }

-                    else

-                    {

-                        sliceIncludeList.Items[_editingIndex] = path;

-                        if(Path.IsPathRooted(path))

-                        {

-                            sliceIncludeList.SetItemCheckState(_editingIndex, CheckState.Checked);

-                        }

-                        else

-                        {

-                            sliceIncludeList.SetItemCheckState(_editingIndex, CheckState.Unchecked);

-                        }

-                    }

-                }

-            }

-            resetIncludeDirChecks();

-            _dialog.needSave();

-        }

-

-        private void includeDirKeyDown(object sender, KeyEventArgs e)

-        {

-            if(e.KeyCode.Equals(Keys.Escape))

-            {

-                endEditIncludeDir(false);

-            }

-            else if(e.KeyCode.Equals(Keys.Enter))

-            {

-                endEditIncludeDir(true);

-            }

-        }

-

-        private void includeDirKeyUp(object sender, KeyEventArgs e)

-        {

-            if(!e.KeyCode.Equals(Keys.Enter) && !e.KeyCode.Equals(Keys.Escape) &&

-               _editingIncludes)

-            {

-                _dialog.needSave();

-            }

-        }

-

-        private void selectIncludeClicked(object sender, EventArgs e)

-        {

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));

-            dialog.SelectedPath = projectDir;

-            dialog.Description = "Slice Include Directory";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                string path = dialog.SelectedPath;

-                if(!Util.containsEnvironmentVars(path))

-                {

-                    path = Util.relativePath(_project, Path.GetFullPath(path));

-                }

-                _txtIncludeDir.Text = path;

-            }

-            endEditIncludeDir(true);

-        }

-

-        private void btnAdd_Click(object sender, EventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(true);

-            }

-            sliceIncludeList.Items.Add("");

-            sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;

-            _editingIndex = sliceIncludeList.SelectedIndex;

-            beginEditIncludeDir();

-        }

-

-        private void btnEdit_Click(object sender, EventArgs e)

-        {

-            if(sliceIncludeList.SelectedIndex != -1)

-            {

-                _editingIndex = sliceIncludeList.SelectedIndex;

-                beginEditIncludeDir();

-            }

-        }

-

-        private void btnRemove_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            int index = sliceIncludeList.SelectedIndex;

-            if(_editingIncludes)

-            {

-                index = _editingIndex;

-                endEditIncludeDir(true);

-            }

-            if(index > -1 && index < sliceIncludeList.Items.Count)

-            {

-                int selected = index;

-                sliceIncludeList.Items.RemoveAt(selected);

-                if(sliceIncludeList.Items.Count > 0)

-                {

-                    if(selected > 0)

-                    {

-                        selected -= 1;

-                    }

-                    sliceIncludeList.SelectedIndex = selected;

-                }

-            }

-            _dialog.needSave();

-            Cursor = Cursors.Default;

-        }

-

-        private IncludePathList sliceIncludes()

-        {

-            IncludePathList paths = new IncludePathList();

-            foreach(String s in sliceIncludeList.Items)

-            {

-                paths.Add(s.Trim());

-            }

-            return paths;

-        }

-

-        private void btnUp_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(true);

-            }

-            int index = sliceIncludeList.SelectedIndex;

-            if(index > 0)

-            {

-                string current = sliceIncludeList.SelectedItem.ToString();

-                sliceIncludeList.Items.RemoveAt(index);

-                sliceIncludeList.Items.Insert(index - 1, current);

-                sliceIncludeList.SelectedIndex = index - 1;

-                resetIncludeDirChecks();

-                _dialog.needSave();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        private void btnDown_Click(object sender, EventArgs e)

-        {

-            Cursor = Cursors.WaitCursor;

-            if(_editingIncludes)

-            {

-                endEditIncludeDir(true);

-            }

-            int index = sliceIncludeList.SelectedIndex;

-            if(index < sliceIncludeList.Items.Count - 1 && index > -1)

-            {

-                string current = sliceIncludeList.SelectedItem.ToString();

-                sliceIncludeList.Items.RemoveAt(index);

-                sliceIncludeList.Items.Insert(index + 1, current);

-                sliceIncludeList.SelectedIndex = index + 1;

-                resetIncludeDirChecks();

-                _dialog.needSave();

-            }

-            Cursor = Cursors.Default;

-        }

-

-        //

-        // Reset the include dir checkboxes that indicate if the path

-        // is absolute or relative. This should be called after the list

-        // is populated or the includes list order is modified.

-        //

-        private void resetIncludeDirChecks()

-        {

-            for(int i = 0; i < sliceIncludeList.Items.Count; ++i)

-            {

-                String path = sliceIncludeList.Items[i].ToString();

-                if(String.IsNullOrEmpty(path))

-                {

-                    continue;

-                }

-

-                if(Path.IsPathRooted(path))

-                {

-                    sliceIncludeList.SetItemCheckState(i, CheckState.Checked);

-                }

-                else

-                {

-                    sliceIncludeList.SetItemCheckState(i, CheckState.Unchecked);

-                }

-            }

-        }

-

-        private void sliceIncludeList_ItemCheck(object sender, ItemCheckEventArgs e)

-        {

-            if(_editingIncludes)

-            {

-                return;

-            }

-            string path = sliceIncludeList.Items[e.Index].ToString();

-            if(Util.containsEnvironmentVars(path))

-            {

-                return;

-            }

-

-            if(e.NewValue == CheckState.Unchecked)

-            {

-                path = Util.relativePath(_project, path);

-            }

-            else if(e.NewValue == CheckState.Checked)

-            {

-                if(!Path.IsPathRooted(path))

-                {

-                    path = Util.absolutePath(_project, path);

-                }

-            }

-

-            sliceIncludeList.Items[e.Index] = path;

-

-            _dialog.needSave();

-        }

-

-        public void init(IceConfigurationDialog dialog, Project project)

-        {

-            _dialog = dialog;

-            _project = project;

-        }

-

-        private Project _project;

-        private IceConfigurationDialog _dialog;        

-        private int _editingIndex = -1;

-        private bool _editingIncludes;

-        private string _editingIncludeDir = null;

-        private TextBox _txtIncludeDir;

-        private Button _btnSelectInclude;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+
+using System.Text;
+using System.Windows.Forms;
+
+using System.IO;
+
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class IncludePathView : UserControl
+    {
+        public IncludePathView()
+        {
+            InitializeComponent();
+        }
+
+        public void load()
+        {
+            sliceIncludeList.Items.Clear();
+            IncludePathList list =
+                            new IncludePathList(Util.getProjectProperty(_project, Util.PropertyIceIncludePath));
+            foreach(String s in list)
+            {
+                sliceIncludeList.Items.Add(s.Trim());
+                if(Path.IsPathRooted(s.Trim()))
+                {
+                    sliceIncludeList.SetItemCheckState(sliceIncludeList.Items.Count - 1, CheckState.Checked);
+                }
+            }
+        }
+
+        public void setEnabled(bool enabled)
+        {
+            sliceIncludeList.Enabled = enabled;
+            btnAdd.Enabled = enabled;
+            btnEdit.Enabled = enabled;
+            btnRemove.Enabled = enabled;
+            btnUp.Enabled = enabled;
+            btnDown.Enabled = enabled;
+        }
+
+        public bool hasUnsavedChanges()
+        {
+            if(_editingIncludes && 
+                !_txtIncludeDir.Text.Trim().TrimEnd(Path.DirectorySeparatorChar).Equals(_editingIncludeDir))
+            {
+                return true;    
+            }
+
+            if(!sliceIncludes().Equal(new IncludePathList(
+               Util.getProjectProperty(_project, Util.PropertyIceIncludePath))))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        public bool apply()
+        {
+            bool changed = false;
+            IncludePathList includes = sliceIncludes();
+            if(!includes.Equal(new IncludePathList(
+                               Util.getProjectProperty(_project, Util.PropertyIceIncludePath))))
+            {
+                String s = includes.ToString();
+                Util.setProjectProperty(_project, Util.PropertyIceIncludePath, s);
+                changed = true;
+            }
+            return changed;
+        }
+
+        public void setIceConfigurationDialog(IceConfigurationDialog dialog)
+        {
+            _dialog = dialog;
+        }
+
+        public bool editingIncludeDir()
+        {
+            return _editingIncludes;
+        }
+
+        private void sliceIncludeList_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(true);
+            }
+        }
+
+        private void beginEditIncludeDir()
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(true);
+            }
+            _editingIncludes = true;
+            _dialog.unsetCancelButton();
+            if(_editingIndex != -1)
+            {
+                _txtIncludeDir = new TextBox();
+                _txtIncludeDir.Text = sliceIncludeList.Items[sliceIncludeList.SelectedIndex].ToString();
+                _editingIncludeDir = _txtIncludeDir.Text;
+                sliceIncludeList.SelectionMode = SelectionMode.One;
+
+                Rectangle rect = sliceIncludeList.GetItemRectangle(sliceIncludeList.SelectedIndex);
+                _txtIncludeDir.Location = new Point(sliceIncludeList.Location.X + 2,
+                                                    sliceIncludeList.Location.Y + rect.Y);
+                _txtIncludeDir.Width = sliceIncludeList.Width - 50;
+                _txtIncludeDir.Parent = sliceIncludeList;
+                _txtIncludeDir.KeyDown += new KeyEventHandler(includeDirKeyDown);
+                _txtIncludeDir.KeyUp += new KeyEventHandler(includeDirKeyUp);
+                groupBox1.Controls.Add(_txtIncludeDir);
+
+                _btnSelectInclude = new Button();
+                _btnSelectInclude.Text = "...";
+                _btnSelectInclude.Location = new Point(sliceIncludeList.Location.X + _txtIncludeDir.Width,
+                                                       sliceIncludeList.Location.Y + rect.Y);
+                _btnSelectInclude.Width = 49;
+                _btnSelectInclude.Height = _txtIncludeDir.Height;
+                _btnSelectInclude.Click += new EventHandler(selectIncludeClicked);
+                groupBox1.Controls.Add(_btnSelectInclude);
+
+
+                _txtIncludeDir.Show();
+                _txtIncludeDir.BringToFront();
+                _txtIncludeDir.Focus();
+
+                _btnSelectInclude.Show();
+                _btnSelectInclude.BringToFront();
+            }
+        }
+
+        public void endEditIncludeDir(bool saveChanges)
+        {
+            if(!_editingIncludes)
+            {
+                _dialog.needSave();
+                return;
+            }
+            _editingIncludes = false;
+            String path = null;
+            if(_editingIndex > -1 && _editingIndex < sliceIncludeList.Items.Count)
+            {
+                path = sliceIncludeList.Items[_editingIndex].ToString();
+            }
+
+            lock(this)
+            {
+                _dialog.setCancelButton();
+                if(_txtIncludeDir == null || _btnSelectInclude == null)
+                {
+                    _dialog.needSave();
+                    return;
+                }
+                if(saveChanges)
+                {
+                    path = _txtIncludeDir.Text;
+                    if(path != null)
+                    {
+                        path = path.Trim();
+                    }
+                }
+
+                this.groupBox1.Controls.Remove(_txtIncludeDir);
+                _txtIncludeDir = null;
+
+                this.groupBox1.Controls.Remove(_btnSelectInclude);
+                _btnSelectInclude = null;
+            }
+
+            if(String.IsNullOrEmpty(path))
+            {
+                if(_editingIndex != -1)
+                {
+                    sliceIncludeList.Items.RemoveAt(_editingIndex);
+                    sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;
+                    _editingIndex = -1;
+                }
+            }
+            else if(_editingIndex != -1 && saveChanges)
+            {
+                if(!path.Equals(sliceIncludeList.Items[_editingIndex].ToString(),
+                                               StringComparison.CurrentCultureIgnoreCase))
+                {
+                    IncludePathList includes = sliceIncludes();
+                    if(includes.Count > _editingIndex)
+                    {
+                        //
+                        // We don't want an item to be considered a duplicate of itself.
+                        //
+                        includes.RemoveAt(_editingIndex);
+                    }
+                    if(includes.Contains(_project, path))
+                    {
+                        MessageBox.Show(this, "The Slice Include Path doesn't allow duplicates.\n" +
+                                   "Value: `" + path + "' will be removed.\n",
+                                   "Ice Visual Studio Add-In", MessageBoxButtons.OK,
+                                   MessageBoxIcon.Warning, MessageBoxDefaultButton.Button1,
+                                   (MessageBoxOptions)0);
+                        sliceIncludeList.Items.RemoveAt(_editingIndex);
+                        sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;
+                        _editingIndex = -1;
+                    }
+                    else
+                    {
+                        sliceIncludeList.Items[_editingIndex] = path;
+                        if(Path.IsPathRooted(path))
+                        {
+                            sliceIncludeList.SetItemCheckState(_editingIndex, CheckState.Checked);
+                        }
+                        else
+                        {
+                            sliceIncludeList.SetItemCheckState(_editingIndex, CheckState.Unchecked);
+                        }
+                    }
+                }
+            }
+            resetIncludeDirChecks();
+            _dialog.needSave();
+        }
+
+        private void includeDirKeyDown(object sender, KeyEventArgs e)
+        {
+            if(e.KeyCode.Equals(Keys.Escape))
+            {
+                endEditIncludeDir(false);
+            }
+            else if(e.KeyCode.Equals(Keys.Enter))
+            {
+                endEditIncludeDir(true);
+            }
+        }
+
+        private void includeDirKeyUp(object sender, KeyEventArgs e)
+        {
+            if(!e.KeyCode.Equals(Keys.Enter) && !e.KeyCode.Equals(Keys.Escape) &&
+               _editingIncludes)
+            {
+                _dialog.needSave();
+            }
+        }
+
+        private void selectIncludeClicked(object sender, EventArgs e)
+        {
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            string projectDir = Path.GetFullPath(Path.GetDirectoryName(_project.FileName));
+            dialog.SelectedPath = projectDir;
+            dialog.Description = "Slice Include Directory";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                string path = dialog.SelectedPath;
+                if(!Util.containsEnvironmentVars(path))
+                {
+                    path = Util.relativePath(_project, Path.GetFullPath(path));
+                }
+                _txtIncludeDir.Text = path;
+            }
+            endEditIncludeDir(true);
+        }
+
+        private void btnAdd_Click(object sender, EventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(true);
+            }
+            sliceIncludeList.Items.Add("");
+            sliceIncludeList.SelectedIndex = sliceIncludeList.Items.Count - 1;
+            _editingIndex = sliceIncludeList.SelectedIndex;
+            beginEditIncludeDir();
+        }
+
+        private void btnEdit_Click(object sender, EventArgs e)
+        {
+            if(sliceIncludeList.SelectedIndex != -1)
+            {
+                _editingIndex = sliceIncludeList.SelectedIndex;
+                beginEditIncludeDir();
+            }
+        }
+
+        private void btnRemove_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            int index = sliceIncludeList.SelectedIndex;
+            if(_editingIncludes)
+            {
+                index = _editingIndex;
+                endEditIncludeDir(true);
+            }
+            if(index > -1 && index < sliceIncludeList.Items.Count)
+            {
+                int selected = index;
+                sliceIncludeList.Items.RemoveAt(selected);
+                if(sliceIncludeList.Items.Count > 0)
+                {
+                    if(selected > 0)
+                    {
+                        selected -= 1;
+                    }
+                    sliceIncludeList.SelectedIndex = selected;
+                }
+            }
+            _dialog.needSave();
+            Cursor = Cursors.Default;
+        }
+
+        private IncludePathList sliceIncludes()
+        {
+            IncludePathList paths = new IncludePathList();
+            foreach(String s in sliceIncludeList.Items)
+            {
+                paths.Add(s.Trim());
+            }
+            return paths;
+        }
+
+        private void btnUp_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(true);
+            }
+            int index = sliceIncludeList.SelectedIndex;
+            if(index > 0)
+            {
+                string current = sliceIncludeList.SelectedItem.ToString();
+                sliceIncludeList.Items.RemoveAt(index);
+                sliceIncludeList.Items.Insert(index - 1, current);
+                sliceIncludeList.SelectedIndex = index - 1;
+                resetIncludeDirChecks();
+                _dialog.needSave();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        private void btnDown_Click(object sender, EventArgs e)
+        {
+            Cursor = Cursors.WaitCursor;
+            if(_editingIncludes)
+            {
+                endEditIncludeDir(true);
+            }
+            int index = sliceIncludeList.SelectedIndex;
+            if(index < sliceIncludeList.Items.Count - 1 && index > -1)
+            {
+                string current = sliceIncludeList.SelectedItem.ToString();
+                sliceIncludeList.Items.RemoveAt(index);
+                sliceIncludeList.Items.Insert(index + 1, current);
+                sliceIncludeList.SelectedIndex = index + 1;
+                resetIncludeDirChecks();
+                _dialog.needSave();
+            }
+            Cursor = Cursors.Default;
+        }
+
+        //
+        // Reset the include dir checkboxes that indicate if the path
+        // is absolute or relative. This should be called after the list
+        // is populated or the includes list order is modified.
+        //
+        private void resetIncludeDirChecks()
+        {
+            for(int i = 0; i < sliceIncludeList.Items.Count; ++i)
+            {
+                String path = sliceIncludeList.Items[i].ToString();
+                if(String.IsNullOrEmpty(path))
+                {
+                    continue;
+                }
+
+                if(Path.IsPathRooted(path))
+                {
+                    sliceIncludeList.SetItemCheckState(i, CheckState.Checked);
+                }
+                else
+                {
+                    sliceIncludeList.SetItemCheckState(i, CheckState.Unchecked);
+                }
+            }
+        }
+
+        private void sliceIncludeList_ItemCheck(object sender, ItemCheckEventArgs e)
+        {
+            if(_editingIncludes)
+            {
+                return;
+            }
+            string path = sliceIncludeList.Items[e.Index].ToString();
+            if(Util.containsEnvironmentVars(path))
+            {
+                return;
+            }
+
+            if(e.NewValue == CheckState.Unchecked)
+            {
+                path = Util.relativePath(_project, path);
+            }
+            else if(e.NewValue == CheckState.Checked)
+            {
+                if(!Path.IsPathRooted(path))
+                {
+                    path = Util.absolutePath(_project, path);
+                }
+            }
+
+            sliceIncludeList.Items[e.Index] = path;
+
+            _dialog.needSave();
+        }
+
+        public void init(IceConfigurationDialog dialog, Project project)
+        {
+            _dialog = dialog;
+            _project = project;
+        }
+
+        private Project _project;
+        private IceConfigurationDialog _dialog;        
+        private int _editingIndex = -1;
+        private bool _editingIncludes;
+        private string _editingIncludeDir = null;
+        private TextBox _txtIncludeDir;
+        private Button _btnSelectInclude;
+    }
+}
diff --git a/vsaddin/src/Options.cs b/vsaddin/src/Options.cs
index 363d66711bb..1e1bd275173 100644
--- a/vsaddin/src/Options.cs
+++ b/vsaddin/src/Options.cs
@@ -1,836 +1,836 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Text;

-using System.Collections.Generic;

-using System.Diagnostics;

-using System.Security.Permissions;

-using System.Runtime.Serialization;

-

-using ValidOpts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionDetails>;

-using Opts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionValue>;

-using ROpts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionValueVector>;

-using Synonyms = System.Collections.Generic.Dictionary<string, string>;

-

-namespace Ice.VisualStudio

-{

-

-[SerializableAttribute]

-public class BadOptionException : Exception

-{

-    public BadOptionException()

-    {

-        this.reason = "";

-    }

-

-    public BadOptionException(string reason)

-    {

-        this.reason = reason;

-    }

-

-    public string reason

-    {

-        get

-        {

-            return _reason;

-        }

-        set

-        {

-            _reason = value;

-        }

-    }

-

-    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]

-    public override void GetObjectData(SerializationInfo info, StreamingContext context)

-    {

-        if(info == null)

-        {

-            throw new ArgumentNullException("info");

-        }

-        base.GetObjectData(info, context);

-        info.AddValue("reason", reason);

-    }

-

-    private string _reason;

-}

-

-[SerializableAttribute]

-public class APIException : Exception

-{

-    public APIException()

-    {

-        this.reason = "";

-    }

-

-    public APIException(string reason)

-    {

-        this.reason = reason;

-    }

-

-    public string reason

-    {

-        get

-        {

-            return _reason;

-        }

-        set

-        {

-            _reason = value;

-        }

-    }

-

-    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]

-    public override void GetObjectData(SerializationInfo info, StreamingContext context)

-    {

-        if(info == null)

-        {

-            throw new ArgumentNullException("info");

-        }

-        base.GetObjectData(info, context);

-        info.AddValue("reason", reason);

-    }

-

-    private string _reason;

-}

-

-public class Options

-{

-    public enum LengthType { ShortOpt, LongOpt };

-    public enum RepeatType { Repeat, NoRepeat };

-    public enum ArgType { NeedArg, NoArg };

-    private enum ParseState { Normal, DoubleQuote, SingleQuote };

-    private bool parseCalled = false;

-

-    public struct OptionDetails

-    {

-        public LengthType length;

-        public ArgType arg;

-        public RepeatType repeat;

-        public bool hasDefault;

-    }

-

-    public struct OptionValue

-    {

-        public string val;

-    }

-

-    public struct OptionValueVector

-    {

-        public List<string> vals;

-    }

-

-    ValidOpts _validOpts = new ValidOpts(); // Valid options and their details.

-    Opts _opts = new Opts(); // Value of non-repeating options.

-    ROpts _ropts = new ROpts(); // Value of repeating options.

-    Synonyms _synonyms = new Synonyms(); // Map from short to long option and vice versa.

-

-    public void addOpt(string shortOpt)

-    {

-        addOpt(shortOpt, "", ArgType.NoArg, "", RepeatType.NoRepeat);

-    }

-

-    public void addOpt(string shortOpt, string longOpt)

-    {

-        addOpt(shortOpt, longOpt, ArgType.NoArg, "", RepeatType.NoRepeat);

-    }

-

-    public void addOpt(string shortOpt, string longOpt, ArgType at)

-    {

-        addOpt(shortOpt, longOpt, at, "", RepeatType.NoRepeat);

-    }

-

-    public void addOpt(string shortOpt, string longOpt, ArgType at, string dflt)

-    {

-        addOpt(shortOpt, longOpt, at, dflt, RepeatType.NoRepeat);

-    }

-

-    public void addOpt(string shortOpt, string longOpt, ArgType at, string dflt, RepeatType rt)

-    {

-        checkArgs(shortOpt, longOpt, at == ArgType.NeedArg, dflt);

-        addValidOpt(shortOpt, longOpt, at, dflt, rt);

-    }

-

-    public List<string> parse(List<string> args)

-    {

-        if(parseCalled)

-        {

-            throw new APIException("cannot call parse() more than once on the same Option instance");

-        }

-        parseCalled = true;

-

-        List<string> seenNonRepeatableOpts = new List<string>(); // To catch repeated non-repeatable options.

-

-        List<string> result = new List<string>();

-

-        int i;

-        for(i = 0; i < args.Count; ++i)

-        {

-            if(args[i] == "-" || args[i] == "--")

-            {

-                ++i;

-                break; // "-" and "--" indicate end of options.

-            }

-

-            string opt = null;

-            OptionDetails pos = new OptionDetails();

-            pos.repeat = RepeatType.NoRepeat;

-            pos.length = LengthType.ShortOpt;

-            pos.hasDefault = false;

-            pos.arg = ArgType.NoArg;

-

-            bool argDone = false;

-

-            if(args[i].StartsWith("--", StringComparison.Ordinal))

-            {

-                //

-                // Long option. If the option has an argument, it can either be separated by '='

-                // or appear as a separate argument. For example, "--name value" is the same

-                // as "--name=value".

-                //

-                int p = args[i].IndexOf('=', 2);

-                if(p >= 0)

-                {

-                    opt = args[i].Substring(2, p - 2);

-                }

-                else

-                {

-                    opt = args[i].Substring(2);

-                }

-

-                pos = checkOpt(opt, LengthType.LongOpt);

-

-                if(pos.repeat == RepeatType.NoRepeat)

-                {

-                    if(seenNonRepeatableOpts.Contains(opt))

-                    {

-                        string err = "`--";

-                        err += opt + ":' option cannot be repeated";

-                        throw new BadOptionException(err);

-                    }

-                    seenNonRepeatableOpts.Add(opt);

-                    string synonym = getSynonym(opt);

-                    if(!String.IsNullOrEmpty(synonym))

-                    {

-                        seenNonRepeatableOpts.Add(synonym);

-                    }

-                }

-

-                if(p >= 0)

-                {

-                    if(pos.arg == ArgType.NoArg && p != args[i].Length - 1)

-                    {

-                        string err = "`";

-                        err += args[i];

-                        err += "': option does not take an argument";

-                        throw new BadOptionException(err);

-                    }

-                    setOpt(opt, "", args[i].Substring(p + 1), pos.repeat);

-                    argDone = true;

-                }

-            }

-            else if(!String.IsNullOrEmpty(args[i]) && args[i][0] == '-')

-            {

-                //

-                // Short option.

-                //

-                for(int p = 1; p < args[i].Length; ++p)

-                {

-                    opt = "";

-                    opt += args[i][p];

-                    pos = checkOpt(opt, LengthType.ShortOpt);

-

-                    if(pos.repeat == RepeatType.NoRepeat)

-                    {

-                        if(seenNonRepeatableOpts.Contains(opt))

-                        {

-                            string err = "`-";

-                            err += opt + ":' option cannot be repeated";

-                            throw new BadOptionException(err);

-                        }

-                        seenNonRepeatableOpts.Add(opt);

-                        string synonym = getSynonym(opt);

-                        if(!String.IsNullOrEmpty(synonym))

-                        {

-                            seenNonRepeatableOpts.Add(synonym);

-                        }

-                    }

-

-                    if(pos.arg == ArgType.NeedArg && p != args[i].Length - 1)

-                    {

-                        string optArg = args[i].Substring(p + 1);

-                        setOpt(opt, "", optArg, pos.repeat);

-                        argDone = true;

-                        break;

-                    }

-                }

-            }

-            else

-            {

-                //

-                // Not an option or option argument.

-                //

-                result.Add(args[i]);

-                argDone = true;

-            }

-

-            if(!argDone)

-            {

-                if(pos.arg == ArgType.NeedArg) // Need an argument that is separated by whitespace.

-                {

-                    if(i == args.Count - 1)

-                    {

-                        string err = "`-";

-                        if(opt.Length != 1)

-                        {

-                            err += "-";

-                        }

-                        err += opt;

-                        err += "' option requires an argument";

-                        throw new BadOptionException(err);

-                    }

-                    setOpt(opt, "", args[++i], pos.repeat);

-                }

-                else

-                {

-                    setOpt(opt, "", "1", pos.repeat);

-                }

-            }

-        }

-

-        _synonyms.Clear(); // Don't need the contents anymore.

-

-        while(i < args.Count)

-        {

-            result.Add(args[i++]);

-        }

-

-        return result;

-    }

-

-    public bool isSet(string opt)

-    {

-        if(!parseCalled)

-        {

-            throw new APIException("cannot lookup options before calling parse()");

-        }

-

-        OptionDetails pos = checkOptIsValid(opt);

-        return pos.repeat == RepeatType.NoRepeat ? _opts.ContainsKey(opt) : _ropts.ContainsKey(opt);

-    }

-

-    public string optArg(string opt)

-    {

-        if(!parseCalled)

-        {

-            throw new APIException("cannot lookup options before calling parse()");

-        }

-

-        OptionDetails pos = checkOptHasArg(opt);

-

-        if(pos.repeat == RepeatType.Repeat)

-        {

-            string err = "`-";

-            if(pos.length ==  LengthType.LongOpt)

-            {

-                err += '-';

-            }

-            err += opt;

-            err += "': is a repeating option -- use argVec() to get its arguments";

-            throw new BadOptionException(err);

-        }

-

-        if(!_opts.ContainsKey(opt))

-        {

-            return "";

-        }

-        return _opts[opt].val;

-    }

-    

-    public List<string> argVec(string opt)

-    {

-        if(!parseCalled)

-        {

-            throw new APIException("cannot lookup options before calling parse()");

-        }

-

-        OptionDetails pos = checkOptHasArg(opt);

-

-        if(pos.repeat == RepeatType.NoRepeat)

-        {

-            string err = "`-";

-            if(pos.length == LengthType.LongOpt)

-            {

-                err += '-';

-            }

-            err += opt + "': is a non-repeating option -- use optArg() to get its argument";

-            throw new BadOptionException(err);

-        }

-

-        if(!_ropts.ContainsKey(opt))

-        {

-            return new List<string>();

-        }

-        return _ropts[opt].vals;

-    }

-

-    private void

-    addValidOpt(string shortOpt, string longOpt, ArgType at, string dflt, RepeatType rt)

-    {

-        if(shortOpt.Length > 0 && _validOpts.ContainsKey(shortOpt))

-        {

-            string err = "`";

-            err += shortOpt;

-            err += "': duplicate option";

-            throw new BadOptionException(err);

-        }

-        if(longOpt.Length > 0 && _validOpts.ContainsKey(longOpt))

-        {

-            string err = "`";

-            err += longOpt;

-            err += "': duplicate option";

-            throw new BadOptionException(err);

-        }

-

-        OptionDetails odp = new OptionDetails();

-        odp.arg = at;

-        odp.repeat = rt;

-        odp.hasDefault = dflt.Length > 0;

-

-        if(shortOpt.Length > 0)

-        {

-            odp.length = LengthType.ShortOpt;

-            _validOpts[shortOpt] = odp;

-        }

-        if(longOpt.Length > 0)

-        {

-            odp.length = LengthType.LongOpt;

-            _validOpts[longOpt] = odp;

-        }

-

-        updateSynonyms(shortOpt, longOpt);

-

-        if(at == ArgType.NeedArg && dflt.Length > 0)

-        {

-            setOpt(shortOpt, longOpt, dflt, rt);

-        }

-    }

-

-    void

-    updateSynonyms(string shortOpt, string longOpt)

-    {

-        if(shortOpt.Length > 0 && longOpt.Length > 0)

-        {

-            _synonyms[shortOpt] = longOpt;

-            _synonyms[longOpt] = shortOpt;

-        }

-    }

-

-    string

-    getSynonym(string optName)

-    {

-        return _synonyms.ContainsKey(optName) ? _synonyms[optName] : "";

-    }

-

-    private static void

-    checkArgs(string shortOpt, string longOpt, bool needArg, string dflt)

-    {

-        if(shortOpt.Length == 0 && longOpt.Length == 0)

-        {

-            throw new BadOptionException("short and long option cannot both be empty");

-        }

-

-        if(shortOpt.Length > 0)

-        {

-            if(shortOpt.Length != 1)

-            {

-                string err = "`";

-                err += shortOpt;

-                err += "': a short option cannot specify more than one option";

-                throw new BadOptionException(err);

-            }

-            if(" \t\n\r\f\v".IndexOf(shortOpt, StringComparison.Ordinal) >= 0)

-            {

-                string err = "`";

-                err += shortOpt;

-                err += "': a short option cannot be whitespace";

-                throw new BadOptionException(err);

-            }

-            if(!String.IsNullOrEmpty(shortOpt) && shortOpt[0].Equals('-'))

-            {

-                string err = "`";

-                err += shortOpt;

-                err += "': a short option cannot be `-'";

-                throw new BadOptionException(err);

-            }

-        }

-

-        if(longOpt.Length > 0)

-        {

-            if(" \t\n\r\f\v".IndexOf(longOpt, StringComparison.Ordinal) >= 0)

-            {

-                string err = "`";

-                err += shortOpt;

-                err += "': a long option cannot be whitespace";

-                throw new BadOptionException(err);

-            }

-            if(!String.IsNullOrEmpty(shortOpt) && shortOpt[0].Equals('-'))

-            {

-                string err = "`";

-                err += shortOpt;

-                err += "': a long option cannot be `-'";

-                throw new BadOptionException(err);

-            }

-        }

-

-        if(!needArg && dflt.Length > 0)

-        {

-            throw new BadOptionException("a default value can be specified only for options requiring an argument");

-        }

-    }

-

-    //

-    // Split a command line into argv-style arguments, applying

-    // bash quoting rules. The return value is the arguments

-    // in the command line, with all shell escapes applied, and

-    // quotes removed.

-    //

-    static public List<string> split(string line)

-    {

-        const string IFS = " \t\n"; // Internal Field Separator.

-        if(String.IsNullOrEmpty(line))

-        {

-            return new List<string>();

-        }

-        String l = line.Trim(' ').Trim('\t').Trim('\n');

-

-        if(String.IsNullOrEmpty(l))

-        {

-            return new List<string>();

-        }

-

-        List<string> vec = new List<string>();

-

-        

-        ParseState state = ParseState.Normal;

-

-        string arg = null;

-

-        for(int i = 0; i < l.Length; ++i)

-        {

-            char c = l[i];

-            switch(state)

-            {

-                case ParseState.Normal:

-                {

-                    switch(c)

-                    {

-                        case '\\':

-                        {

-                            //

-                            // Ignore a backslash at the end of the string,

-                            // and strip backslash-newline pairs. If a

-                            // backslash is followed by a space, single quote,

-                            // double quote, or dollar sign, we drop the backslash

-                            // and write the space, single quote, double quote,

-                            // or dollar sign. This is necessary to allow quotes

-                            // to be escaped. Dropping the backslash preceding a

-                            // space deviates from bash quoting rules, but is

-                            // necessary so we don't drop backslashes from Windows

-                            // path names.)

-                            //

-                            if(i < l.Length - 1 && l[++i] != '\n')

-                            {

-                                switch(l[i])

-                                {

-                                    case ' ':

-                                    case '$':

-                                    case '\'':

-                                    case '"':

-                                    {

-                                        arg += l[i];

-                                        break;

-                                    }

-                                    default:

-                                    {

-                                        arg += '\\';

-                                        arg += l[i];

-                                        break;

-                                    }

-                                }

-                            }

-                            break;

-                        }

-                        case '\'':

-                        {

-                            state = ParseState.SingleQuote;

-                            break;

-                        }

-                        case '"':

-                        {

-                            state = ParseState.DoubleQuote;

-                            break;

-                        }

-                        default:

-                        {

-                            if(IFS.IndexOf(l[i]) >= 0)

-                            {

-                                vec.Add(arg);

-                                arg = "";

-

-                                //

-                                // Move to start of next argument.

-                                //

-                                while(++i < l.Length && IFS.IndexOf(l[i]) >= 0)

-                                {

-                                    ;

-                                }

-                                --i;

-                            }

-                            else

-                            {

-                                arg += l[i];

-                            }

-                            break;

-                        }

-                    }

-                    break;

-                }

-                case ParseState.DoubleQuote:

-                {

-                    //

-                    // Within double quotes, only backslash retains its special

-                    // meaning, and only if followed by double quote, backslash,

-                    // or newline. If not followed by one of these characters,

-                    // both the backslash and the character are preserved.

-                    //

-                    if(c.Equals('\\') && i < l.Length - 1)

-                    {

-                        switch(c = l[++i])

-                        {

-                            case '"':

-                            case '\\':

-                            case '\n':

-                            {

-                                arg += c;

-                                break;

-                            }

-                            default:

-                            {

-                                arg += '\\';

-                                arg += c;

-                                break;

-                            }

-                        }

-                    }

-                    else if(c.Equals('"')) // End of double-quote mode.

-                    {

-                        state = ParseState.Normal;

-                    }

-                    else

-                    {

-                        arg += c; // Everything else is taken literally.

-                    }

-                    break;

-                }

-                case ParseState.SingleQuote:

-                {

-                    if(c.Equals('\'')) // End of single-quote mode.

-                    {

-                        state = ParseState.Normal;

-                    }

-                    else

-                    {

-                        arg += c; // Everything else is taken literally.

-                    }

-                    break;

-                }

-                default:

-                {

-                    // Impossible parse state

-                    Debug.Assert(false);

-                    break;

-                }

-            }

-        }

-

-        switch(state)

-        {

-            case ParseState.Normal:

-            {

-                vec.Add(arg);

-                break;

-            }

-            case ParseState.SingleQuote:

-            {

-                throw new BadOptionException("missing closing single quote");

-            }

-            case ParseState.DoubleQuote:

-            {

-                throw new BadOptionException("missing closing double quote");

-            }

-            default:

-            {

-                // Impossible parse state

-                Debug.Assert(false);

-                break;

-            }

-        }

-        return vec;

-    }

-

-    void setOpt(string opt1, string opt2, string val, RepeatType rt)

-    {

-        //

-        // opt1 and opt2 (short and long opt) can't both be empty.

-        //

-        Debug.Assert(!(String.IsNullOrEmpty(opt1) && String.IsNullOrEmpty(opt2)));

-

-        if(rt == RepeatType.NoRepeat)

-        {

-            setNonRepeatingOpt(opt1, val);

-            setNonRepeatingOpt(opt2, val);

-        }

-        else

-        {

-            setRepeatingOpt(opt1, val);

-            setRepeatingOpt(opt2, val);

-        }

-    }

-

-    void setNonRepeatingOpt(string opt, string val)

-    {

-        if(String.IsNullOrEmpty(opt))

-        {

-            return;

-        }

-

-        //

-        // The option must not have been set before or, if it was set, it must have

-        // been because of a default value.

-        //

-        Debug.Assert(!_opts.ContainsKey(opt) || _validOpts[opt].hasDefault);

-

-        OptionValue ovp = new OptionValue();

-        ovp.val = val;

-        _opts[opt] = ovp;

-

-        string synonym = getSynonym(opt);

-        if(!String.IsNullOrEmpty(synonym))

-        {

-            _opts[synonym] = ovp;

-        }

-    }

-

-    void setRepeatingOpt(string opt, string val)

-    {

-        if(String.IsNullOrEmpty(opt))

-        {

-            return;

-        }

-

-        Debug.Assert(_validOpts.ContainsKey(opt));

-        OptionDetails vpos = _validOpts[opt];

-

-        string synonym = getSynonym(opt);

-

-

-        if(_ropts.ContainsKey(opt))

-        {

-            Debug.Assert(_validOpts.ContainsKey(opt));

-            Debug.Assert(_ropts.ContainsKey(opt));

-            Debug.Assert(vpos.repeat == RepeatType.Repeat);

-

-            OptionValueVector pos = _ropts[opt];

-            if(vpos.hasDefault && pos.vals.Count == 1)

-            {

-                pos.vals[0] = val;

-                vpos.hasDefault = false;

-            }

-            else

-            {

-                pos.vals.Add(val);

-            }

-        }

-        else if(_ropts.ContainsKey(synonym))

-        {

-            Debug.Assert(_validOpts.ContainsKey(synonym));

-            Debug.Assert(_validOpts[synonym].repeat == RepeatType.Repeat);

-

-            OptionValueVector spos = _ropts[synonym];

-

-            if(vpos.hasDefault && spos.vals.Count == 1)

-            {

-                spos.vals[0] = val;

-                vpos.hasDefault = false;

-            }

-            else

-            {

-                spos.vals.Add(val);

-            }

-        }

-        else

-        {

-            OptionValueVector ovp = new OptionValueVector();

-            ovp.vals.Add(val);

-            _ropts[opt] = ovp;

-            if(!String.IsNullOrEmpty(synonym))

-            {

-                _ropts[synonym] = ovp;

-            }

-        }

-    }

-

-    OptionDetails checkOpt(string opt, LengthType lt)

-    {

-        if(!_validOpts.ContainsKey(opt))

-        {

-            string err = "invalid option: `-";

-            if(lt == LengthType.LongOpt)

-            {

-                err += '-';

-            }

-            err += opt;

-            err += '\'';

-            throw new BadOptionException(err);

-        }

-        return _validOpts[opt];

-    }

-

-    OptionDetails checkOptIsValid(string opt)

-    {

-        if(!_validOpts.ContainsKey(opt))

-        {

-            string err = "`";

-            err += opt;

-            err += "': invalid option";

-            throw new BadOptionException(err);

-        }

-        return _validOpts[opt];

-    }

-

-    OptionDetails checkOptHasArg(string opt)

-    {

-        OptionDetails pos = checkOptIsValid(opt);

-        if(pos.arg == ArgType.NoArg)

-        {

-            string err = "`-";

-            if(pos.length == LengthType.LongOpt)

-            {

-                err += '-';

-            }

-            err += opt;

-            err += "': option does not take arguments";

-            throw new BadOptionException(err);

-        }

-        return pos;

-    }

-}

-

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Text;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Security.Permissions;
+using System.Runtime.Serialization;
+
+using ValidOpts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionDetails>;
+using Opts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionValue>;
+using ROpts = System.Collections.Generic.Dictionary<string, Ice.VisualStudio.Options.OptionValueVector>;
+using Synonyms = System.Collections.Generic.Dictionary<string, string>;
+
+namespace Ice.VisualStudio
+{
+
+[SerializableAttribute]
+public class BadOptionException : Exception
+{
+    public BadOptionException()
+    {
+        this.reason = "";
+    }
+
+    public BadOptionException(string reason)
+    {
+        this.reason = reason;
+    }
+
+    public string reason
+    {
+        get
+        {
+            return _reason;
+        }
+        set
+        {
+            _reason = value;
+        }
+    }
+
+    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+    public override void GetObjectData(SerializationInfo info, StreamingContext context)
+    {
+        if(info == null)
+        {
+            throw new ArgumentNullException("info");
+        }
+        base.GetObjectData(info, context);
+        info.AddValue("reason", reason);
+    }
+
+    private string _reason;
+}
+
+[SerializableAttribute]
+public class APIException : Exception
+{
+    public APIException()
+    {
+        this.reason = "";
+    }
+
+    public APIException(string reason)
+    {
+        this.reason = reason;
+    }
+
+    public string reason
+    {
+        get
+        {
+            return _reason;
+        }
+        set
+        {
+            _reason = value;
+        }
+    }
+
+    [SecurityPermission(SecurityAction.Demand, SerializationFormatter = true)]
+    public override void GetObjectData(SerializationInfo info, StreamingContext context)
+    {
+        if(info == null)
+        {
+            throw new ArgumentNullException("info");
+        }
+        base.GetObjectData(info, context);
+        info.AddValue("reason", reason);
+    }
+
+    private string _reason;
+}
+
+public class Options
+{
+    public enum LengthType { ShortOpt, LongOpt };
+    public enum RepeatType { Repeat, NoRepeat };
+    public enum ArgType { NeedArg, NoArg };
+    private enum ParseState { Normal, DoubleQuote, SingleQuote };
+    private bool parseCalled = false;
+
+    public struct OptionDetails
+    {
+        public LengthType length;
+        public ArgType arg;
+        public RepeatType repeat;
+        public bool hasDefault;
+    }
+
+    public struct OptionValue
+    {
+        public string val;
+    }
+
+    public struct OptionValueVector
+    {
+        public List<string> vals;
+    }
+
+    ValidOpts _validOpts = new ValidOpts(); // Valid options and their details.
+    Opts _opts = new Opts(); // Value of non-repeating options.
+    ROpts _ropts = new ROpts(); // Value of repeating options.
+    Synonyms _synonyms = new Synonyms(); // Map from short to long option and vice versa.
+
+    public void addOpt(string shortOpt)
+    {
+        addOpt(shortOpt, "", ArgType.NoArg, "", RepeatType.NoRepeat);
+    }
+
+    public void addOpt(string shortOpt, string longOpt)
+    {
+        addOpt(shortOpt, longOpt, ArgType.NoArg, "", RepeatType.NoRepeat);
+    }
+
+    public void addOpt(string shortOpt, string longOpt, ArgType at)
+    {
+        addOpt(shortOpt, longOpt, at, "", RepeatType.NoRepeat);
+    }
+
+    public void addOpt(string shortOpt, string longOpt, ArgType at, string dflt)
+    {
+        addOpt(shortOpt, longOpt, at, dflt, RepeatType.NoRepeat);
+    }
+
+    public void addOpt(string shortOpt, string longOpt, ArgType at, string dflt, RepeatType rt)
+    {
+        checkArgs(shortOpt, longOpt, at == ArgType.NeedArg, dflt);
+        addValidOpt(shortOpt, longOpt, at, dflt, rt);
+    }
+
+    public List<string> parse(List<string> args)
+    {
+        if(parseCalled)
+        {
+            throw new APIException("cannot call parse() more than once on the same Option instance");
+        }
+        parseCalled = true;
+
+        List<string> seenNonRepeatableOpts = new List<string>(); // To catch repeated non-repeatable options.
+
+        List<string> result = new List<string>();
+
+        int i;
+        for(i = 0; i < args.Count; ++i)
+        {
+            if(args[i] == "-" || args[i] == "--")
+            {
+                ++i;
+                break; // "-" and "--" indicate end of options.
+            }
+
+            string opt = null;
+            OptionDetails pos = new OptionDetails();
+            pos.repeat = RepeatType.NoRepeat;
+            pos.length = LengthType.ShortOpt;
+            pos.hasDefault = false;
+            pos.arg = ArgType.NoArg;
+
+            bool argDone = false;
+
+            if(args[i].StartsWith("--", StringComparison.Ordinal))
+            {
+                //
+                // Long option. If the option has an argument, it can either be separated by '='
+                // or appear as a separate argument. For example, "--name value" is the same
+                // as "--name=value".
+                //
+                int p = args[i].IndexOf('=', 2);
+                if(p >= 0)
+                {
+                    opt = args[i].Substring(2, p - 2);
+                }
+                else
+                {
+                    opt = args[i].Substring(2);
+                }
+
+                pos = checkOpt(opt, LengthType.LongOpt);
+
+                if(pos.repeat == RepeatType.NoRepeat)
+                {
+                    if(seenNonRepeatableOpts.Contains(opt))
+                    {
+                        string err = "`--";
+                        err += opt + ":' option cannot be repeated";
+                        throw new BadOptionException(err);
+                    }
+                    seenNonRepeatableOpts.Add(opt);
+                    string synonym = getSynonym(opt);
+                    if(!String.IsNullOrEmpty(synonym))
+                    {
+                        seenNonRepeatableOpts.Add(synonym);
+                    }
+                }
+
+                if(p >= 0)
+                {
+                    if(pos.arg == ArgType.NoArg && p != args[i].Length - 1)
+                    {
+                        string err = "`";
+                        err += args[i];
+                        err += "': option does not take an argument";
+                        throw new BadOptionException(err);
+                    }
+                    setOpt(opt, "", args[i].Substring(p + 1), pos.repeat);
+                    argDone = true;
+                }
+            }
+            else if(!String.IsNullOrEmpty(args[i]) && args[i][0] == '-')
+            {
+                //
+                // Short option.
+                //
+                for(int p = 1; p < args[i].Length; ++p)
+                {
+                    opt = "";
+                    opt += args[i][p];
+                    pos = checkOpt(opt, LengthType.ShortOpt);
+
+                    if(pos.repeat == RepeatType.NoRepeat)
+                    {
+                        if(seenNonRepeatableOpts.Contains(opt))
+                        {
+                            string err = "`-";
+                            err += opt + ":' option cannot be repeated";
+                            throw new BadOptionException(err);
+                        }
+                        seenNonRepeatableOpts.Add(opt);
+                        string synonym = getSynonym(opt);
+                        if(!String.IsNullOrEmpty(synonym))
+                        {
+                            seenNonRepeatableOpts.Add(synonym);
+                        }
+                    }
+
+                    if(pos.arg == ArgType.NeedArg && p != args[i].Length - 1)
+                    {
+                        string optArg = args[i].Substring(p + 1);
+                        setOpt(opt, "", optArg, pos.repeat);
+                        argDone = true;
+                        break;
+                    }
+                }
+            }
+            else
+            {
+                //
+                // Not an option or option argument.
+                //
+                result.Add(args[i]);
+                argDone = true;
+            }
+
+            if(!argDone)
+            {
+                if(pos.arg == ArgType.NeedArg) // Need an argument that is separated by whitespace.
+                {
+                    if(i == args.Count - 1)
+                    {
+                        string err = "`-";
+                        if(opt.Length != 1)
+                        {
+                            err += "-";
+                        }
+                        err += opt;
+                        err += "' option requires an argument";
+                        throw new BadOptionException(err);
+                    }
+                    setOpt(opt, "", args[++i], pos.repeat);
+                }
+                else
+                {
+                    setOpt(opt, "", "1", pos.repeat);
+                }
+            }
+        }
+
+        _synonyms.Clear(); // Don't need the contents anymore.
+
+        while(i < args.Count)
+        {
+            result.Add(args[i++]);
+        }
+
+        return result;
+    }
+
+    public bool isSet(string opt)
+    {
+        if(!parseCalled)
+        {
+            throw new APIException("cannot lookup options before calling parse()");
+        }
+
+        OptionDetails pos = checkOptIsValid(opt);
+        return pos.repeat == RepeatType.NoRepeat ? _opts.ContainsKey(opt) : _ropts.ContainsKey(opt);
+    }
+
+    public string optArg(string opt)
+    {
+        if(!parseCalled)
+        {
+            throw new APIException("cannot lookup options before calling parse()");
+        }
+
+        OptionDetails pos = checkOptHasArg(opt);
+
+        if(pos.repeat == RepeatType.Repeat)
+        {
+            string err = "`-";
+            if(pos.length ==  LengthType.LongOpt)
+            {
+                err += '-';
+            }
+            err += opt;
+            err += "': is a repeating option -- use argVec() to get its arguments";
+            throw new BadOptionException(err);
+        }
+
+        if(!_opts.ContainsKey(opt))
+        {
+            return "";
+        }
+        return _opts[opt].val;
+    }
+    
+    public List<string> argVec(string opt)
+    {
+        if(!parseCalled)
+        {
+            throw new APIException("cannot lookup options before calling parse()");
+        }
+
+        OptionDetails pos = checkOptHasArg(opt);
+
+        if(pos.repeat == RepeatType.NoRepeat)
+        {
+            string err = "`-";
+            if(pos.length == LengthType.LongOpt)
+            {
+                err += '-';
+            }
+            err += opt + "': is a non-repeating option -- use optArg() to get its argument";
+            throw new BadOptionException(err);
+        }
+
+        if(!_ropts.ContainsKey(opt))
+        {
+            return new List<string>();
+        }
+        return _ropts[opt].vals;
+    }
+
+    private void
+    addValidOpt(string shortOpt, string longOpt, ArgType at, string dflt, RepeatType rt)
+    {
+        if(shortOpt.Length > 0 && _validOpts.ContainsKey(shortOpt))
+        {
+            string err = "`";
+            err += shortOpt;
+            err += "': duplicate option";
+            throw new BadOptionException(err);
+        }
+        if(longOpt.Length > 0 && _validOpts.ContainsKey(longOpt))
+        {
+            string err = "`";
+            err += longOpt;
+            err += "': duplicate option";
+            throw new BadOptionException(err);
+        }
+
+        OptionDetails odp = new OptionDetails();
+        odp.arg = at;
+        odp.repeat = rt;
+        odp.hasDefault = dflt.Length > 0;
+
+        if(shortOpt.Length > 0)
+        {
+            odp.length = LengthType.ShortOpt;
+            _validOpts[shortOpt] = odp;
+        }
+        if(longOpt.Length > 0)
+        {
+            odp.length = LengthType.LongOpt;
+            _validOpts[longOpt] = odp;
+        }
+
+        updateSynonyms(shortOpt, longOpt);
+
+        if(at == ArgType.NeedArg && dflt.Length > 0)
+        {
+            setOpt(shortOpt, longOpt, dflt, rt);
+        }
+    }
+
+    void
+    updateSynonyms(string shortOpt, string longOpt)
+    {
+        if(shortOpt.Length > 0 && longOpt.Length > 0)
+        {
+            _synonyms[shortOpt] = longOpt;
+            _synonyms[longOpt] = shortOpt;
+        }
+    }
+
+    string
+    getSynonym(string optName)
+    {
+        return _synonyms.ContainsKey(optName) ? _synonyms[optName] : "";
+    }
+
+    private static void
+    checkArgs(string shortOpt, string longOpt, bool needArg, string dflt)
+    {
+        if(shortOpt.Length == 0 && longOpt.Length == 0)
+        {
+            throw new BadOptionException("short and long option cannot both be empty");
+        }
+
+        if(shortOpt.Length > 0)
+        {
+            if(shortOpt.Length != 1)
+            {
+                string err = "`";
+                err += shortOpt;
+                err += "': a short option cannot specify more than one option";
+                throw new BadOptionException(err);
+            }
+            if(" \t\n\r\f\v".IndexOf(shortOpt, StringComparison.Ordinal) >= 0)
+            {
+                string err = "`";
+                err += shortOpt;
+                err += "': a short option cannot be whitespace";
+                throw new BadOptionException(err);
+            }
+            if(!String.IsNullOrEmpty(shortOpt) && shortOpt[0].Equals('-'))
+            {
+                string err = "`";
+                err += shortOpt;
+                err += "': a short option cannot be `-'";
+                throw new BadOptionException(err);
+            }
+        }
+
+        if(longOpt.Length > 0)
+        {
+            if(" \t\n\r\f\v".IndexOf(longOpt, StringComparison.Ordinal) >= 0)
+            {
+                string err = "`";
+                err += shortOpt;
+                err += "': a long option cannot be whitespace";
+                throw new BadOptionException(err);
+            }
+            if(!String.IsNullOrEmpty(shortOpt) && shortOpt[0].Equals('-'))
+            {
+                string err = "`";
+                err += shortOpt;
+                err += "': a long option cannot be `-'";
+                throw new BadOptionException(err);
+            }
+        }
+
+        if(!needArg && dflt.Length > 0)
+        {
+            throw new BadOptionException("a default value can be specified only for options requiring an argument");
+        }
+    }
+
+    //
+    // Split a command line into argv-style arguments, applying
+    // bash quoting rules. The return value is the arguments
+    // in the command line, with all shell escapes applied, and
+    // quotes removed.
+    //
+    static public List<string> split(string line)
+    {
+        const string IFS = " \t\n"; // Internal Field Separator.
+        if(String.IsNullOrEmpty(line))
+        {
+            return new List<string>();
+        }
+        String l = line.Trim(' ').Trim('\t').Trim('\n');
+
+        if(String.IsNullOrEmpty(l))
+        {
+            return new List<string>();
+        }
+
+        List<string> vec = new List<string>();
+
+        
+        ParseState state = ParseState.Normal;
+
+        string arg = null;
+
+        for(int i = 0; i < l.Length; ++i)
+        {
+            char c = l[i];
+            switch(state)
+            {
+                case ParseState.Normal:
+                {
+                    switch(c)
+                    {
+                        case '\\':
+                        {
+                            //
+                            // Ignore a backslash at the end of the string,
+                            // and strip backslash-newline pairs. If a
+                            // backslash is followed by a space, single quote,
+                            // double quote, or dollar sign, we drop the backslash
+                            // and write the space, single quote, double quote,
+                            // or dollar sign. This is necessary to allow quotes
+                            // to be escaped. Dropping the backslash preceding a
+                            // space deviates from bash quoting rules, but is
+                            // necessary so we don't drop backslashes from Windows
+                            // path names.)
+                            //
+                            if(i < l.Length - 1 && l[++i] != '\n')
+                            {
+                                switch(l[i])
+                                {
+                                    case ' ':
+                                    case '$':
+                                    case '\'':
+                                    case '"':
+                                    {
+                                        arg += l[i];
+                                        break;
+                                    }
+                                    default:
+                                    {
+                                        arg += '\\';
+                                        arg += l[i];
+                                        break;
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                        case '\'':
+                        {
+                            state = ParseState.SingleQuote;
+                            break;
+                        }
+                        case '"':
+                        {
+                            state = ParseState.DoubleQuote;
+                            break;
+                        }
+                        default:
+                        {
+                            if(IFS.IndexOf(l[i]) >= 0)
+                            {
+                                vec.Add(arg);
+                                arg = "";
+
+                                //
+                                // Move to start of next argument.
+                                //
+                                while(++i < l.Length && IFS.IndexOf(l[i]) >= 0)
+                                {
+                                    ;
+                                }
+                                --i;
+                            }
+                            else
+                            {
+                                arg += l[i];
+                            }
+                            break;
+                        }
+                    }
+                    break;
+                }
+                case ParseState.DoubleQuote:
+                {
+                    //
+                    // Within double quotes, only backslash retains its special
+                    // meaning, and only if followed by double quote, backslash,
+                    // or newline. If not followed by one of these characters,
+                    // both the backslash and the character are preserved.
+                    //
+                    if(c.Equals('\\') && i < l.Length - 1)
+                    {
+                        switch(c = l[++i])
+                        {
+                            case '"':
+                            case '\\':
+                            case '\n':
+                            {
+                                arg += c;
+                                break;
+                            }
+                            default:
+                            {
+                                arg += '\\';
+                                arg += c;
+                                break;
+                            }
+                        }
+                    }
+                    else if(c.Equals('"')) // End of double-quote mode.
+                    {
+                        state = ParseState.Normal;
+                    }
+                    else
+                    {
+                        arg += c; // Everything else is taken literally.
+                    }
+                    break;
+                }
+                case ParseState.SingleQuote:
+                {
+                    if(c.Equals('\'')) // End of single-quote mode.
+                    {
+                        state = ParseState.Normal;
+                    }
+                    else
+                    {
+                        arg += c; // Everything else is taken literally.
+                    }
+                    break;
+                }
+                default:
+                {
+                    // Impossible parse state
+                    Debug.Assert(false);
+                    break;
+                }
+            }
+        }
+
+        switch(state)
+        {
+            case ParseState.Normal:
+            {
+                vec.Add(arg);
+                break;
+            }
+            case ParseState.SingleQuote:
+            {
+                throw new BadOptionException("missing closing single quote");
+            }
+            case ParseState.DoubleQuote:
+            {
+                throw new BadOptionException("missing closing double quote");
+            }
+            default:
+            {
+                // Impossible parse state
+                Debug.Assert(false);
+                break;
+            }
+        }
+        return vec;
+    }
+
+    void setOpt(string opt1, string opt2, string val, RepeatType rt)
+    {
+        //
+        // opt1 and opt2 (short and long opt) can't both be empty.
+        //
+        Debug.Assert(!(String.IsNullOrEmpty(opt1) && String.IsNullOrEmpty(opt2)));
+
+        if(rt == RepeatType.NoRepeat)
+        {
+            setNonRepeatingOpt(opt1, val);
+            setNonRepeatingOpt(opt2, val);
+        }
+        else
+        {
+            setRepeatingOpt(opt1, val);
+            setRepeatingOpt(opt2, val);
+        }
+    }
+
+    void setNonRepeatingOpt(string opt, string val)
+    {
+        if(String.IsNullOrEmpty(opt))
+        {
+            return;
+        }
+
+        //
+        // The option must not have been set before or, if it was set, it must have
+        // been because of a default value.
+        //
+        Debug.Assert(!_opts.ContainsKey(opt) || _validOpts[opt].hasDefault);
+
+        OptionValue ovp = new OptionValue();
+        ovp.val = val;
+        _opts[opt] = ovp;
+
+        string synonym = getSynonym(opt);
+        if(!String.IsNullOrEmpty(synonym))
+        {
+            _opts[synonym] = ovp;
+        }
+    }
+
+    void setRepeatingOpt(string opt, string val)
+    {
+        if(String.IsNullOrEmpty(opt))
+        {
+            return;
+        }
+
+        Debug.Assert(_validOpts.ContainsKey(opt));
+        OptionDetails vpos = _validOpts[opt];
+
+        string synonym = getSynonym(opt);
+
+
+        if(_ropts.ContainsKey(opt))
+        {
+            Debug.Assert(_validOpts.ContainsKey(opt));
+            Debug.Assert(_ropts.ContainsKey(opt));
+            Debug.Assert(vpos.repeat == RepeatType.Repeat);
+
+            OptionValueVector pos = _ropts[opt];
+            if(vpos.hasDefault && pos.vals.Count == 1)
+            {
+                pos.vals[0] = val;
+                vpos.hasDefault = false;
+            }
+            else
+            {
+                pos.vals.Add(val);
+            }
+        }
+        else if(_ropts.ContainsKey(synonym))
+        {
+            Debug.Assert(_validOpts.ContainsKey(synonym));
+            Debug.Assert(_validOpts[synonym].repeat == RepeatType.Repeat);
+
+            OptionValueVector spos = _ropts[synonym];
+
+            if(vpos.hasDefault && spos.vals.Count == 1)
+            {
+                spos.vals[0] = val;
+                vpos.hasDefault = false;
+            }
+            else
+            {
+                spos.vals.Add(val);
+            }
+        }
+        else
+        {
+            OptionValueVector ovp = new OptionValueVector();
+            ovp.vals.Add(val);
+            _ropts[opt] = ovp;
+            if(!String.IsNullOrEmpty(synonym))
+            {
+                _ropts[synonym] = ovp;
+            }
+        }
+    }
+
+    OptionDetails checkOpt(string opt, LengthType lt)
+    {
+        if(!_validOpts.ContainsKey(opt))
+        {
+            string err = "invalid option: `-";
+            if(lt == LengthType.LongOpt)
+            {
+                err += '-';
+            }
+            err += opt;
+            err += '\'';
+            throw new BadOptionException(err);
+        }
+        return _validOpts[opt];
+    }
+
+    OptionDetails checkOptIsValid(string opt)
+    {
+        if(!_validOpts.ContainsKey(opt))
+        {
+            string err = "`";
+            err += opt;
+            err += "': invalid option";
+            throw new BadOptionException(err);
+        }
+        return _validOpts[opt];
+    }
+
+    OptionDetails checkOptHasArg(string opt)
+    {
+        OptionDetails pos = checkOptIsValid(opt);
+        if(pos.arg == ArgType.NoArg)
+        {
+            string err = "`-";
+            if(pos.length == LengthType.LongOpt)
+            {
+                err += '-';
+            }
+            err += opt;
+            err += "': option does not take arguments";
+            throw new BadOptionException(err);
+        }
+        return pos;
+    }
+}
+
 }
\ No newline at end of file
diff --git a/vsaddin/src/OutputDirView.Designer.cs b/vsaddin/src/OutputDirView.Designer.cs
index 8bbbd4006cf..3f5d0694596 100644
--- a/vsaddin/src/OutputDirView.Designer.cs
+++ b/vsaddin/src/OutputDirView.Designer.cs
@@ -1,100 +1,100 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-namespace Ice.VisualStudio

-{

-    partial class OutputDirView

-    {

-        /// <summary> 

-        /// Required designer variable.

-        /// </summary>

-        private System.ComponentModel.IContainer components = null;

-

-        /// <summary> 

-        /// Clean up any resources being used.

-        /// </summary>

-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>

-        protected override void Dispose(bool disposing)

-        {

-            if(disposing && (components != null))

-            {

-                components.Dispose();

-            }

-            base.Dispose(disposing);

-        }

-

-        #region Component Designer generated code

-

-        /// <summary> 

-        /// Required method for Designer support - do not modify 

-        /// the contents of this method with the code editor.

-        /// </summary>

-        private void InitializeComponent()

-        {

-            this.components = new System.ComponentModel.Container();

-            this.groupOutputDir = new System.Windows.Forms.GroupBox();

-            this.txtOutputDir = new System.Windows.Forms.TextBox();

-            this.btnSelectOutputDir = new System.Windows.Forms.Button();

-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);

-            this.groupOutputDir.SuspendLayout();

-            this.SuspendLayout();

-            // 

-            // groupOutputDir

-            // 

-            this.groupOutputDir.Controls.Add(this.txtOutputDir);

-            this.groupOutputDir.Controls.Add(this.btnSelectOutputDir);

-            this.groupOutputDir.Location = new System.Drawing.Point(6, 4);

-            this.groupOutputDir.Name = "groupOutputDir";

-            this.groupOutputDir.Size = new System.Drawing.Size(487, 45);

-            this.groupOutputDir.TabIndex = 0;

-            this.groupOutputDir.TabStop = false;

-            this.groupOutputDir.Text = "Output Dir";

-            // 

-            // txtOutputDir

-            // 

-            this.txtOutputDir.Location = new System.Drawing.Point(6, 16);

-            this.txtOutputDir.Name = "txtOutputDir";

-            this.txtOutputDir.Size = new System.Drawing.Size(394, 20);

-            this.txtOutputDir.TabIndex = 1;

-            this.txtOutputDir.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtOutputDir_KeyUp);

-            this.txtOutputDir.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtOutputDir_KeyPress);

-            this.txtOutputDir.Enter += new System.EventHandler(this.txtOutputDir_Focus);

-            this.txtOutputDir.LostFocus += new System.EventHandler(this.txtOutputDir_LostFocus);

-            // 

-            // btnSelectOutputDir

-            // 

-            this.btnSelectOutputDir.Location = new System.Drawing.Point(406, 16);

-            this.btnSelectOutputDir.Name = "btnSelectOutputDir";

-            this.btnSelectOutputDir.Size = new System.Drawing.Size(75, 23);

-            this.btnSelectOutputDir.TabIndex = 0;

-            this.btnSelectOutputDir.Text = "...";

-            this.btnSelectOutputDir.UseVisualStyleBackColor = true;

-            this.btnSelectOutputDir.Click += new System.EventHandler(this.btnSelectOutputDir_Click);

-            // 

-            // OutputDirView

-            // 

-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;

-            this.Controls.Add(this.groupOutputDir);

-            this.Name = "OutputDirView";

-            this.Size = new System.Drawing.Size(498, 52);

-            this.groupOutputDir.ResumeLayout(false);

-            this.groupOutputDir.PerformLayout();

-            this.ResumeLayout(false);

-

-        }

-

-        #endregion

-

-        private System.Windows.Forms.GroupBox groupOutputDir;

-        private System.Windows.Forms.TextBox txtOutputDir;

-        private System.Windows.Forms.Button btnSelectOutputDir;

-        private System.Windows.Forms.ToolTip toolTip;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+namespace Ice.VisualStudio
+{
+    partial class OutputDirView
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if(disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.components = new System.ComponentModel.Container();
+            this.groupOutputDir = new System.Windows.Forms.GroupBox();
+            this.txtOutputDir = new System.Windows.Forms.TextBox();
+            this.btnSelectOutputDir = new System.Windows.Forms.Button();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.groupOutputDir.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupOutputDir
+            // 
+            this.groupOutputDir.Controls.Add(this.txtOutputDir);
+            this.groupOutputDir.Controls.Add(this.btnSelectOutputDir);
+            this.groupOutputDir.Location = new System.Drawing.Point(6, 4);
+            this.groupOutputDir.Name = "groupOutputDir";
+            this.groupOutputDir.Size = new System.Drawing.Size(487, 45);
+            this.groupOutputDir.TabIndex = 0;
+            this.groupOutputDir.TabStop = false;
+            this.groupOutputDir.Text = "Output Dir";
+            // 
+            // txtOutputDir
+            // 
+            this.txtOutputDir.Location = new System.Drawing.Point(6, 16);
+            this.txtOutputDir.Name = "txtOutputDir";
+            this.txtOutputDir.Size = new System.Drawing.Size(394, 20);
+            this.txtOutputDir.TabIndex = 1;
+            this.txtOutputDir.KeyUp += new System.Windows.Forms.KeyEventHandler(this.txtOutputDir_KeyUp);
+            this.txtOutputDir.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtOutputDir_KeyPress);
+            this.txtOutputDir.Enter += new System.EventHandler(this.txtOutputDir_Focus);
+            this.txtOutputDir.LostFocus += new System.EventHandler(this.txtOutputDir_LostFocus);
+            // 
+            // btnSelectOutputDir
+            // 
+            this.btnSelectOutputDir.Location = new System.Drawing.Point(406, 16);
+            this.btnSelectOutputDir.Name = "btnSelectOutputDir";
+            this.btnSelectOutputDir.Size = new System.Drawing.Size(75, 23);
+            this.btnSelectOutputDir.TabIndex = 0;
+            this.btnSelectOutputDir.Text = "...";
+            this.btnSelectOutputDir.UseVisualStyleBackColor = true;
+            this.btnSelectOutputDir.Click += new System.EventHandler(this.btnSelectOutputDir_Click);
+            // 
+            // OutputDirView
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupOutputDir);
+            this.Name = "OutputDirView";
+            this.Size = new System.Drawing.Size(498, 52);
+            this.groupOutputDir.ResumeLayout(false);
+            this.groupOutputDir.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupOutputDir;
+        private System.Windows.Forms.TextBox txtOutputDir;
+        private System.Windows.Forms.Button btnSelectOutputDir;
+        private System.Windows.Forms.ToolTip toolTip;
+    }
+}
diff --git a/vsaddin/src/OutputDirView.cs b/vsaddin/src/OutputDirView.cs
index 5b6b6981025..6b1fcf836b1 100644
--- a/vsaddin/src/OutputDirView.cs
+++ b/vsaddin/src/OutputDirView.cs
@@ -1,142 +1,142 @@
-// **********************************************************************

-//

-// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.

-//

-// This copy of Ice is licensed to you under the terms described in the

-// ICE_LICENSE file included in this distribution.

-//

-// **********************************************************************

-

-using System;

-using System.Collections.Generic;

-using System.ComponentModel;

-using System.Drawing;

-using System.Data;

-using System.Text;

-using System.IO;

-using System.Windows.Forms;

-using EnvDTE;

-

-namespace Ice.VisualStudio

-{

-    public partial class OutputDirView : UserControl

-    {

-        public OutputDirView()

-        {

-            InitializeComponent();

-            toolTip.SetToolTip(txtOutputDir, "Output directory for Slice compiler generated files.");

-            toolTip.SetToolTip(btnSelectOutputDir, "Output directory for Slice compiler generated files.");

-        }

-

-        public void init(IceConfigurationDialog dialog, Project project)

-        {

-            this._dialog = dialog;

-            this._project = project;

-        }

-

-        public void load()

-        {

-            txtOutputDir.Text = Util.getProjectOutputDirRaw(_project);

-        }

-

-        public void setEnabled(bool enabled)

-        {

-            txtOutputDir.Enabled = enabled;

-            btnSelectOutputDir.Enabled = enabled;

-        }

-

-        public bool apply(ref bool changed)

-        {

-            changed = false;

-            if(hasUnsavedChanges())

-            {

-                if(!Util.updateOutputDir(_project, txtOutputDir.Text))

-                {

-                    return false;

-                }

-                changed = true;

-            }

-            return true;

-        }

-

-        public bool hasUnsavedChanges()

-        {

-            if(!txtOutputDir.Text.Trim().Equals(Util.getProjectOutputDirRaw(_project)))

-            {

-                return true;

-            }

-            return false;

-        }

-

-        private void btnSelectOutputDir_Click(object sender, EventArgs e)

-        {

-            if(_dialog.editingIncludeDir())

-            {

-                _dialog.endEditIncludeDir(true);

-            }

-

-            FolderBrowserDialog dialog = new FolderBrowserDialog();

-            dialog.SelectedPath = Util.getProjectAbsoluteOutputDir(_project);

-            dialog.Description = "Select Base Directory For Slice Generated Files";

-            DialogResult result = dialog.ShowDialog();

-            if(result == DialogResult.OK)

-            {

-                txtOutputDir.Text = Util.relativePath(_project, dialog.SelectedPath);

-                _dialog.needSave();

-            }

-        }

-

-        private void txtOutputDir_KeyPress(object sender, KeyPressEventArgs e)

-        {

-            _editing = true;

-            if(e.KeyChar == (char)Keys.Return)

-            {

-                checkOutputDir();

-                e.Handled = true;

-            }

-        }

-

-        private void txtOutputDir_KeyUp(object sender, KeyEventArgs e)

-        {

-            _editing = true;

-            if(e.KeyCode != Keys.Return)

-            {

-                _dialog.needSave();

-            }

-        }

-

-        private void txtOutputDir_Focus(object sender, EventArgs e)

-        {

-            if(_dialog.editingIncludeDir())

-            {

-                _dialog.endEditIncludeDir(true);

-            }

-            _editing = true;

-        }

-

-        private void txtOutputDir_LostFocus(object sender, EventArgs e)

-        {

-            if(_editing)

-            {

-                checkOutputDir();

-            }

-        }

-

-        private bool checkOutputDir()

-        {

-            //

-            // Set to false so the loss of focus does not cause another call

-            //

-            _editing = false;

-            if(hasUnsavedChanges())

-            {

-                _dialog.needSave();

-            }

-            return true;

-        }

-

-        private IceConfigurationDialog _dialog;

-        private Project _project;

-        private bool _editing = false;

-    }

-}

+// **********************************************************************
+//
+// Copyright (c) 2003-2011 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Text;
+using System.IO;
+using System.Windows.Forms;
+using EnvDTE;
+
+namespace Ice.VisualStudio
+{
+    public partial class OutputDirView : UserControl
+    {
+        public OutputDirView()
+        {
+            InitializeComponent();
+            toolTip.SetToolTip(txtOutputDir, "Output directory for Slice compiler generated files.");
+            toolTip.SetToolTip(btnSelectOutputDir, "Output directory for Slice compiler generated files.");
+        }
+
+        public void init(IceConfigurationDialog dialog, Project project)
+        {
+            this._dialog = dialog;
+            this._project = project;
+        }
+
+        public void load()
+        {
+            txtOutputDir.Text = Util.getProjectOutputDirRaw(_project);
+        }
+
+        public void setEnabled(bool enabled)
+        {
+            txtOutputDir.Enabled = enabled;
+            btnSelectOutputDir.Enabled = enabled;
+        }
+
+        public bool apply(ref bool changed)
+        {
+            changed = false;
+            if(hasUnsavedChanges())
+            {
+                if(!Util.updateOutputDir(_project, txtOutputDir.Text))
+                {
+                    return false;
+                }
+                changed = true;
+            }
+            return true;
+        }
+
+        public bool hasUnsavedChanges()
+        {
+            if(!txtOutputDir.Text.Trim().Equals(Util.getProjectOutputDirRaw(_project)))
+            {
+                return true;
+            }
+            return false;
+        }
+
+        private void btnSelectOutputDir_Click(object sender, EventArgs e)
+        {
+            if(_dialog.editingIncludeDir())
+            {
+                _dialog.endEditIncludeDir(true);
+            }
+
+            FolderBrowserDialog dialog = new FolderBrowserDialog();
+            dialog.SelectedPath = Util.getProjectAbsoluteOutputDir(_project);
+            dialog.Description = "Select Base Directory For Slice Generated Files";
+            DialogResult result = dialog.ShowDialog();
+            if(result == DialogResult.OK)
+            {
+                txtOutputDir.Text = Util.relativePath(_project, dialog.SelectedPath);
+                _dialog.needSave();
+            }
+        }
+
+        private void txtOutputDir_KeyPress(object sender, KeyPressEventArgs e)
+        {
+            _editing = true;
+            if(e.KeyChar == (char)Keys.Return)
+            {
+                checkOutputDir();
+                e.Handled = true;
+            }
+        }
+
+        private void txtOutputDir_KeyUp(object sender, KeyEventArgs e)
+        {
+            _editing = true;
+            if(e.KeyCode != Keys.Return)
+            {
+                _dialog.needSave();
+            }
+        }
+
+        private void txtOutputDir_Focus(object sender, EventArgs e)
+        {
+            if(_dialog.editingIncludeDir())
+            {
+                _dialog.endEditIncludeDir(true);
+            }
+            _editing = true;
+        }
+
+        private void txtOutputDir_LostFocus(object sender, EventArgs e)
+        {
+            if(_editing)
+            {
+                checkOutputDir();
+            }
+        }
+
+        private bool checkOutputDir()
+        {
+            //
+            // Set to false so the loss of focus does not cause another call
+            //
+            _editing = false;
+            if(hasUnsavedChanges())
+            {
+                _dialog.needSave();
+            }
+            return true;
+        }
+
+        private IceConfigurationDialog _dialog;
+        private Project _project;
+        private bool _editing = false;
+    }
+}
diff --git a/vsaddin/src/Util.cs b/vsaddin/src/Util.cs
index 274a9bbd8e3..723e449f8c8 100644
--- a/vsaddin/src/Util.cs
+++ b/vsaddin/src/Util.cs
@@ -2353,15 +2353,15 @@ namespace Ice.VisualStudio
             {
                 string iceHome = getIceHome();
                 string binDir = getCsBinDir(project);
-                ComponentList components = Util.getIceDotNetComponents(project);

-                String version = Builder.getSliceCompilerVersion(project, Util.slice2cs);

-

-                string[] tokens = version.Split('.');

-                //

-                // Add patch version 0 if there isn't one

-                //

-                if(tokens.Length == 3)

-                {

+                ComponentList components = Util.getIceDotNetComponents(project);
+                String version = Builder.getSliceCompilerVersion(project, Util.slice2cs);
+
+                string[] tokens = version.Split('.');
+                //
+                // Add patch version 0 if there isn't one
+                //
+                if(tokens.Length == 3)
+                {
                     version += ".0";
                 }