VS Add-in 3.4.1.2 bug fixes:

    4956 - Vs Add-in Util.fix must check that Globals isn't null
    4953 - Vs Add-in getIceHome side effects
    4674 - Consider to Add output-dir support to vsplugin
    4820 - The add-in does not support parallel builds.
    4630 - Allow using DEVPATH with projects
    4968 - VS Add-in doesn't work with header-ext/source-ext
    4942 - Visual Studio plug-in hangs with lots of syntax errors
    4808 - Saving slice file during build crashes Studio
    4964 - Util equalPath implementation is incorrect
    4918 - Remove Slice builder from vsextension solution
    4806 - Ice generated files not always opened read-only as expected
    4442 - FxCop vs plugin COM visible
    4915 - Issue with command line builds on machine with VS2008 & VS2010
    4761 - Converted demo projects do not build (edit)
    4119 - Reduce code duplication
    4844 - Add cancel button to configuration dialog
    4826 - Add timestamp to slice output

1 files changed, 422 insertions, 0 deletions

diff --git a/vsaddin/src/IceCppConfigurationDialog.Designer.cs b/vsaddin/src/IceCppConfigurationDialog.Designer.cs
new file mode 100644
index 00000000000..61c6c6a3182
--- /dev/null
+++ b/vsaddin/src/IceCppConfigurationDialog.Designer.cs
@@ -0,0 +1,422 @@
+// **********************************************************************
+//
+// 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 IceCppConfigurationDialog
+    {
+        /// <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 Windows Form 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.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.iceHomeView = new Ice.VisualStudio.IceHomeView();
+            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(11, 481);
+            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, 80);
+            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, 134);
+            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(423, 550);
+            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(11, 436);
+            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(262, 550);
+            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(342, 550);
+            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, 82);
+            this.outputDirView.Name = "outputDirView";
+            this.outputDirView.Size = new System.Drawing.Size(498, 52);
+            this.outputDirView.TabIndex = 31;
+            // 
+            // iceHomeView
+            // 
+            this.iceHomeView.Location = new System.Drawing.Point(5, 34);
+            this.iceHomeView.Name = "iceHomeView";
+            this.iceHomeView.Size = new System.Drawing.Size(498, 48);
+            this.iceHomeView.TabIndex = 30;
+            // 
+            // includePathView
+            // 
+            this.includePathView.Location = new System.Drawing.Point(8, 259);
+            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(5, 182);
+            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, 583);
+            this.Controls.Add(this.outputDirView);
+            this.Controls.Add(this.iceHomeView);
+            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
+
+        private System.Windows.Forms.CheckBox chkEnableBuilder;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.CheckBox chkIceStorm;
+        private System.Windows.Forms.CheckBox chkIceSSL;
+        private System.Windows.Forms.CheckBox chkIcePatch2;
+        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.GroupBox groupBox4;
+        private System.Windows.Forms.CheckBox chkIcePrefix;
+        private System.Windows.Forms.CheckBox chkStreaming;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.CheckBox chkFreeze;
+        private System.Windows.Forms.CheckBox chkIceUtil;
+        private System.Windows.Forms.GroupBox grouDllExportSymbol;
+        private System.Windows.Forms.TextBox txtDllExportSymbol;
+        private System.Windows.Forms.CheckBox chkChecksum;
+        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 IncludePathView includePathView;
+        private IceHomeView iceHomeView;
+        private OutputDirView outputDirView;
+        private ExtraCompilerOptionsView extraCompilerOptions;
+    }
+}