703. Araxis Merge File Comparison Report

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

703.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\XRMTooling\QuickStartXRMToolingWPFClient App.config Tue Dec 20 19:51:43 2016 UTC
2 Wed Feb 1 19:56:57 2017 UTC

703.2 Comparison summary

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

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

703.4 Active regular expressions

No regular expressions were active.

703.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
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="Error " />        
37         <add  name="Mic rosoft.Xrm .Tooling.C onnector.C rmServiceC lient" val ue="Error"  />        
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="Sys tem.Diagno stics.Text WriterTrac eListener"  initializ eData="Qui ckStartXRM ToolingWPF Client.log " />        
42       </shar edListener s>        
43     </system .diagnosti cs>        
44          
45     <startup        
46           <s upportedRu ntime vers ion="v4.0"  sku=".NET Framework, Version=v4 .5" />        
47       </star tup>        
48     <runtime >        
49       <assem blyBinding  xmlns="ur n:schemas- microsoft- com:asm.v1 ">        
50         <dep endentAsse mbly>        
51           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l" />        
52           <b indingRedi rect oldVe rsion="0.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0" />        
53         </de pendentAss embly>        
54         <dep endentAsse mbly>        
55           <a ssemblyIde ntity name ="Microsof t.Crm.Sdk. Proxy" pub licKeyToke n="31bf385 6ad364e35"  culture=" neutral" / >        
56           <b indingRedi rect oldVe rsion="0.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0" />        
57         </de pendentAss embly>        
58         <dep endentAsse mbly>        
59           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Deployment " publicKe yToken="31 bf3856ad36 4e35" cult ure="neutr al" />        
60           <b indingRedi rect oldVe rsion="0.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0" />        
61         </de pendentAss embly>        
62         <dep endentAsse mbly>        
63           <a ssemblyIde ntity name ="Microsof t.Identity Model.Clie nts.Active Directory"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l" />        
64           <b indingRedi rect oldVe rsion="0.0 .0.0-2.19. 0.0" newVe rsion="2.1 9.0.0" />        
65         </de pendentAss embly>        
66         <dep endentAsse mbly>        
67           <a ssemblyIde ntity name ="Microsof t.Identity Model.Clie nts.Active Directory. WindowsFor ms" public KeyToken=" 31bf3856ad 364e35" cu lture="neu tral" />        
68           <b indingRedi rect oldVe rsion="0.0 .0.0-2.19. 0.0" newVe rsion="2.1 9.0.0" />        
69         </de pendentAss embly>        
70       </asse mblyBindin g>        
71     </runtim e>        
72   </configur ation>