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

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

918.2 Comparison summary

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

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

918.4 Active regular expressions

No regular expressions were active.

918.5 Comparison detail

1   <?xml vers ion="1.0"? >        
2   <configura tion>        
3           <a ppSettings >        
4                    <add  key="numb erofinputt hreads" va lue="5" />        
5                    <add  key="Clie ntSettings Provider.S erviceUri"  value=""  />            
6       <add k ey="Defaul tPackageDe ployerCult ureName" v alue="en-U S"/>        
7                    <add  key="MaxC rmConnecti onTimeOutM inutes" va lue="20"/>        
8           </ appSetting s>        
9           <s ystem.diag nostics>        
10                    <tra ce autoflu sh="true"  />        
11                    <sou rces>        
12                             <sourc e name="Mi crosoft.Xr m.Tooling. Connector. CrmService Client" sw itchName=" Microsoft. Xrm.Toolin g.Connecto r.CrmServi ceClient"  switchType ="System.D iagnostics .SourceSwi tch">        
13                                      <listene rs>        
14                                               <add name= "fileListe ner" />        
15                                      </listen ers>        
16                             </sour ce>        
17                             <sourc e name="Mi crosoft.Xr m.Tooling. CrmConnect Control" s witchName= "Microsoft .Xrm.Tooli ng.CrmConn ectControl " switchTy pe="System .Diagnosti cs.SourceS witch">        
18                                      <listene rs>        
19                                               <add name= "fileListe ner" />        
20                                      </listen ers>        
21                             </sour ce>        
22                             <sourc e name="Pa ckageDeplo yment" swi tchName="P ackageDepl oyment" sw itchType=" System.Dia gnostics.S ourceSwitc h">        
23                                      <listene rs>        
24                                               <add name= "fileListe ner" />        
25                                      </listen ers>        
26                             </sour ce>        
27                             <sourc e name="CR M.Demo.Ext ension" sw itchName=" CRM.Demo.E xtension"  switchType ="System.D iagnostics .SourceSwi tch">        
28                                      <listene rs>        
29                                               <add name= "fileListe ner" />        
30                                      </listen ers>        
31                             </sour ce>        
32                             <sourc e name="Da taMigratio nUtility.I mport" swi tchName="D ataMigrati onUtility. Import" sw itchType=" System.Dia gnostics.S ourceSwitc h">        
33                                      <listene rs>        
34                                               <add name= "fileListe ner" />        
35                                      </listen ers>        
36                             </sour ce>        
37                             <sourc e name="Da taMigratio nUtility.U tility" sw itchName=" DataMigrat ionUtility .Utility"  switchType ="System.D iagnostics .SourceSwi tch">        
38                                      <listene rs>        
39                                               <add name= "fileListe ner" />        
40                                      </listen ers>        
41                             </sour ce>        
42                             <sourc e name="Mi crosoft.Id entityMode l.Clients. ActiveDire ctory" swi tchName="M icrosoft.I dentityMod el.Clients .ActiveDir ectory" sw itchType=" System.Dia gnostics.S ourceSwitc h">        
43                                      <listene rs>        
44                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
45                                               <remove na me="Defaul t" />        
46                                               <add name= "ADALListe ner" />        
47                                      </listen ers>        
48                             </sour ce>        
49                    </so urces>        
50                    <swi tches>        
51                             <!--         
52                                                       Po ssible val ues for sw itches: Of f, Error,  Warining,  Info, Verb ose        
53                                                                         All"         incl udes Error , Warning,  Info, Ver bose, Acti vity Traci ng Trace l evels        
54                                                                         Activi tyTracing:   Just Act ivity Trac ing        
55                                                                         Verbos e:    incl udes Error , Warning,  Info, Tra ce levels        
56                                                                         Info:        incl udes Error , Warning,  Info leve ls        
57                                                                         Warnin g:    incl udes Error , Warning  levels        
58                                                                         Error:       incl udes Error  level        
59                                      -->        
60                             <add n ame="Micro soft.Xrm.T ooling.Con nector.Crm ServiceCli ent" value ="Verbose"  />        
61                             <add n ame="Micro soft.Xrm.T ooling.Crm ConnectCon trol" valu e="Verbose " />        
62                             <add n ame="Packa geDeployme nt" value= "Verbose"  />        
63                             <add n ame="CRM.D emo.Extens ion" value ="Verbose"  />        
64                             <add n ame="DataM igrationUt ility.Util ity" value ="Verbose"  />        
65                             <add n ame="DataM igrationUt ility.Impo rt" value= "Verbose"  />        
66                             <add n ame="Micro soft.Ident ityModel.C lients.Act iveDirecto ry" value= "Error" />        
67                    </sw itches>        
68                    <sha redListene rs>        
69                             <add n ame="fileL istener"        
70                                               type="Micr osoft.Xrm. Tooling.Co nnector.Dy namicsFile LogTraceLi stener, Mi crosoft.Xr m.Tooling. Connector"        
71                                               BaseFileNa me="Packag eDeployer"        
72                                                Location= "LocalUser Applicatio nDirectory " MaxFileS ize ="5242 8800"        
73                                                />        
74                             <add n ame="ADALL istener"        
75                    type ="Microsof t.Xrm.Tool ing.Connec tor.Dynami csFileLogT raceListen er, Micros oft.Xrm.To oling.Conn ector"        
76                    Base FileName=" ADAL"        
77                     Loc ation="Loc alUserAppl icationDir ectory" Ma xFileSize= "52428800"        
78               />        
79                    </sh aredListen ers>        
80           </ system.dia gnostics>        
81           <s tartup>        
82                    <sup portedRunt ime versio n="v4.0" s ku=".NETFr amework,Ve rsion=v4.0 " />        
83           </ startup>        
84           <s ystem.web>        
85                    <mem bership de faultProvi der="Clien tAuthentic ationMembe rshipProvi der">        
86                             <provi ders>        
87                                      <add nam e="ClientA uthenticat ionMembers hipProvide r" type="S ystem.Web. ClientServ ices.Provi ders.Clien tFormsAuth entication Membership Provider,  System.Web .Extension s, Version =4.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35"  serviceUri ="" />        
88                             </prov iders>        
89                    </me mbership>        
90                    <rol eManager d efaultProv ider="Clie ntRoleProv ider" enab led="true" >        
91                             <provi ders>        
92                                      <add nam e="ClientR oleProvide r" type="S ystem.Web. ClientServ ices.Provi ders.Clien tRoleProvi der, Syste m.Web.Exte nsions, Ve rsion=4.0. 0.0, Cultu re=neutral , PublicKe yToken=31b f3856ad364 e35" servi ceUri="" c acheTimeou t="86400"  />        
93                             </prov iders>        
94                    </ro leManager>        
95           </ system.web >        
96     <runtime >        
97       <assem blyBinding  xmlns="ur n:schemas- microsoft- com:asm.v1 ">        
98         <dep endentAsse mbly>        
99           <a ssemblyIde ntity name ="Microsof t.Crm.Sdk"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l"/>        
100           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
101         </de pendentAss embly>        
102         <dep endentAsse mbly>        
103           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l"/>        
104           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
105         </de pendentAss embly>        
106         <dep endentAsse mbly>        
107           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Workflow"  publicKeyT oken="31bf 3856ad364e 35" cultur e="neutral "/>        
108           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
109         </de pendentAss embly>        
110         <dep endentAsse mbly>        
111           <a ssemblyIde ntity name ="Microsof t.Crm.Sdk. Proxy" pub licKeyToke n="31bf385 6ad364e35"  culture=" neutral"/>        
112           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
113         </de pendentAss embly>        
114         <dep endentAsse mbly>        
115           <a ssemblyIde ntity name ="Microsof t.Xrm.Sdk. Deployment " publicKe yToken="31 bf3856ad36 4e35" cult ure="neutr al"/>        
116           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
117         </de pendentAss embly>        
118         <dep endentAsse mbly>        
119           <a ssemblyIde ntity name ="Microsof t.Crm.Work flow" publ icKeyToken ="31bf3856 ad364e35"  culture="n eutral"/>        
120           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
121         </de pendentAss embly>        
122         <dep endentAsse mbly>        
123           <a ssemblyIde ntity name ="Microsof t.Crm" pub licKeyToke n="31bf385 6ad364e35"  culture=" neutral"/>        
124           <b indingRedi rect oldVe rsion="4.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
125         </de pendentAss embly>        
126         <dep endentAsse mbly>        
127           <a ssemblyIde ntity name ="Microsof t.Crm.Util ities" pub licKeyToke n="31bf385 6ad364e35"  culture=" neutral"/>        
128           <b indingRedi rect oldVe rsion="5.0 .0.0-8.0.0 .0" newVer sion="8.0. 0.0"/>        
129         </de pendentAss embly>        
130         <dep endentAsse mbly>        
131           <a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Connec tor" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
132           <b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="2.2 .0.0"/>        
133         </de pendentAss embly>        
134         <dep endentAsse mbly>        
135           <a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.CrmCon nectContro l" publicK eyToken="3 1bf3856ad3 64e35" cul ture="neut ral"/>        
136           <b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="2.2 .0.0"/>        
137         </de pendentAss embly>        
138         <dep endentAsse mbly>        
139           <a ssemblyIde ntity name ="Microsof t.Xrm.Tool ing.Ui.Sty les" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
140           <b indingRedi rect oldVe rsion="1.0 .0.0-99.0. 0.0" newVe rsion="3.0 .0.0"/>        
141         </de pendentAss embly>        
142       </asse mblyBindin g>        
143     </runtim e>        
144   </configur ation>