921. Araxis Merge File Comparison Report

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

921.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\PluginRegistration PluginRegistration.exe.config Tue Dec 20 19:52:26 2016 UTC
2 Wed Feb 1 19:57:27 2017 UTC

921.2 Comparison summary

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

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

921.4 Active regular expressions

No regular expressions were active.

921.5 Comparison detail

1   <?xml vers ion="1.0"? >        
2   <configura tion>        
3     <system. diagnostic s>        
4       <trace  autoflush ="true"/>        
5       <sourc es>        
6         <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">        
7           <l isteners>        
8              <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener"/>        
9              <remove na me="Defaul t"/>        
10              <add name= "fileListe ner"/>        
11           </ listeners>        
12         </so urce>        
13         <sou rce name=" Microsoft. Xrm.Toolin g.WebResou rceUtility " switchNa me="Micros oft.Xrm.To oling.WebR esourceUti lity" swit chType="Sy stem.Diagn ostics.Sou rceSwitch" >        
14           <l isteners>        
15              <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener"/>        
16              <remove na me="Defaul t"/>        
17              <add name= "fileListe ner"/>        
18           </ listeners>        
19         </so urce>        
20         <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">        
21           <l isteners>        
22              <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener"/>        
23              <remove na me="Defaul t"/>        
24              <add name= "fileListe ner"/>        
25           </ listeners>        
26         </so urce>        
27       </sour ces>        
28       <switc hes>        
29         <!--          
30                                      Possible  values fo r switches : Off, Err or, Warnin g, Informa tion, Verb ose        
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="Verbo se"/>        
37         <add  name="Mic rosoft.Xrm .Tooling.C onnector.C rmServiceC lient" val ue="Verbos e"/>        
38         <add  name="Mic rosoft.Xrm .Tooling.W ebResource Utility" v alue="Erro r"/>        
39       </swit ches>        
40       <share dListeners >        
41         <add  name="fil eListener"  type="Mic rosoft.Xrm .Tooling.C onnector.D ynamicsFil eLogTraceL istener, M icrosoft.X rm.Tooling .Connector " BaseFile Name="Plug inRegistra tionTool"  Location=" LocalUserA pplication Directory" />        
42       </shar edListener s>        
43     </system .diagnosti cs>        
44          
45     <appSett ings>        
46       <add k ey="MaxCrm Connection TimeOutMin utes" valu e="20"/>            
47     </appSet tings>        
48     <startup ><supporte dRuntime v ersion="v4 .0" sku=". NETFramewo rk,Version =v4.5.2"/> </startup>        
49          
50     <runtime >        
51       <assem blyBinding  xmlns="ur n:schemas- microsoft- com:asm.v1 ">        
52         <dep endentAsse mbly>        
53           <a ssemblyIde ntity name ="Microsof t.Crm.Sdk"        
54                                pub licKeyToke n="31bf385 6ad364e35"        
55                                cul ture="neut ral" />        
56           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
57                               newV ersion="8. 0.0.0"/>        
58         </de pendentAss embly>        
59         <dep endentAsse mbly>        
60           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk"        
61                                pub licKeyToke n="31bf385 6ad364e35"        
62                                cul ture="neut ral" />        
63           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
64                               newV ersion="8. 0.0.0"/>        
65         </de pendentAss embly>        
66         <dep endentAsse mbly>        
67           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Workflow"        
68                                pub licKeyToke n="31bf385 6ad364e35"        
69                                cul ture="neut ral" />        
70           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
71                               newV ersion="8. 0.0.0"/>        
72         </de pendentAss embly>        
73         <dep endentAsse mbly>        
74           <a ssemblyIde ntity name ="Microsof t.Crm.Sdk. Proxy"        
75                                pub licKeyToke n="31bf385 6ad364e35"        
76                                cul ture="neut ral" />        
77           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
78                               newV ersion="8. 0.0.0"/>        
79         </de pendentAss embly>        
80         <dep endentAsse mbly>        
81           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Deployment "        
82                                pub licKeyToke n="31bf385 6ad364e35"        
83                                cul ture="neut ral" />        
84           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
85                               newV ersion="8. 0.0.0"/>        
86         </de pendentAss embly>        
87         <dep endentAsse mbly>        
88           <a ssemblyIde ntity name ="Microsof t.Crm.Work flow"        
89                                pub licKeyToke n="31bf385 6ad364e35"        
90                                cul ture="neut ral" />        
91           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
92                               newV ersion="8. 0.0.0"/>        
93         </de pendentAss embly>        
94         <dep endentAsse mbly>        
95           <a ssemblyIde ntity name ="Microsof t.Crm"        
96                                pub licKeyToke n="31bf385 6ad364e35"        
97                                cul ture="neut ral" />        
98           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0"        
99                               newV ersion="8. 0.0.0"/>        
100         </de pendentAss embly>        
101       <depen dentAssemb ly>        
102           <a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Connec tor" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
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.CrmCon nectContro l" publicK eyToken="3 1bf3856ad3 64e35" cul ture="neut ral"/>        
107           <b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="2.2 .0.0"/>        
108         </de pendentAss embly>        
109         <dep endentAsse mbly>        
110           <a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Ui.Sty les" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
111           <b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="3.0 .0.0"/>        
112         </de pendentAss embly>        
113       </asse mblyBindin g>        
114     </runtim e>        
115             
116   </configur ation>        

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.