963. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2/1/2017 2:57:37 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.

963.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\Tools	CrmSvcUtil.exe.config	Tue Dec 20 19:51:52 2016 UTC
2			Wed Feb 1 19:57:37 2017 UTC

963.2 Comparison summary

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

963.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

963.4 Active regular expressions

No regular expressions were active.

963.5 Comparison detail

1		<?xml vers ion="1.0" encoding=" utf-8"?>
2		<configura tion>
3		<appSett ings>
4		<add k ey="MaxCrm Connection TimeOutMin utes" valu e="20"/>
5		</appSet tings>
6		<system. diagnostic s>
7		<trace autoflush ="true"/>
8		<sourc es>
9		<sou rce name=" Microsoft. Xrm.Toolin g.Connecto r.CrmServi ceClient" switchName ="Microsof t.Xrm.Tool ing.Connec tor.CrmSer viceClient " switchTy pe="System .Diagnosti cs.SourceS witch">
10		<l isteners>
11		<add name= "console" type="Syst em.Diagnos tics.Conso leTraceLis tener"/>
12		<add name= "fileListe ner"/>
13		</ listeners>
14		</so urce>
15		<sou rce name=" Microsoft. Xrm.Toolin g.CrmConne ctControl" switchNam e="Microso ft.Xrm.Too ling.CrmCo nnectContr ol" switch Type="Syst em.Diagnos tics.Sourc eSwitch">
16		<l isteners>
17		<add name= "console" type="Syst em.Diagnos tics.Conso leTraceLis tener"/>
18		<add name= "fileListe ner"/>
19		</ listeners>
20		</so urce>
21		<sou rce name=" CrmSvcUtil " switchNa me="CrmSvc Util" swit chType="Sy stem.Diagn ostics.Sou rceSwitch" >
22		<l isteners>
23		<add name= "console" type="Syst em.Diagnos tics.Conso leTraceLis tener"/>
24		<add name= "fileListe ner"/>
25		</ listeners>
26		</so urce>
27		</sour ces>
28		<switc hes>
29
30		<!-- Possible v alues for switches: Off, Error , Warning, Informati on, Verbos e
31		Ve rbose: includes Error, Wa rning, Inf o, Trace l evels
32		In formation: includes Error, Wa rning, Inf o levels
33		Wa rning: includes Error, Wa rning leve ls
34		Er ror: includes Error lev el-->
35
36		<add name="Mic rosoft.Xrm .Tooling.C rmConnectC ontrol" va lue="Error "/>
37		<add name="Mic rosoft.Xrm .Tooling.C onnector.C rmServiceC lient" val ue="Error" />
38		<add name="Crm SvcUtil" v alue="Erro r"/>
39		</swit ches>
40
41		<share dListeners >
42		<add name="fil eListener" type="Sys tem.Diagno stics.Text WriterTrac eListener" initializ eData="Crm SvcUtil.lo g"/>
43		</shar edListener s>
44
45		</system .diagnosti cs>
46		<runtime >
47		<assem blyBinding xmlns="ur n:schemas- microsoft- com:asm.v1 ">
48		<dep endentAsse mbly>
49		<a ssemblyIde ntity name ="Microsof t.Crm.Sdk"
50		pub licKeyToke n="31bf385 6ad364e35"
51		cul ture="neut ral" />
52		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
53		newV ersion="8. 0.0.0"/>
54		</de pendentAss embly>
55		<dep endentAsse mbly>
56		<a ssemblyIde ntity name ="Microsof t.Xrm.Sdk"
57		pub licKeyToke n="31bf385 6ad364e35"
58		cul ture="neut ral" />
59		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
60		newV ersion="8. 0.0.0"/>
61		</de pendentAss embly>
62		<dep endentAsse mbly>
63		<a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Workflow"
64		pub licKeyToke n="31bf385 6ad364e35"
65		cul ture="neut ral" />
66		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
67		newV ersion="8. 0.0.0"/>
68		</de pendentAss embly>
69		<dep endentAsse mbly>
70		<a ssemblyIde ntity name ="Microsof t.Crm.Sdk. Proxy"
71		pub licKeyToke n="31bf385 6ad364e35"
72		cul ture="neut ral" />
73		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
74		newV ersion="8. 0.0.0"/>
75		</de pendentAss embly>
76		<dep endentAsse mbly>
77		<a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Deployment "
78		pub licKeyToke n="31bf385 6ad364e35"
79		cul ture="neut ral" />
80		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
81		newV ersion="8. 0.0.0"/>
82		</de pendentAss embly>
83		<dep endentAsse mbly>
84		<a ssemblyIde ntity name ="Microsof t.Crm.Work flow"
85		pub licKeyToke n="31bf385 6ad364e35"
86		cul ture="neut ral" />
87		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
88		newV ersion="8. 0.0.0"/>
89		</de pendentAss embly>
90		<dep endentAsse mbly>
91		<a ssemblyIde ntity name ="Microsof t.Crm"
92		pub licKeyToke n="31bf385 6ad364e35"
93		cul ture="neut ral" />
94		<b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"
95		newV ersion="8. 0.0.0"/>
96		</de pendentAss embly>
97		<dep endentAsse mbly>
98		<a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Connec tor" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>
99		<b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="2.2 .0.0"/>
100		</de pendentAss embly>
101		<dep endentAsse mbly>
102		<a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.CrmCon nectContro l" publicK eyToken="3 1bf3856ad3 64e35" cul ture="neut ral"/>
103		<b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="2.2 .0.0"/>
104		</de pendentAss embly>
105		<dep endentAsse mbly>
106		<a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Ui.Sty les" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>
107		<b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="3.0 .0.0"/>
108		</de pendentAss embly>
109		</asse mblyBindin g>
110		</runtim e>
111		<startup >
112		<suppo rtedRuntim e version= "v4.0" sku =".NETFram ework,Vers ion=v4.5.2 "/>
113		</startu p>
114		</configur ation>