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

637.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 app.config Tue Dec 20 19:51:42 2016 UTC
2 Wed Feb 1 19:56:54 2017 UTC

637.2 Comparison summary

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

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

637.4 Active regular expressions

No regular expressions were active.

637.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <configura tion>        
3     <connect ionStrings >        
4       <!-- O nline usin g Office 3 65 -->        
5       <!-- < add name=" Server=CRM  Online, o rganizatio n=contoso,  user=some one"        
6            c onnectionS tring="Url =https://c ontoso.crm .dynamics. com; Usern ame=someon e@contoso. onmicrosof t.com; Pas sword=pass word; auth type=Offic e365"/> -- >        
7               
8       <!-- O n-premises  with prov ided user  credential s -->        
9       <!-- < add name=" Server=mys erver, org anization= AdventureW orksCycle,  user=admi nistrator"        
10            c onnectionS tring="Url =http://my server/Adv entureWork sCycle; Do main=mydom ain; Usern ame=admini strator; P assword=pa ssword; au thtype=AD" /> -->        
11          
12       <!-- O n-premises  using Win dows integ rated secu rity -->        
13       <!-- < add name=" Server=mys erver, org anization= AdventureW orksCycle"        
14            c onnectionS tring="Url =http://my server/Adv entureWork sCycle; au thtype=AD" /> -->        
15          
16       <!-- O n-Premises  (IFD) wit h claims - ->        
17       <!--<a dd name="S erver=litw are.com, o rganizatio n=contoso,  user=some one@litwar e.com"        
18            c onnectionS tring="Url =https://c ontoso.lit ware.com;  Username=s omeone@lit ware.com;  Password=p assword; a uthtype=IF D"/>-->        
19     </connec tionString s>        
20     <startup >        
21       <suppo rtedRuntim e version= "v4.0" sku =".NETFram ework,Vers ion=v4.5.2 " />        
22     </startu p>        
23   <system.di agnostics>        
24       <trace  autoflush ="true"/>        
25       <sourc es>        
26         <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">        
27           <l isteners>        
28              <add name= "console"  type="Syst em.Diagnos tics.Conso leTraceLis tener"/>        
29              <add name= "fileListe ner"/>        
30           </ listeners>        
31         </so urce>        
32         <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">        
33           <l isteners>        
34              <add name= "console"  type="Syst em.Diagnos tics.Conso leTraceLis tener"/>        
35              <add name= "fileListe ner"/>        
36           </ listeners>        
37         </so urce>        
38         <sou rce name=" CrmSvcUtil " switchNa me="CrmSvc Util" swit chType="Sy stem.Diagn ostics.Sou rceSwitch" >        
39           <l isteners>        
40              <add name= "console"  type="Syst em.Diagnos tics.Conso leTraceLis tener"/>        
41              <add name= "fileListe ner"/>        
42           </ listeners>        
43         </so urce>        
44       </sour ces>        
45       <switc hes>        
46          
47         <!-- Possible v alues for  switches:  Off, Error , Warning,  Informati on, Verbos e        
48                                                       Ve rbose:       includes  Error, Wa rning, Inf o, Trace l evels        
49                                                       In formation:   includes  Error, Wa rning, Inf o levels        
50                                                       Wa rning:       includes  Error, Wa rning leve ls        
51                                                       Er ror:         includes  Error lev el-->        
52          
53         <add  name="Mic rosoft.Xrm .Tooling.C rmConnectC ontrol" va lue="Off"/ >        
54         <add  name="Mic rosoft.Xrm .Tooling.C onnector.C rmServiceC lient" val ue="Error" />        
55         <add  name="Crm SvcUtil" v alue="Off" />        
56       </swit ches>        
57          
58       <share dListeners >        
59         <add  name="fil eListener"  type="Sys tem.Diagno stics.Text WriterTrac eListener"  initializ eData="Crm SvcUtil.lo g"/>        
60       </shar edListener s>        
61          
62     </system .diagnosti cs>        
63     <runtime >        
64       <assem blyBinding  xmlns="ur n:schemas- microsoft- com:asm.v1 ">        
65         <dep endentAsse mbly>        
66           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l" />        
67           <b indingRedi rect oldVe rsion="0.0 .0.0-7.0.0 .0" newVer sion="8.0. 0.0" />        
68         </de pendentAss embly>        
69         <dep endentAsse mbly>        
70           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Deployment " publicKe yToken="31 bf3856ad36 4e35" cult ure="neutr al" />        
71           <b indingRedi rect oldVe rsion="0.0 .0.0-7.0.0 .0" newVer sion="8.0. 0.0" />        
72         </de pendentAss embly>        
73         <dep endentAsse mbly>        
74           <a ssemblyIde ntity name ="Microsof t.ServiceB us" public KeyToken=" 31bf3856ad 364e35" cu lture="neu tral" />        
75           <b indingRedi rect oldVe rsion="0.0 .0.0-2.4.0 .0" newVer sion="2.4. 0.0" />        
76         </de pendentAss embly>        
77       </asse mblyBindin g>        
78     </runtim e>        
79   </configur ation>