diff --git a/.gitignore b/.gitignore index 6607921..8b669d8 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,8 @@ build/ bld/ [Bb]in/ [Oo]bj/ +.vs/ +.idea/ # MSTest test Results [Tt]est[Rr]esult*/ diff --git a/Driver Code/ConnectionDialog.Designer.cs b/Driver Code/ConnectionDialog.Designer.cs index 386954d..2246521 100644 --- a/Driver Code/ConnectionDialog.Designer.cs +++ b/Driver Code/ConnectionDialog.Designer.cs @@ -28,327 +28,369 @@ protected override void Dispose(bool disposing) /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this._browseASpecAssemblyButton = new System.Windows.Forms.Button(); - this._browseAGenAssemblyButton = new System.Windows.Forms.Button(); - this._browseSSAssemblyButton = new System.Windows.Forms.Button(); - this._aSpecAssemblyLabel = new System.Windows.Forms.Label(); - this._aGenAssemblyLabel = new System.Windows.Forms.Label(); - this._ssAssemblyLabel = new System.Windows.Forms.Label(); - this._aSpecAssemblyTextBox = new System.Windows.Forms.TextBox(); - this._aGenAssemblyTextBox = new System.Windows.Forms.TextBox(); - this._ssAssemblyTextBox = new System.Windows.Forms.TextBox(); - this._adapterRadioButton = new System.Windows.Forms.RadioButton(); - this._selfServicingRadioButton = new System.Windows.Forms.RadioButton(); - this._okButton = new System.Windows.Forms.Button(); - this._cancelButton = new System.Windows.Forms.Button(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this._browseAppConfigFileButton = new System.Windows.Forms.Button(); - this._connectionStringTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this._appConfigFileTextBox = new System.Windows.Forms.TextBox(); - this.label2 = new System.Windows.Forms.Label(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this._enableORMProfilerCheckBox = new System.Windows.Forms.CheckBox(); - this._mainErrorProvider = new System.Windows.Forms.ErrorProvider(this.components); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this._mainErrorProvider)).BeginInit(); - this.SuspendLayout(); - // - // groupBox1 - // - this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.components = new System.ComponentModel.Container(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this._browseASpecAssemblyButton = new System.Windows.Forms.Button(); + this._browseAGenAssemblyButton = new System.Windows.Forms.Button(); + this._browseSSAssemblyButton = new System.Windows.Forms.Button(); + this._aSpecAssemblyLabel = new System.Windows.Forms.Label(); + this._aGenAssemblyLabel = new System.Windows.Forms.Label(); + this._ssAssemblyLabel = new System.Windows.Forms.Label(); + this._aSpecAssemblyTextBox = new System.Windows.Forms.TextBox(); + this._aGenAssemblyTextBox = new System.Windows.Forms.TextBox(); + this._ssAssemblyTextBox = new System.Windows.Forms.TextBox(); + this._adapterRadioButton = new System.Windows.Forms.RadioButton(); + this._selfServicingRadioButton = new System.Windows.Forms.RadioButton(); + this._okButton = new System.Windows.Forms.Button(); + this._cancelButton = new System.Windows.Forms.Button(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this._browseAppConfigFileButton = new System.Windows.Forms.Button(); + this._connectionStringTextBox = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this._appConfigFileTextBox = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this._mainErrorProvider = new System.Windows.Forms.ErrorProvider(this.components); + this._browseOrmProfilerInterceptorDllButton = new System.Windows.Forms.Button(); + this._ormProfilerInterceptorLabel = new System.Windows.Forms.Label(); + this._ormprofilerInterceptorDllTextBox = new System.Windows.Forms.TextBox(); + this._enableORMProfilerCheckBox = new System.Windows.Forms.CheckBox(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this._mainErrorProvider)).BeginInit(); + this.SuspendLayout(); + // + // groupBox1 + // + this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox1.Controls.Add(this._browseASpecAssemblyButton); - this.groupBox1.Controls.Add(this._browseAGenAssemblyButton); - this.groupBox1.Controls.Add(this._browseSSAssemblyButton); - this.groupBox1.Controls.Add(this._aSpecAssemblyLabel); - this.groupBox1.Controls.Add(this._aGenAssemblyLabel); - this.groupBox1.Controls.Add(this._ssAssemblyLabel); - this.groupBox1.Controls.Add(this._aSpecAssemblyTextBox); - this.groupBox1.Controls.Add(this._aGenAssemblyTextBox); - this.groupBox1.Controls.Add(this._ssAssemblyTextBox); - this.groupBox1.Controls.Add(this._adapterRadioButton); - this.groupBox1.Controls.Add(this._selfServicingRadioButton); - this.groupBox1.Location = new System.Drawing.Point(12, 12); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(590, 185); - this.groupBox1.TabIndex = 0; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "Template group"; - // - // _browseASpecAssemblyButton - // - this._browseASpecAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this._browseASpecAssemblyButton.Enabled = false; - this._browseASpecAssemblyButton.Location = new System.Drawing.Point(549, 143); - this._browseASpecAssemblyButton.Name = "_browseASpecAssemblyButton"; - this._browseASpecAssemblyButton.Size = new System.Drawing.Size(24, 23); - this._browseASpecAssemblyButton.TabIndex = 7; - this._browseASpecAssemblyButton.Text = "..."; - this._browseASpecAssemblyButton.UseVisualStyleBackColor = true; - this._browseASpecAssemblyButton.Click += new System.EventHandler(this._browseASpecAssemblyButton_Click); - // - // _browseAGenAssemblyButton - // - this._browseAGenAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this._browseAGenAssemblyButton.Enabled = false; - this._browseAGenAssemblyButton.Location = new System.Drawing.Point(549, 117); - this._browseAGenAssemblyButton.Name = "_browseAGenAssemblyButton"; - this._browseAGenAssemblyButton.Size = new System.Drawing.Size(24, 23); - this._browseAGenAssemblyButton.TabIndex = 5; - this._browseAGenAssemblyButton.Text = "..."; - this._browseAGenAssemblyButton.UseVisualStyleBackColor = true; - this._browseAGenAssemblyButton.Click += new System.EventHandler(this._browseAGenAssemblyButton_Click); - // - // _browseSSAssemblyButton - // - this._browseSSAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this._browseSSAssemblyButton.Enabled = false; - this._browseSSAssemblyButton.Location = new System.Drawing.Point(549, 43); - this._browseSSAssemblyButton.Name = "_browseSSAssemblyButton"; - this._browseSSAssemblyButton.Size = new System.Drawing.Size(24, 23); - this._browseSSAssemblyButton.TabIndex = 3; - this._browseSSAssemblyButton.Text = "..."; - this._browseSSAssemblyButton.UseVisualStyleBackColor = true; - this._browseSSAssemblyButton.Click += new System.EventHandler(this._browseSSAssemblyButton_Click); - // - // _aSpecAssemblyLabel - // - this._aSpecAssemblyLabel.AutoSize = true; - this._aSpecAssemblyLabel.Enabled = false; - this._aSpecAssemblyLabel.Location = new System.Drawing.Point(41, 148); - this._aSpecAssemblyLabel.Name = "_aSpecAssemblyLabel"; - this._aSpecAssemblyLabel.Size = new System.Drawing.Size(110, 13); - this._aSpecAssemblyLabel.TabIndex = 3; - this._aSpecAssemblyLabel.Text = "DB Specific Assembly"; - // - // _aGenAssemblyLabel - // - this._aGenAssemblyLabel.AutoSize = true; - this._aGenAssemblyLabel.Enabled = false; - this._aGenAssemblyLabel.Location = new System.Drawing.Point(41, 122); - this._aGenAssemblyLabel.Name = "_aGenAssemblyLabel"; - this._aGenAssemblyLabel.Size = new System.Drawing.Size(109, 13); - this._aGenAssemblyLabel.TabIndex = 3; - this._aGenAssemblyLabel.Text = "DB Generic Assembly"; - // - // _ssAssemblyLabel - // - this._ssAssemblyLabel.AutoSize = true; - this._ssAssemblyLabel.Enabled = false; - this._ssAssemblyLabel.Location = new System.Drawing.Point(41, 48); - this._ssAssemblyLabel.Name = "_ssAssemblyLabel"; - this._ssAssemblyLabel.Size = new System.Drawing.Size(132, 13); - this._ssAssemblyLabel.TabIndex = 3; - this._ssAssemblyLabel.Text = "Generated Code Assembly"; - // - // _aSpecAssemblyTextBox - // - this._aSpecAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox1.Controls.Add(this._browseASpecAssemblyButton); + this.groupBox1.Controls.Add(this._browseAGenAssemblyButton); + this.groupBox1.Controls.Add(this._browseSSAssemblyButton); + this.groupBox1.Controls.Add(this._aSpecAssemblyLabel); + this.groupBox1.Controls.Add(this._aGenAssemblyLabel); + this.groupBox1.Controls.Add(this._ssAssemblyLabel); + this.groupBox1.Controls.Add(this._aSpecAssemblyTextBox); + this.groupBox1.Controls.Add(this._aGenAssemblyTextBox); + this.groupBox1.Controls.Add(this._ssAssemblyTextBox); + this.groupBox1.Controls.Add(this._adapterRadioButton); + this.groupBox1.Controls.Add(this._selfServicingRadioButton); + this.groupBox1.Location = new System.Drawing.Point(12, 12); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(590, 185); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Template group"; + // + // _browseASpecAssemblyButton + // + this._browseASpecAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this._browseASpecAssemblyButton.Enabled = false; + this._browseASpecAssemblyButton.Location = new System.Drawing.Point(549, 143); + this._browseASpecAssemblyButton.Name = "_browseASpecAssemblyButton"; + this._browseASpecAssemblyButton.Size = new System.Drawing.Size(24, 23); + this._browseASpecAssemblyButton.TabIndex = 6; + this._browseASpecAssemblyButton.Text = "..."; + this._browseASpecAssemblyButton.UseVisualStyleBackColor = true; + this._browseASpecAssemblyButton.Click += new System.EventHandler(this._browseASpecAssemblyButton_Click); + // + // _browseAGenAssemblyButton + // + this._browseAGenAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this._browseAGenAssemblyButton.Enabled = false; + this._browseAGenAssemblyButton.Location = new System.Drawing.Point(549, 117); + this._browseAGenAssemblyButton.Name = "_browseAGenAssemblyButton"; + this._browseAGenAssemblyButton.Size = new System.Drawing.Size(24, 23); + this._browseAGenAssemblyButton.TabIndex = 4; + this._browseAGenAssemblyButton.Text = "..."; + this._browseAGenAssemblyButton.UseVisualStyleBackColor = true; + this._browseAGenAssemblyButton.Click += new System.EventHandler(this._browseAGenAssemblyButton_Click); + // + // _browseSSAssemblyButton + // + this._browseSSAssemblyButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this._browseSSAssemblyButton.Enabled = false; + this._browseSSAssemblyButton.Location = new System.Drawing.Point(549, 43); + this._browseSSAssemblyButton.Name = "_browseSSAssemblyButton"; + this._browseSSAssemblyButton.Size = new System.Drawing.Size(24, 23); + this._browseSSAssemblyButton.TabIndex = 2; + this._browseSSAssemblyButton.Text = "..."; + this._browseSSAssemblyButton.UseVisualStyleBackColor = true; + this._browseSSAssemblyButton.Click += new System.EventHandler(this._browseSSAssemblyButton_Click); + // + // _aSpecAssemblyLabel + // + this._aSpecAssemblyLabel.AutoSize = true; + this._aSpecAssemblyLabel.Enabled = false; + this._aSpecAssemblyLabel.Location = new System.Drawing.Point(41, 148); + this._aSpecAssemblyLabel.Name = "_aSpecAssemblyLabel"; + this._aSpecAssemblyLabel.Size = new System.Drawing.Size(110, 13); + this._aSpecAssemblyLabel.TabIndex = 3; + this._aSpecAssemblyLabel.Text = "DB Specific Assembly"; + // + // _aGenAssemblyLabel + // + this._aGenAssemblyLabel.AutoSize = true; + this._aGenAssemblyLabel.Enabled = false; + this._aGenAssemblyLabel.Location = new System.Drawing.Point(41, 122); + this._aGenAssemblyLabel.Name = "_aGenAssemblyLabel"; + this._aGenAssemblyLabel.Size = new System.Drawing.Size(109, 13); + this._aGenAssemblyLabel.TabIndex = 3; + this._aGenAssemblyLabel.Text = "DB Generic Assembly"; + // + // _ssAssemblyLabel + // + this._ssAssemblyLabel.AutoSize = true; + this._ssAssemblyLabel.Enabled = false; + this._ssAssemblyLabel.Location = new System.Drawing.Point(41, 48); + this._ssAssemblyLabel.Name = "_ssAssemblyLabel"; + this._ssAssemblyLabel.Size = new System.Drawing.Size(132, 13); + this._ssAssemblyLabel.TabIndex = 3; + this._ssAssemblyLabel.Text = "Generated Code Assembly"; + // + // _aSpecAssemblyTextBox + // + this._aSpecAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this._aSpecAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this._aSpecAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; - this._aSpecAssemblyTextBox.Enabled = false; - this._aSpecAssemblyTextBox.Location = new System.Drawing.Point(183, 145); - this._aSpecAssemblyTextBox.Name = "_aSpecAssemblyTextBox"; - this._aSpecAssemblyTextBox.Size = new System.Drawing.Size(360, 20); - this._aSpecAssemblyTextBox.TabIndex = 6; - this._aSpecAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._aSpecAssemblyTextBox_Validating); - // - // _aGenAssemblyTextBox - // - this._aGenAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._aSpecAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this._aSpecAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; + this._aSpecAssemblyTextBox.Enabled = false; + this._aSpecAssemblyTextBox.Location = new System.Drawing.Point(183, 145); + this._aSpecAssemblyTextBox.Name = "_aSpecAssemblyTextBox"; + this._aSpecAssemblyTextBox.Size = new System.Drawing.Size(360, 20); + this._aSpecAssemblyTextBox.TabIndex = 5; + this._aSpecAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._aSpecAssemblyTextBox_Validating); + // + // _aGenAssemblyTextBox + // + this._aGenAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this._aGenAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this._aGenAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; - this._aGenAssemblyTextBox.Enabled = false; - this._aGenAssemblyTextBox.Location = new System.Drawing.Point(183, 119); - this._aGenAssemblyTextBox.Name = "_aGenAssemblyTextBox"; - this._aGenAssemblyTextBox.Size = new System.Drawing.Size(360, 20); - this._aGenAssemblyTextBox.TabIndex = 4; - this._aGenAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._aGenAssemblyTextBox_Validating); - // - // _ssAssemblyTextBox - // - this._ssAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._aGenAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this._aGenAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; + this._aGenAssemblyTextBox.Enabled = false; + this._aGenAssemblyTextBox.Location = new System.Drawing.Point(183, 119); + this._aGenAssemblyTextBox.Name = "_aGenAssemblyTextBox"; + this._aGenAssemblyTextBox.Size = new System.Drawing.Size(360, 20); + this._aGenAssemblyTextBox.TabIndex = 3; + this._aGenAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._aGenAssemblyTextBox_Validating); + // + // _ssAssemblyTextBox + // + this._ssAssemblyTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this._ssAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this._ssAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; - this._ssAssemblyTextBox.Enabled = false; - this._ssAssemblyTextBox.Location = new System.Drawing.Point(183, 45); - this._ssAssemblyTextBox.Name = "_ssAssemblyTextBox"; - this._ssAssemblyTextBox.Size = new System.Drawing.Size(360, 20); - this._ssAssemblyTextBox.TabIndex = 2; - this._ssAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._ssAssemblyTextBox_Validating); - // - // _adapterRadioButton - // - this._adapterRadioButton.AutoSize = true; - this._adapterRadioButton.Location = new System.Drawing.Point(12, 89); - this._adapterRadioButton.Name = "_adapterRadioButton"; - this._adapterRadioButton.Size = new System.Drawing.Size(62, 17); - this._adapterRadioButton.TabIndex = 1; - this._adapterRadioButton.TabStop = true; - this._adapterRadioButton.Text = "Adapter"; - this._adapterRadioButton.UseVisualStyleBackColor = true; - this._adapterRadioButton.CheckedChanged += new System.EventHandler(this._adapterRadioButton_CheckedChanged); - // - // _selfServicingRadioButton - // - this._selfServicingRadioButton.AutoSize = true; - this._selfServicingRadioButton.Location = new System.Drawing.Point(12, 19); - this._selfServicingRadioButton.Name = "_selfServicingRadioButton"; - this._selfServicingRadioButton.Size = new System.Drawing.Size(90, 17); - this._selfServicingRadioButton.TabIndex = 0; - this._selfServicingRadioButton.TabStop = true; - this._selfServicingRadioButton.Text = "Self-Servicing"; - this._selfServicingRadioButton.UseVisualStyleBackColor = true; - this._selfServicingRadioButton.CheckedChanged += new System.EventHandler(this._selfServicingRadioButton_CheckedChanged); - // - // _okButton - // - this._okButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this._okButton.Location = new System.Drawing.Point(236, 362); - this._okButton.Name = "_okButton"; - this._okButton.Size = new System.Drawing.Size(61, 24); - this._okButton.TabIndex = 3; - this._okButton.Text = "OK"; - this._okButton.UseVisualStyleBackColor = true; - this._okButton.Click += new System.EventHandler(this._okButton_Click); - // - // _cancelButton - // - this._cancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom; - this._cancelButton.CausesValidation = false; - this._cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this._cancelButton.Location = new System.Drawing.Point(317, 362); - this._cancelButton.Name = "_cancelButton"; - this._cancelButton.Size = new System.Drawing.Size(61, 24); - this._cancelButton.TabIndex = 4; - this._cancelButton.Text = "Cancel"; - this._cancelButton.UseVisualStyleBackColor = true; - this._cancelButton.Click += new System.EventHandler(this._cancelButton_Click); - // - // groupBox2 - // - this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._ssAssemblyTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this._ssAssemblyTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; + this._ssAssemblyTextBox.Enabled = false; + this._ssAssemblyTextBox.Location = new System.Drawing.Point(183, 45); + this._ssAssemblyTextBox.Name = "_ssAssemblyTextBox"; + this._ssAssemblyTextBox.Size = new System.Drawing.Size(360, 20); + this._ssAssemblyTextBox.TabIndex = 1; + this._ssAssemblyTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._ssAssemblyTextBox_Validating); + // + // _adapterRadioButton + // + this._adapterRadioButton.AutoSize = true; + this._adapterRadioButton.Location = new System.Drawing.Point(12, 89); + this._adapterRadioButton.Name = "_adapterRadioButton"; + this._adapterRadioButton.Size = new System.Drawing.Size(62, 17); + this._adapterRadioButton.TabIndex = 1; + this._adapterRadioButton.TabStop = true; + this._adapterRadioButton.Text = "Adapter"; + this._adapterRadioButton.UseVisualStyleBackColor = true; + this._adapterRadioButton.CheckedChanged += new System.EventHandler(this._adapterRadioButton_CheckedChanged); + // + // _selfServicingRadioButton + // + this._selfServicingRadioButton.AutoSize = true; + this._selfServicingRadioButton.Location = new System.Drawing.Point(12, 19); + this._selfServicingRadioButton.Name = "_selfServicingRadioButton"; + this._selfServicingRadioButton.Size = new System.Drawing.Size(90, 17); + this._selfServicingRadioButton.TabIndex = 0; + this._selfServicingRadioButton.TabStop = true; + this._selfServicingRadioButton.Text = "Self-Servicing"; + this._selfServicingRadioButton.UseVisualStyleBackColor = true; + this._selfServicingRadioButton.CheckedChanged += new System.EventHandler(this._selfServicingRadioButton_CheckedChanged); + // + // _okButton + // + this._okButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this._okButton.Location = new System.Drawing.Point(236, 390); + this._okButton.Name = "_okButton"; + this._okButton.Size = new System.Drawing.Size(61, 24); + this._okButton.TabIndex = 3; + this._okButton.Text = "OK"; + this._okButton.UseVisualStyleBackColor = true; + this._okButton.Click += new System.EventHandler(this._okButton_Click); + // + // _cancelButton + // + this._cancelButton.Anchor = System.Windows.Forms.AnchorStyles.Bottom; + this._cancelButton.CausesValidation = false; + this._cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this._cancelButton.Location = new System.Drawing.Point(317, 390); + this._cancelButton.Name = "_cancelButton"; + this._cancelButton.Size = new System.Drawing.Size(61, 24); + this._cancelButton.TabIndex = 4; + this._cancelButton.Text = "Cancel"; + this._cancelButton.UseVisualStyleBackColor = true; + this._cancelButton.Click += new System.EventHandler(this._cancelButton_Click); + // + // groupBox2 + // + this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox2.Controls.Add(this._browseAppConfigFileButton); - this.groupBox2.Controls.Add(this._connectionStringTextBox); - this.groupBox2.Controls.Add(this.label1); - this.groupBox2.Controls.Add(this._appConfigFileTextBox); - this.groupBox2.Controls.Add(this.label2); - this.groupBox2.Location = new System.Drawing.Point(12, 204); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(590, 83); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Connection string and configuration information"; - // - // _browseAppConfigFileButton - // - this._browseAppConfigFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this._browseAppConfigFileButton.Location = new System.Drawing.Point(549, 47); - this._browseAppConfigFileButton.Name = "_browseAppConfigFileButton"; - this._browseAppConfigFileButton.Size = new System.Drawing.Size(24, 23); - this._browseAppConfigFileButton.TabIndex = 2; - this._browseAppConfigFileButton.Text = "..."; - this._browseAppConfigFileButton.UseVisualStyleBackColor = true; - this._browseAppConfigFileButton.Click += new System.EventHandler(this._browseAppConfigFileButton_Click); - // - // _connectionStringTextBox - // - this._connectionStringTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.groupBox2.Controls.Add(this._browseAppConfigFileButton); + this.groupBox2.Controls.Add(this._connectionStringTextBox); + this.groupBox2.Controls.Add(this.label1); + this.groupBox2.Controls.Add(this._appConfigFileTextBox); + this.groupBox2.Controls.Add(this.label2); + this.groupBox2.Location = new System.Drawing.Point(12, 204); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(590, 83); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Connection string and configuration information"; + // + // _browseAppConfigFileButton + // + this._browseAppConfigFileButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this._browseAppConfigFileButton.Location = new System.Drawing.Point(549, 47); + this._browseAppConfigFileButton.Name = "_browseAppConfigFileButton"; + this._browseAppConfigFileButton.Size = new System.Drawing.Size(24, 23); + this._browseAppConfigFileButton.TabIndex = 2; + this._browseAppConfigFileButton.Text = "..."; + this._browseAppConfigFileButton.UseVisualStyleBackColor = true; + this._browseAppConfigFileButton.Click += new System.EventHandler(this._browseAppConfigFileButton_Click); + // + // _connectionStringTextBox + // + this._connectionStringTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this._connectionStringTextBox.Location = new System.Drawing.Point(152, 24); - this._connectionStringTextBox.Name = "_connectionStringTextBox"; - this._connectionStringTextBox.Size = new System.Drawing.Size(421, 20); - this._connectionStringTextBox.TabIndex = 0; - this._connectionStringTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._connectionStringTextBox_Validating); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(9, 27); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(121, 13); - this.label1.TabIndex = 3; - this.label1.Text = "Connection string to use"; - // - // _appConfigFileTextBox - // - this._appConfigFileTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._connectionStringTextBox.Location = new System.Drawing.Point(152, 24); + this._connectionStringTextBox.Name = "_connectionStringTextBox"; + this._connectionStringTextBox.Size = new System.Drawing.Size(421, 20); + this._connectionStringTextBox.TabIndex = 0; + this._connectionStringTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._connectionStringTextBox_Validating); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(9, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(121, 13); + this.label1.TabIndex = 3; + this.label1.Text = "Connection string to use"; + // + // _appConfigFileTextBox + // + this._appConfigFileTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this._appConfigFileTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; - this._appConfigFileTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; - this._appConfigFileTextBox.Location = new System.Drawing.Point(152, 50); - this._appConfigFileTextBox.Name = "_appConfigFileTextBox"; - this._appConfigFileTextBox.Size = new System.Drawing.Size(391, 20); - this._appConfigFileTextBox.TabIndex = 1; - this._appConfigFileTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._appConfigFileTextBox_Validating); - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(9, 53); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(133, 13); - this.label2.TabIndex = 3; - this.label2.Text = ".config file to use (optional)"; - // - // groupBox3 - // - this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this._appConfigFileTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this._appConfigFileTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; + this._appConfigFileTextBox.Location = new System.Drawing.Point(152, 50); + this._appConfigFileTextBox.Name = "_appConfigFileTextBox"; + this._appConfigFileTextBox.Size = new System.Drawing.Size(391, 20); + this._appConfigFileTextBox.TabIndex = 1; + this._appConfigFileTextBox.Validating += new System.ComponentModel.CancelEventHandler(this._appConfigFileTextBox_Validating); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(9, 53); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(133, 13); + this.label2.TabIndex = 3; + this.label2.Text = ".config file to use (optional)"; + // + // groupBox3 + // + this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.groupBox3.Controls.Add(this._enableORMProfilerCheckBox); - this.groupBox3.Location = new System.Drawing.Point(12, 294); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(590, 51); - this.groupBox3.TabIndex = 2; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Startup information"; - // - // _enableORMProfilerCheckBox - // - this._enableORMProfilerCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; - this._enableORMProfilerCheckBox.Location = new System.Drawing.Point(9, 23); - this._enableORMProfilerCheckBox.Name = "_enableORMProfilerCheckBox"; - this._enableORMProfilerCheckBox.Size = new System.Drawing.Size(164, 17); - this._enableORMProfilerCheckBox.TabIndex = 0; - this._enableORMProfilerCheckBox.Text = "Enable ORM Profiler"; - this._enableORMProfilerCheckBox.UseVisualStyleBackColor = true; - // - // _mainErrorProvider - // - this._mainErrorProvider.ContainerControl = this; - // - // ConnectionDialog - // - this.AcceptButton = this._okButton; - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.CancelButton = this._cancelButton; - this.ClientSize = new System.Drawing.Size(614, 398); - this.Controls.Add(this.groupBox3); - this.Controls.Add(this.groupBox2); - this.Controls.Add(this._cancelButton); - this.Controls.Add(this._okButton); - this.Controls.Add(this.groupBox1); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; - this.Name = "ConnectionDialog"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "LLBLGen Pro LINQPad Connection Information"; - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this._mainErrorProvider)).EndInit(); - this.ResumeLayout(false); + this.groupBox3.Controls.Add(this._enableORMProfilerCheckBox); + this.groupBox3.Controls.Add(this._browseOrmProfilerInterceptorDllButton); + this.groupBox3.Controls.Add(this._ormProfilerInterceptorLabel); + this.groupBox3.Controls.Add(this._ormprofilerInterceptorDllTextBox); + this.groupBox3.Location = new System.Drawing.Point(12, 294); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(590, 81); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Startup information"; + // + // _mainErrorProvider + // + this._mainErrorProvider.ContainerControl = this; + // + // _browseOrmProfilerInterceptorDllButton + // + this._browseOrmProfilerInterceptorDllButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this._browseOrmProfilerInterceptorDllButton.Enabled = false; + this._browseOrmProfilerInterceptorDllButton.Location = new System.Drawing.Point(549, 44); + this._browseOrmProfilerInterceptorDllButton.Name = "_browseOrmProfilerInterceptorDllButton"; + this._browseOrmProfilerInterceptorDllButton.Size = new System.Drawing.Size(24, 23); + this._browseOrmProfilerInterceptorDllButton.TabIndex = 2; + this._browseOrmProfilerInterceptorDllButton.Text = "..."; + this._browseOrmProfilerInterceptorDllButton.UseVisualStyleBackColor = true; + this._browseOrmProfilerInterceptorDllButton.Click += new System.EventHandler(this._browseOrmProfilerInterceptorDllButton_Click); + // + // _ormProfilerInterceptorLabel + // + this._ormProfilerInterceptorLabel.AutoSize = true; + this._ormProfilerInterceptorLabel.Enabled = false; + this._ormProfilerInterceptorLabel.Location = new System.Drawing.Point(9, 49); + this._ormProfilerInterceptorLabel.Name = "_ormProfilerInterceptorLabel"; + this._ormProfilerInterceptorLabel.Size = new System.Drawing.Size(133, 13); + this._ormProfilerInterceptorLabel.TabIndex = 6; + this._ormProfilerInterceptorLabel.Text = "ORM Profiler interceptor dll"; + // + // _ormprofilerInterceptorDllTextBox + // + this._ormprofilerInterceptorDllTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this._ormprofilerInterceptorDllTextBox.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest; + this._ormprofilerInterceptorDllTextBox.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.FileSystem; + this._ormprofilerInterceptorDllTextBox.Enabled = false; + this._ormprofilerInterceptorDllTextBox.Location = new System.Drawing.Point(152, 46); + this._ormprofilerInterceptorDllTextBox.Name = "_ormprofilerInterceptorDllTextBox"; + this._ormprofilerInterceptorDllTextBox.Size = new System.Drawing.Size(391, 20); + this._ormprofilerInterceptorDllTextBox.TabIndex = 1; + // + // _enableORMProfilerCheckBox + // + this._enableORMProfilerCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight; + this._enableORMProfilerCheckBox.Location = new System.Drawing.Point(8, 20); + this._enableORMProfilerCheckBox.Name = "_enableORMProfilerCheckBox"; + this._enableORMProfilerCheckBox.Size = new System.Drawing.Size(158, 24); + this._enableORMProfilerCheckBox.TabIndex = 0; + this._enableORMProfilerCheckBox.Text = "Enable ORM Profiler"; + this._enableORMProfilerCheckBox.UseVisualStyleBackColor = true; + this._enableORMProfilerCheckBox.CheckedChanged += new System.EventHandler(this._enableORMProfilerCheckBox_CheckedChanged); + // + // ConnectionDialog + // + this.AcceptButton = this._okButton; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.CancelButton = this._cancelButton; + this.ClientSize = new System.Drawing.Size(614, 426); + this.Controls.Add(this.groupBox3); + this.Controls.Add(this.groupBox2); + this.Controls.Add(this._cancelButton); + this.Controls.Add(this._okButton); + this.Controls.Add(this.groupBox1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow; + this.Name = "ConnectionDialog"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "LLBLGen Pro LINQPad Connection Information"; + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this._mainErrorProvider)).EndInit(); + this.ResumeLayout(false); } @@ -375,7 +417,10 @@ private void InitializeComponent() private System.Windows.Forms.TextBox _appConfigFileTextBox; private System.Windows.Forms.Label label2; private System.Windows.Forms.GroupBox groupBox3; - private System.Windows.Forms.CheckBox _enableORMProfilerCheckBox; private System.Windows.Forms.ErrorProvider _mainErrorProvider; - } + private System.Windows.Forms.Button _browseOrmProfilerInterceptorDllButton; + private System.Windows.Forms.Label _ormProfilerInterceptorLabel; + private System.Windows.Forms.TextBox _ormprofilerInterceptorDllTextBox; + private System.Windows.Forms.CheckBox _enableORMProfilerCheckBox; + } } \ No newline at end of file diff --git a/Driver Code/ConnectionDialog.cs b/Driver Code/ConnectionDialog.cs index ee549f7..ee4d52c 100644 --- a/Driver Code/ConnectionDialog.cs +++ b/Driver Code/ConnectionDialog.cs @@ -91,50 +91,7 @@ protected override void OnLoad(EventArgs e) FillControlsWithExistingData(); } this.MinimumSize = this.Size; - EnableDisableORMProfilerCheckBox(); - } - - - /// - /// Enables the disable ORM profiler check box. - /// - private void EnableDisableORMProfilerCheckBox() - { - // check whether the .opsnapshot extension is registered in the registry. If so, grab the folder location for the interceptor. - // if not, disable the checkbox. - bool enableEnableORMProfilerCheckbox = true; - var opsnapshotRegistration = Registry.GetValue("HKEY_CLASSES_ROOT\\.opsnapshot", string.Empty, null); - if(opsnapshotRegistration == null) - { - enableEnableORMProfilerCheckbox = false; - } - else - { - string realRegistryKey = opsnapshotRegistration as string; - if(realRegistryKey == null) - { - enableEnableORMProfilerCheckbox = false; - } - else - { - var iconPath = Registry.GetValue(string.Format("HKEY_CLASSES_ROOT\\{0}\\DefaultIcon", realRegistryKey), string.Empty, null) as string; - if(iconPath == null) - { - enableEnableORMProfilerCheckbox = false; - } - else - { - iconPath = iconPath.Substring(0, iconPath.Length - 2); - var interceptorPath = Path.Combine(Path.GetDirectoryName(iconPath), "SD.Tools.OrmProfiler.Interceptor.dll"); - enableEnableORMProfilerCheckbox = File.Exists(interceptorPath); - if(enableEnableORMProfilerCheckbox) - { - CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.ORMProfilerInterceptorLocationElement, interceptorPath); - } - } - } - } - _enableORMProfilerCheckBox.Enabled = enableEnableORMProfilerCheckbox; + EnableDisableORMProfilerInterceptorControls(); } @@ -163,8 +120,9 @@ private void FillControlsWithExistingData() _aSpecAssemblyTextBox.Text = CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.AdapterDBSpecificAssemblyFilenameElement); _connectionStringTextBox.Text = CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.ConnectionStringElementName); _appConfigFileTextBox.Text = CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.ConfigFileFilenameElement); - _enableORMProfilerCheckBox.Checked = XmlConvert.ToBoolean(CxInfoHelper.GetDriverDataElementValue(_cxInfo, - DriverDataElements.EnableORMProfilerElement)); + _enableORMProfilerCheckBox.Checked = XmlConvert.ToBoolean(CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.EnableORMProfilerElement)); + _ormprofilerInterceptorDllTextBox.Text = CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.ORMProfilerInterceptorLocationElement); + _enableORMProfilerCheckBox.Checked = XmlConvert.ToBoolean(CxInfoHelper.GetDriverDataElementValue(_cxInfo, DriverDataElements.EnableORMProfilerElement)); } @@ -265,6 +223,14 @@ private void BrowseForFile(string caption, string filter, string defaultExtensio } + private void EnableDisableORMProfilerInterceptorControls() + { + _ormprofilerInterceptorDllTextBox.Enabled = _enableORMProfilerCheckBox.Checked; + _ormProfilerInterceptorLabel.Enabled = _enableORMProfilerCheckBox.Checked; + _browseOrmProfilerInterceptorDllButton.Enabled = _enableORMProfilerCheckBox.Checked; + } + + /// /// Fills the cx info with the data specified on the form /// @@ -283,8 +249,8 @@ private void FillCxInfo() CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.ConfigFileFilenameElement, _appConfigFileTextBox.Text); CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.ConnectionStringElementName, _connectionStringTextBox.Text); _cxInfo.DatabaseInfo.CustomCxString = _connectionStringTextBox.Text; - CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.EnableORMProfilerElement, - XmlConvert.ToString((_enableORMProfilerCheckBox.Enabled && _enableORMProfilerCheckBox.Checked))); + CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.EnableORMProfilerElement, XmlConvert.ToString((_enableORMProfilerCheckBox.Enabled && _enableORMProfilerCheckBox.Checked))); + CxInfoHelper.SetDriverDataElement(_cxInfo, DriverDataElements.ORMProfilerInterceptorLocationElement, _ormprofilerInterceptorDllTextBox.Text); CxInfoHelper.SetCustomTypeInfo(_cxInfo, templateGroupSelected); } @@ -450,5 +416,15 @@ private void _browseAppConfigFileButton_Click(object sender, EventArgs e) { BrowseForFile("Please select the .config file to use.", ".config files (*.config)|*.config", ".config", _appConfigFileTextBox); } - } + + private void _browseOrmProfilerInterceptorDllButton_Click(object sender, EventArgs e) + { + BrowseForFile("Please select the ORM Profiler Intercept dll to use", "Assemblies (*.dll)|*.dll", ".dll", _ormprofilerInterceptorDllTextBox); + } + + private void _enableORMProfilerCheckBox_CheckedChanged(object sender, EventArgs e) + { + EnableDisableORMProfilerInterceptorControls(); + } + } } diff --git a/Driver Code/ConnectionDialog.resx b/Driver Code/ConnectionDialog.resx index ba86c5b..592fed6 100644 --- a/Driver Code/ConnectionDialog.resx +++ b/Driver Code/ConnectionDialog.resx @@ -112,12 +112,12 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + 147, 17 \ No newline at end of file diff --git a/Driver Code/ConstantsEnums.cs b/Driver Code/ConstantsEnums.cs index bf30f7b..7ee8fec 100644 --- a/Driver Code/ConstantsEnums.cs +++ b/Driver Code/ConstantsEnums.cs @@ -50,7 +50,7 @@ namespace SD.LLBLGen.Pro.LINQPadDriver internal class Constants { internal static readonly int MajorVersion = 5; - internal static readonly int MinorVersion = 2; + internal static readonly int MinorVersion = 13; internal static readonly string Author = "Solutions Design bv"; internal static readonly string Name = "LLBLGen Pro v" + string.Format("{0}.{1}", MajorVersion, MinorVersion) + " LINQPad driver"; } diff --git a/Driver Code/DevDeploy.bat b/Driver Code/DevDeploy.bat index 791fb48..0394f7d 100644 --- a/Driver Code/DevDeploy.bat +++ b/Driver Code/DevDeploy.bat @@ -14,6 +14,6 @@ rem @"LINQPad\Drivers\DataContext\3.5\") rem rem The final part of the directory is the name of the assembly plus its public key token in brackets. echo 3.5 b094696bc21c000a -xcopy /i/y *.dll "C:\ProgramData\LINQPad\Drivers\DataContext\3.5\SD.LLBLGen.Pro.LINQPadDriver50 (b094696bc21c000a)" -xcopy /i/y *.pdb "C:\ProgramData\LINQPad\Drivers\DataContext\3.5\SD.LLBLGen.Pro.LINQPadDriver50 (b094696bc21c000a)" +xcopy /i/y *.dll "C:\ProgramData\LINQPad\Drivers\DataContext\3.5\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" +xcopy /i/y *.pdb "C:\ProgramData\LINQPad\Drivers\DataContext\3.5\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" pause \ No newline at end of file diff --git a/Driver Code/DevDeploy4.bat b/Driver Code/DevDeploy4.bat index 8f10544..d54a1ff 100644 --- a/Driver Code/DevDeploy4.bat +++ b/Driver Code/DevDeploy4.bat @@ -15,6 +15,6 @@ rem @"LINQPad\Drivers\DataContext\3.5\") rem rem The final part of the directory is the name of the assembly plus its public key token in brackets. echo 4.0 b094696bc21c000a -xcopy /i/y *.dll "C:\ProgramData\LINQPad\Drivers\DataContext\4.0\SD.LLBLGen.Pro.LINQPadDriver50 (b094696bc21c000a)" -xcopy /i/y *.pdb "C:\ProgramData\LINQPad\Drivers\DataContext\4.0\SD.LLBLGen.Pro.LINQPadDriver50 (b094696bc21c000a)" +xcopy /i/y *.dll "C:\ProgramData\LINQPad\Drivers\DataContext\4.0\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" +xcopy /i/y *.pdb "C:\ProgramData\LINQPad\Drivers\DataContext\4.0\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" pause \ No newline at end of file diff --git a/Driver Code/DevDeploy5.bat b/Driver Code/DevDeploy5.bat new file mode 100644 index 0000000..2c9f2a2 --- /dev/null +++ b/Driver Code/DevDeploy5.bat @@ -0,0 +1,13 @@ +@Echo off +rem +rem You can simplify development by updating this batch file and then calling it from the +rem project's post-build event. +rem +rem It copies the output .DLL (and .PDB) to LINQPad's drivers folder, so that LINQPad +rem picks up the drivers immediately (without needing to click 'Add Driver'). +rem +rem The final part of the directory is the name of the assembly plus its public key token in brackets. +echo 5.0 b094696bc21c000a +xcopy /i/y *.dll "%localappdata%\LINQPad\Drivers\DataContext\4.6\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" +xcopy /i/y *.pdb "%localappdata%\LINQPad\Drivers\DataContext\4.6\SD.LLBLGen.Pro.LINQPadDriver58 (b094696bc21c000a)" +pause \ No newline at end of file diff --git a/Driver Code/LICENSE.txt b/Driver Code/LICENSE.txt index 56a7e33..1ddde0b 100644 --- a/Driver Code/LICENSE.txt +++ b/Driver Code/LICENSE.txt @@ -3,7 +3,7 @@ The sourcecode and binary compiled version of this driver are licensed under the BSD2 license: COPYRIGHTS: -Copyright (c)2002-2017 Solutions Design. All rights reserved. +Copyright (c)2002-2023 Solutions Design. All rights reserved. http://www.llblgen.com The LLBLGen Pro LINQPad driver sourcecode is released under the following license (BSD2): diff --git a/Driver Code/LINQPadDriver.csproj b/Driver Code/LINQPadDriver.csproj index 519343e..7071983 100644 --- a/Driver Code/LINQPadDriver.csproj +++ b/Driver Code/LINQPadDriver.csproj @@ -9,8 +9,8 @@ Library Properties SD.LLBLGen.Pro.LINQPadDriver - SD.LLBLGen.Pro.LINQPadDriver52 - v4.5.2 + SD.LLBLGen.Pro.LINQPadDriver513 + v4.6.2 512 @@ -40,14 +40,11 @@ StrongName.snk - - False - .exe - ..\Externals\LINQPad.exe + + ..\..\..\..\..\..\Program Files (x86)\LINQPad5\LINQPad.exe - - ..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.2.0\lib\net45\SD.LLBLGen.Pro.ORMSupportClasses.dll - True + + ..\packages\SD.LLBLGen.Pro.ORMSupportClasses.5.13.0\lib\net452\SD.LLBLGen.Pro.ORMSupportClasses.dll @@ -77,6 +74,7 @@ + @@ -90,13 +88,15 @@ Always + Designer - Call "$(ProjectDir)\DevDeploy4.bat" + Call "$(ProjectDir)\DevDeploy5.bat" +Call "$(ProjectDir)\DevDeploy4.bat" Call "$(ProjectDir)\DevDeploy.bat" diff --git a/Driver Code/Properties/AssemblyInfo.cs b/Driver Code/Properties/AssemblyInfo.cs index 6325dfe..493b868 100644 --- a/Driver Code/Properties/AssemblyInfo.cs +++ b/Driver Code/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("LLBLGen Pro LINQPad Driver")] -[assembly: AssemblyDescription("LINQPad driver for LLBLGen Pro v5.2")] -[assembly: AssemblyConfiguration(".NET 4.5.2")] +[assembly: AssemblyDescription("LINQPad driver for LLBLGen Pro v5.13")] +[assembly: AssemblyConfiguration(".NET 4.6.2")] [assembly: AssemblyCompany("Solutions Design bv")] [assembly: AssemblyProduct("LLBLGen Pro")] -[assembly: AssemblyCopyright("Copyright ©2017 Solutions Design bv")] +[assembly: AssemblyCopyright("Copyright ©2026 Solutions Design bv")] [assembly: AssemblyTrademark("LLBLGen and LLBLGen Pro are trademarks of Solutions Design bv.")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.2.0.0")] -[assembly: AssemblyFileVersion("5.2.0")] +[assembly: AssemblyVersion("5.13.0.0")] +[assembly: AssemblyFileVersion("5.13.0")] diff --git a/Driver Code/README.txt b/Driver Code/README.txt index e8e449d..6cbc8c8 100644 --- a/Driver Code/README.txt +++ b/Driver Code/README.txt @@ -11,7 +11,7 @@ folder, you have to change the target framework to .NET 4 for the driver project Requirements to compile the code: ----------------------------------- -.NET 3.5 SDK or higher. Recommented: VS.NET 2010 or higher. +.NET 4.5.2 SDK or higher. Recommented: VS.NET 2015 or higher or Rider 2017.x or higher How to distribute the driver diff --git a/Driver Code/header.xml b/Driver Code/header.xml index 95275d1..9373741 100644 --- a/Driver Code/header.xml +++ b/Driver Code/header.xml @@ -1,5 +1,5 @@  - SD.LLBLGen.Pro.LINQPadDriver52.dll - http://www.llblgen.com/TinyForum - \ No newline at end of file + SD.LLBLGen.Pro.LINQPadDriver513.dll + https://www.llblgen.com/TinyForum + diff --git a/Driver Code/packages.config b/Driver Code/packages.config index c0f6aa6..54d70eb 100644 --- a/Driver Code/packages.config +++ b/Driver Code/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/LICENSE b/LICENSE index 07ab404..a8d7c69 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ License The sourcecode and binary compiled version of this driver are licensed under the BSD2 license: COPYRIGHTS: -Copyright (c)2002-2014 Solutions Design bv. All rights reserved. +Copyright (c)2002-2021 Solutions Design bv. All rights reserved. http://www.llblgen.com The LLBLGen Pro LINQPad driver sourcecode is released under the following license (BSD2): diff --git a/README.md b/README.md index 0225a60..8633ec4 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,7 @@ -LLBLGen Pro LINQPad Driver +LLBLGen Pro LINQPad Driver for LINQPad v5 =========================== -The Official [LLBLGen Pro](http://www.llblgen.com) LINQPad driver. This repository is the continuation of the Codeplex repository at -https://llblgenlinqpad.codeplex.com/. For the sourcecode of the Linqpad driver for LLBLGen Pro v4.1 or earlier -please visit the codeplex repository. +The Official [LLBLGen Pro](https://www.llblgen.com) LINQPad driver for LINQPad v5. This driver is to be used with LINQPad 5 and with assemblies compiled against the +.NET Framework. ### How to compile the sourcecode To compile the sourcecode, make sure you place the files mentioned in \Externals\FilesToPlaceHere.txt into @@ -10,8 +9,6 @@ the folder \Externals before compiling. It can be DevDeploy(4).bat fails after c in those bat files or remove the post-build event. If you copied LINQPad.exe v4.40 or higher in the Externals folder, you have to change the target framework to .NET 4 for the driver project to compile the code. -### How to distribute the driver -To distribute the driver, zip the dll and header.xml into a zip file and rename the extension to .lpx. ### Executing SQL The driver isn't designed to be used to execute SQL against a database, though it will work if the following @@ -20,7 +17,9 @@ is true: - In the connection string specified you connect to a SQL Server service. ### Executing QuerySpec or Low-level API queries -Set the 'language' combo box in the query pane in LINQpad to 'C# Statements' or 'VB.NET statements'. +Set the 'language' combo box in the query pane in LINQpad to 'C# Statements' or 'VB.NET statements'. Be sure to +select the right connection after this. + Specify the query as-is. To see results, use the Dump(); extension method by appending it to the results.