846. Araxis Merge File Comparison Report

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

846.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\ConfigurationMigration DataMigrationUtility.exe.config Tue Dec 20 19:52:14 2016 UTC
2 Wed Feb 1 19:57:16 2017 UTC

846.2 Comparison summary

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

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

846.4 Active regular expressions

No regular expressions were active.

846.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <configura tion>        
3           <s ystem.diag nostics>        
4                    <tra ce autoflu sh="true"  />        
5                    <sou rces>        
6                             <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">        
7                                      <listene rs>        
8                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
9                                               <remove na me="Defaul t" />        
10                                               <add name= "fileListe ner" />        
11                                      </listen ers>        
12                             </sour ce>        
13                             <sourc e name="Mi crosoft.Xr m.Tooling. Connector. CrmConnect Control" s witchName= "Microsoft .Xrm.Tooli ng.Connect or.CrmConn ectControl " switchTy pe="System .Diagnosti cs.SourceS witch">        
14                                      <listene rs>        
15                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
16                                               <remove na me="Defaul t" />        
17                                               <add name= "fileListe ner" />        
18                                      </listen ers>        
19                             </sour ce>        
20                             <sourc e name="Da taMigratio nUtility.U tility" sw itchName=" DataMigrat ionUtility .Utility"  switchType ="System.D iagnostics .SourceSwi tch">        
21                                      <listene rs>        
22                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
23                                               <remove na me="Defaul t" />        
24                                               <add name= "fileListe ner" />        
25                                      </listen ers>        
26                             </sour ce>        
27                             <sourc e name="Da taMigratio nUtility.I mport" swi tchName="D ataMigrati onUtility. Import" sw itchType=" System.Dia gnostics.S ourceSwitc h">        
28                                      <listene rs>        
29                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
30                                               <remove na me="Defaul t" />        
31                                               <add name= "fileListe ner" />        
32                                      </listen ers>        
33                             </sour ce>        
34                             <sourc e name="Da taMigratio nUtility.E xport" swi tchName="D ataMigrati onUtility. Export" sw itchType=" System.Dia gnostics.S ourceSwitc h">        
35                                      <listene rs>        
36                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
37                                               <remove na me="Defaul t" />        
38                                               <add name= "fileListe ner" />        
39                                      </listen ers>        
40                             </sour ce>        
41                             <sourc e name="Da taMigratio nUtility"  switchName ="DataMigr ationUtili ty" switch Type="Syst em.Diagnos tics.Sourc eSwitch">        
42                                      <listene rs>        
43                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
44                                               <remove na me="Defaul t" />        
45                                               <add name= "fileListe ner" />        
46                                      </listen ers>        
47                             </sour ce>        
48                             <sourc e name="Da taMigCommo n.Utility"  switchNam e="DataMig Common.Uti lity" swit chType="Sy stem.Diagn ostics.Sou rceSwitch" >        
49                                      <listene rs>        
50                                               <add name= "fileListe ner" />        
51                                      </listen ers>        
52                             </sour ce>        
53                             <!-- W CF DEBUG S OURCES -->        
54                             <sourc e name="Sy stem.Ident ityModel"  switchName ="System.I dentityMod el">        
55                                      <listene rs>        
56                                               <add name= "xml" />        
57                                      </listen ers>        
58                             </sour ce>        
59                             <!-- L og all mes sages in t he 'Messag es' tab of  SvcTraceV iewer. -->        
60                             <sourc e name="Sy stem.Servi ceModel.Me ssageLoggi ng" switch Name="Syst em.Service Model.Mess ageLogging ">        
61                                      <listene rs>        
62                                               <add name= "xml" />        
63                                      </listen ers>        
64                             </sour ce>        
65                             <!-- A ctivityTra cing and p ropogateAc tivity are  used to f lesh out t he 'Activi ties' tab  in        
66                                                SvcTraceV iewer to a id debuggi ng. -->        
67                             <sourc e name="Sy stem.Servi ceModel" s witchName= "System.Se rviceModel " propagat eActivity= "true">        
68                                      <listene rs>        
69                                               <add name= "xml" />        
70                                      </listen ers>        
71                             </sour ce>        
72                             <!-- E ND WCF DEB UG SOURCES  -->        
73                             <!-- S witch  to  control AD AL Token t racing-->        
74                             <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">        
75                                      <listene rs>        
76                                               <add name= "console"  type="Syst em.Diagnos tics.Defau ltTraceLis tener" />        
77                                               <remove na me="Defaul t" />        
78                                               <add name= "ADALListe ner" />        
79                                      </listen ers>        
80                             </sour ce>        
81                             <!-- E ND of ADAL  Token tra cing-->        
82                    </so urces>        
83                    <swi tches>        
84                             <!--         
85                                                       Po ssible val ues for sw itches: Of f, Error,  Warning, I nfo, Verbo se        
86                                                                         All :  everything        
87                                                                         Verbos e:    incl udes Error , Warning,  Info, Tra ce levels        
88                                                                         Info:        incl udes Error , Warning,  Info leve ls        
89                                                                         Warnin g:    incl udes Error , Warning  levels        
90                                                                         Error:       incl udes Error  level        
91                                      -->        
92                             <add n ame="DataM igrationUt ility" val ue="Error"  />        
93                             <add n ame="Micro soft.Xrm.T ooling.Con nector.Crm ServiceCli ent" value ="Error" / >        
94                             <add n ame="Micro soft.Xrm.T ooling.Con nector.Crm ConnectCon trol" valu e="Error"  />        
95                             <add n ame="DataM igrationUt ility.Util ity" value ="Error" / >        
96                             <add n ame="DataM igrationUt ility.Impo rt" value= "Error" />        
97                             <add n ame="DataM igrationUt ility.Expo rt" value= "Error" />        
98                             <add n ame="Micro soft.Ident ityModel.C lients.Act iveDirecto ry" value= "Error" />        
99                             <!--<a dd name="S ystem.Iden tityModel"  value="Ve rbose"/>        
100                             <add n ame="Syste m.ServiceM odel.Messa geLogging"  value="Ve rbose"/>        
101                             <add n ame="Syste m.ServiceM odel" valu e="Error,  ActivityTr acing"/>-- >        
102                    </sw itches>        
103                    <sha redListene rs>        
104                             <add n ame="fileL istener"        
105        type= "Microsoft .Xrm.Tooli ng.Connect or.Dynamic sFileLogTr aceListene r, Microso ft.Xrm.Too ling.Conne ctor"        
106        BaseF ileName="D ataMigrati onUtility"        
107         Loca tion="Loca lUserAppli cationDire ctory" Max FileSize=" 52428800"        
108         />        
109                             <!--<a dd name="e ventLogLis tener" typ e="System. Diagnostic s.EventLog TraceListe ner" initi alizeData= "CRM UII"/ >-->        
110                             <add n ame="xml"  type="Syst em.Diagnos tics.XmlWr iterTraceL istener" i nitializeD ata="CrmUI I.svclog"  />        
111                                               <add name= "ADALListe ner"        
112        type= "Microsoft .Xrm.Tooli ng.Connect or.Dynamic sFileLogTr aceListene r, Microso ft.Xrm.Too ling.Conne ctor"        
113        BaseF ileName="A DAL"        
114         Loca tion="Loca lUserAppli cationDire ctory" Max FileSize=" 52428800"        
115         />        
116          
117                    </sh aredListen ers>        
118           </ system.dia gnostics>        
119           <s ystem.wind ows.forms  jitDebuggi ng="true"  />        
120           <a ppSettings >        
121     <add key ="numberof inputthrea ds" value= "5" />        
122     <add key ="ClientSe ttingsProv ider.Servi ceUri" val ue="" />        
123     <add key ="SupportU ri" value= "http://ww w.microsof t.com/en-u s/dynamics /support.a spx" />        
124     <add key ="emailSup portUri" v alue="mail to:someone @example.c om" />        
125     <add key ="MaxCrmCo nnectionTi meOutMinut es" value= "20" />        
126     <add key ="CrmDeplo ymentType"  value="O3 65" />        
127     <add key ="CrmUseSS L" value=" False" />        
128     <add key ="CrmOrg"  value="rsq uarestore"  />        
129     <add key ="CrmPort"  value=""  />        
130     <add key ="CrmServe rName" val ue="" />        
131     <add key ="UseDefau ltCreds" v alue="Fals e" />        
132     <add key ="CacheCre dentials"  value="Tru e" />        
133     <add key ="CrmOnlin eRegion" v alue="Nort hAmerica"  />        
134     <add key ="AuthHome Realm" val ue="Active  Directory " />        
135     <add key ="AskForOr g" value=" False" />        
136     <add key ="CrmDomai n" value=" " />        
137     <add key ="Advanced Check" val ue="True"  />        
138     <add key ="UserId"  value="tu@ rsquaresto re.onmicro soft.com"  />        
139     <add key ="Authorit y" value=" https://lo gin.window s.net/0c73 5f43-f634- 461f-bd71- 0fff804181 90/oauth2/ authorize/ " />        
140    </appSett ings>        
141           <s tartup>        
142                    <sup portedRunt ime versio n="v4.0" s ku=".NETFr amework,Ve rsion=v4.0 " />        
143           </ startup>        
144           <s ystem.web>        
145                    <mem bership de faultProvi der="Clien tAuthentic ationMembe rshipProvi der">        
146                             <provi ders>        
147                                      <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 ="" />        
148                             </prov iders>        
149                    </me mbership>        
150                    <rol eManager d efaultProv ider="Clie ntRoleProv ider" enab led="true" >        
151                             <provi ders>        
152                                      <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"  />        
153                             </prov iders>        
154                    </ro leManager>        
155           </ system.web >        
156           <r untime>        
157                    <ass emblyBindi ng xmlns=" urn:schema s-microsof t-com:asm. v1">        
158                             <depen dentAssemb ly>        
159                                      <assembl yIdentity  name="Micr osoft.Crm. Sdk" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
160                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
161                             </depe ndentAssem bly>        
162                             <depen dentAssemb ly>        
163                                      <assembl yIdentity  name="Micr osoft.Xrm. Sdk" publi cKeyToken= "31bf3856a d364e35" c ulture="ne utral"/>        
164                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
165                             </depe ndentAssem bly>        
166                             <depen dentAssemb ly>        
167                                      <assembl yIdentity  name="Micr osoft.Xrm. Sdk.Workfl ow" public KeyToken=" 31bf3856ad 364e35" cu lture="neu tral"/>        
168                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
169                             </depe ndentAssem bly>        
170                             <depen dentAssemb ly>        
171                                      <assembl yIdentity  name="Micr osoft.Crm. Sdk.Proxy"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l"/>        
172                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
173                             </depe ndentAssem bly>        
174                             <depen dentAssemb ly>        
175                                      <assembl yIdentity  name="Micr osoft.Xrm. Sdk.Deploy ment" publ icKeyToken ="31bf3856 ad364e35"  culture="n eutral"/>        
176                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
177                             </depe ndentAssem bly>        
178                             <depen dentAssemb ly>        
179                                      <assembl yIdentity  name="Micr osoft.Crm. Workflow"  publicKeyT oken="31bf 3856ad364e 35" cultur e="neutral "/>        
180                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
181                             </depe ndentAssem bly>        
182                             <depen dentAssemb ly>        
183                                      <assembl yIdentity  name="Micr osoft.Crm"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l"/>        
184                                      <binding Redirect o ldVersion= "4.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
185                             </depe ndentAssem bly>        
186                             <depen dentAssemb ly>        
187                                      <assembl yIdentity  name="Micr osoft.Crm. Utilities"  publicKey Token="31b f3856ad364 e35" cultu re="neutra l"/>        
188                                      <binding Redirect o ldVersion= "5.0.0.0-8 .0.0.0" ne wVersion=" 8.0.0.0"/>        
189                             </depe ndentAssem bly>        
190                    </as semblyBind ing>        
191           </ runtime>        
192   </configur ation>