553. Araxis Merge File Comparison Report

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

553.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\ModernAndMobileApps\ModernSoapApp Package.appxmanifest Tue Dec 20 19:51:47 2016 UTC
2 Wed Feb 1 19:56:50 2017 UTC

553.2 Comparison summary

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

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

553.4 Active regular expressions

No regular expressions were active.

553.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <Package x mlns="http ://schemas .microsoft .com/appx/ 2010/manif est" xmlns :m2="http: //schemas. microsoft. com/appx/2 013/manife st">        
3     <Identit y Name="01 2a4fa6-d5b f-4a2a-acf 7-a4491cc4 c212" Publ isher="CN= Boss" Vers ion="1.1.0 .0" />        
4     <Propert ies>        
5       <Displ ayName>Mod ernSoapApp </DisplayN ame>        
6       <Publi sherDispla yName>Micr osoft</Pub lisherDisp layName>        
7       <Logo> Assets\Sto reLogo.png </Logo>        
8     </Proper ties>        
9     <Prerequ isites>        
10       <OSMin Version>6. 3.0</OSMin Version>        
11       <OSMax VersionTes ted>6.3.0< /OSMaxVers ionTested>        
12     </Prereq uisites>        
13     <Resourc es>        
14       <Resou rce Langua ge="x-gene rate" />        
15     </Resour ces>        
16     <Applica tions>        
17       <Appli cation Id= "App" Exec utable="$t argetnamet oken$.exe"  EntryPoin t="ModernS oapApp.App ">        
18         <m2: VisualElem ents Displ ayName="Mo dernSoapAp p" Descrip tion="A Wi ndows 8 de sktop mode rn app tha t uses the  SOAP prot ocol to ac cess to th e Dynamics  CRM 2013  organizati on web ser vice. When  run the a pp can que ry the web  services  for a list  of accoun ts or task s." Backgr oundColor= "#ffffff"  Foreground Text="ligh t" Square1 50x150Logo ="Assets\L ogo.png" S quare30x30 Logo="Asse ts\SmallLo go.png">        
19           <m 2:DefaultT ile ShortN ame="CRM L ogo">        
20              <m2:ShowNa meOnTiles>        
21                <m2:Show On Tile="s quare150x1 50Logo" />        
22              </m2:ShowN ameOnTiles >        
23           </ m2:Default Tile>        
24           <m 2:SplashSc reen Image ="Assets\S plashScree n.png" />        
25         </m2 :VisualEle ments>        
26       </Appl ication>        
27     </Applic ations>        
28     <Capabil ities>        
29       <Capab ility Name ="sharedUs erCertific ates" />        
30       <Capab ility Name ="privateN etworkClie ntServer"  />        
31       <Capab ility Name ="enterpri seAuthenti cation" />        
32       <Capab ility Name ="internet Client" />        
33     </Capabi lities>        
34   </Package>