635. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:56:54 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

635.1 Files compared

#	Location	File	Last Modified
1	C:\Araxis_Merge_Comprasion\Pub_un\BTSSS_CIF_122016.zip\BTSSS_CIF_12_20_16\clean\CRM\trunk\SDK\SampleCode\CS\QuickStart\WinForms	WinCRUDOperations.Designer.cs	Tue Dec 20 19:51:42 2016 UTC
2			Wed Feb 1 19:56:54 2017 UTC

635.2 Comparison summary

Description	Between Files 1 and 2
Description	Text Blocks	Lines
Unchanged	0	0
Changed	0	0
Inserted	0	0
Removed	1	111

635.3 Comparison options

Whitespace
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

635.4 Active regular expressions

No regular expressions were active.

635.5 Comparison detail

1		namespace Microsoft. Crm.Sdk.Sa mples
2		{
3		partia l class Wi nCRUDOpera tions
4		{
5		// / <summary >
6		// / Required designer variable.
7		// / </summar y>
8		pr ivate Syst em.Compone ntModel.IC ontainer c omponents = null;
9
10		// / <summary >
11		// / Clean up any resou rces being used.
12		// / </summar y>
13		// / <param n ame="dispo sing">true if manage d resource s should b e disposed ; otherwis e, false.< /param>
14		pr otected ov erride voi d Dispose( bool dispo sing)
15		{
16		if (disp osing && ( components != null))
17		{
18		comp onents.Dis pose();
19		}
20		base.Dis pose(dispo sing);
21		}
22
23		#r egion Wind ows Form D esigner ge nerated co de
24
25		// / <summary >
26		// / Required method fo r Designer support - do not mo dify
27		// / the cont ents of th is method with the c ode editor .
28		// / </summar y>
29		pr ivate void Initializ eComponent ()
30		{
31		this.btn Exit = new System.Wi ndows.Form s.Button() ;
32		this.cbx ServerList = new Sys tem.Window s.Forms.Co mboBox();
33		this.btn Connect = new System .Windows.F orms.Butto n();
34		this.lbl MulConn = new System .Windows.F orms.Label ();
35		this.lbl OutMsg = n ew System. Windows.Fo rms.Label( );
36		this.Sus pendLayout ();
37		//
38		// btnEx it
39		//
40		this.btn Exit.Locat ion = new System.Dra wing.Point (475, 323) ;
41		this.btn Exit.Name = "btnExit ";
42		this.btn Exit.Size = new Syst em.Drawing .Size(75, 23);
43		this.btn Exit.TabIn dex = 0;
44		this.btn Exit.Text = "Exit";
45		this.btn Exit.UseVi sualStyleB ackColor = true;
46		this.btn Exit.Click += new Sy stem.Event Handler(th is.btnExit _Click);
47		//
48		// cbxSe rverList
49		//
50		this.cbx ServerList .Formattin gEnabled = true;
51		this.cbx ServerList .Location = new Syst em.Drawing .Point(30, 37);
52		this.cbx ServerList .Name = "c bxServerLi st";
53		this.cbx ServerList .Size = ne w System.D rawing.Siz e(436, 21) ;
54		this.cbx ServerList .TabIndex = 5;
55		//
56		// btnCo nnect
57		//
58		this.btn Connect.Lo cation = n ew System. Drawing.Po int(475, 3 7);
59		this.btn Connect.Na me = "btnC onnect";
60		this.btn Connect.Si ze = new S ystem.Draw ing.Size(7 5, 23);
61		this.btn Connect.Ta bIndex = 6 ;
62		this.btn Connect.Te xt = "Conn ect";
63		this.btn Connect.Us eVisualSty leBackColo r = true;
64		this.btn Connect.Cl ick += new System.Ev entHandler (this.btnC onnect_Cli ck);
65		//
66		// lblMu lConn
67		//
68		this.lbl MulConn.Au toSize = t rue;
69		this.lbl MulConn.Fo nt = new S ystem.Draw ing.Font(" Microsoft Sans Serif ", 10F, Sy stem.Drawi ng.FontSty le.Regular , System.D rawing.Gra phicsUnit. Point, ((b yte)(0)));
70		this.lbl MulConn.Lo cation = n ew System. Drawing.Po int(27, 9) ;
71		this.lbl MulConn.Na me = "lblM ulConn";
72		this.lbl MulConn.Si ze = new S ystem.Draw ing.Size(4 44, 17);
73		this.lbl MulConn.Ta bIndex = 7 ;
74		this.lbl MulConn.Te xt = "Choo se a serve r configur ation from the list, and then select [Co nnect]";
75		//
76		// lblOu tMsg
77		//
78		this.lbl OutMsg.Bac kColor = S ystem.Draw ing.Color. SeaShell;
79		this.lbl OutMsg.Bor derStyle = System.Wi ndows.Form s.BorderSt yle.FixedS ingle;
80		this.lbl OutMsg.Loc ation = ne w System.D rawing.Poi nt(30, 73) ;
81		this.lbl OutMsg.Nam e = "lblOu tMsg";
82		this.lbl OutMsg.Siz e = new Sy stem.Drawi ng.Size(52 0, 236);
83		this.lbl OutMsg.Tab Index = 8;
84		//
85		// WinCR UDOperatio ns
86		//
87		this.Aut oScaleDime nsions = n ew System. Drawing.Si zeF(6F, 13 F);
88		this.Aut oScaleMode = System. Windows.Fo rms.AutoSc aleMode.Fo nt;
89		this.Cli entSize = new System .Drawing.S ize(581, 3 73);
90		this.Con trols.Add( this.lblOu tMsg);
91		this.Con trols.Add( this.lblMu lConn);
92		this.Con trols.Add( this.btnCo nnect);
93		this.Con trols.Add( this.cbxSe rverList);
94		this.Con trols.Add( this.btnEx it);
95		this.Nam e = "WinCR UDOperatio ns";
96		this.Tex t = "Quick Start usin g Windows Forms";
97		this.Res umeLayout( false);
98		this.Per formLayout ();
99
100		}
101
102		#e ndregion
103
104		pr ivate Syst em.Windows .Forms.But ton btnExi t;
105
106		pr ivate Syst em.Windows .Forms.Com boBox cbxS erverList;
107		pr ivate Syst em.Windows .Forms.But ton btnCon nect;
108		pr ivate Syst em.Windows .Forms.Lab el lblMulC onn;
109		pr ivate Syst em.Windows .Forms.Lab el lblOutM sg;
110		}
111		}