514. Araxis Merge File Comparison Report

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

514.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\ModernOdataApp\Views	TasksView.xaml	Tue Dec 20 19:51:47 2016 UTC
2			Wed Feb 1 19:56:49 2017 UTC

514.2 Comparison summary

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

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

514.4 Active regular expressions

No regular expressions were active.

514.5 Comparison detail

1		<common:La youtAwareP age
2		x:Name ="pageRoot "
3		x:Clas s="ModernO dataApp.Vi ews.Tasks"
4		DataCo ntext="{Bi nding Defa ultViewMod el, Relati veSource={ RelativeSo urce Self} }"
5		xmlns= "http://sc hemas.micr osoft.com/ winfx/2006 /xaml/pres entation"
6		xmlns: x="http:// schemas.mi crosoft.co m/winfx/20 06/xaml"
7		xmlns: local="usi ng:ModernO dataApp.Vi ews"
8		xmlns: common="us ing:Modern OdataApp.C ommon"
9		xmlns: d="http:// schemas.mi crosoft.co m/expressi on/blend/2 008"
10		xmlns: mc="http:/ /schemas.o penxmlform ats.org/ma rkup-compa tibility/2 006"
11		mc:Ign orable="d" >
12
13		<Page. Resources>
14
15		<! -- TODO: D elete this line if t he key App Name is de clared in App.xaml - ->
16		<x :String x: Key="AppNa me">My App lication</ x:String>
17		</Page .Resources >
18
19		<!--
20		Th is grid ac ts as a ro ot panel f or the pag e that def ines two r ows:
21		* Row 0 cont ains the b ack button and page title
22		* Row 1 cont ains the r est of the page layo ut
23		-->
24		<Grid Style="{St aticResour ce LayoutR ootStyle}" >
25		<G rid.RowDef initions>
26		<RowDefi nition Hei ght="140"/ >
27		<RowDefi nition Hei ght="*"/>
28		</ Grid.RowDe finitions>
29
30		<! -- Back bu tton and p age title -->
31		<G rid>
32		<Grid.Co lumnDefini tions>
33		<Col umnDefinit ion Width= "Auto"/>
34		<Col umnDefinit ion Width= "*"/>
35		</Grid.C olumnDefin itions>
36		<Button x:Name="ba ckButton" Click="GoB ack" IsEna bled="{Bin ding Frame .CanGoBack , ElementN ame=pageRo ot}" Style ="{StaticR esource Ba ckButtonSt yle}"/>
37		<TextBlo ck x:Name= "pageTitle " Grid.Col umn="1" Te xt="Tasks" Style="{S taticResou rce PageHe aderTextSt yle}"/>
38		</ Grid>
39
40		<G rid x:Name ="ContentP anel" Grid .Row="1" M argin="50, 10">
41		<Progres sBar Heigh t="50" Hor izontalAli gnment="St retch" Mar gin="0,1,0 ,0" Name=" progressBa r" Vertica lAlignment ="Top" IsI ndetermina te="True" Visibility ="Collapse d" />
42		<Canvas Height="60 0" Horizon talAlignme nt="Left" Margin="10 ,10,0,0" N ame="canva sSignIn" V erticalAli gnment="To p" Width=" 600" Visib ility="Vis ible">
43		<Lis tBox Name= "listBoxTa sks" Width ="500" Ver ticalConte ntAlignmen t="Top" He ight="500" >
44		<ListBox.I temTemplat e>
45		<DataT emplate>
46		<G rid Margin ="10">
47		<Grid.Co lumnDefini tions>
48		<Col umnDefinit ion Width= "100" />
49		<Col umnDefinit ion Width= "*" />
50		</Grid.C olumnDefin itions>
51		<TextBlo ck Text="{ Binding Sc heduledSta rtDate}" M argin="3" Grid.Colum n="0" Font Weight="Bo ld" FontSi ze="12" Te xtWrapping ="Wrap" />
52		<TextBlo ck Text="{ Binding Su bject}" Ma rgin="3" G rid.Column ="1" TextW rapping="W rap" />
53		</ Grid>
54		</Data Template>
55		</ListBox. ItemTempla te>
56		</Li stBox>
57		</Canvas >
58		</ Grid>
59
60		<V isualState Manager.Vi sualStateG roups>
61
62		<!-- Vis ual states reflect t he applica tion's vie w state -- >
63		<VisualS tateGroup x:Name="Ap plicationV iewStates" >
64		<Vis ualState x :Name="Ful lScreenLan dscape"/>
65		<Vis ualState x :Name="Fil led"/>
66
67		<!-- The entir e page res pects the narrower 1 00-pixel m argin conv ention for portrait -->
68		<Vis ualState x :Name="Ful lScreenPor trait">
69		<Storyboar d>
70		<Objec tAnimation UsingKeyFr ames Story board.Targ etName="ba ckButton" Storyboard .TargetPro perty="Sty le">
71		<D iscreteObj ectKeyFram e KeyTime= "0" Value= "{StaticRe source Por traitBackB uttonStyle }"/>
72		</Obje ctAnimatio nUsingKeyF rames>
73		</Storyboa rd>
74		</Vi sualState>
75
76		<!-- The back button and title hav e differen t styles w hen snappe d -->
77		<Vis ualState x :Name="Sna pped">
78		<Storyboar d>
79		<Objec tAnimation UsingKeyFr ames Story board.Targ etName="ba ckButton" Storyboard .TargetPro perty="Sty le">
80		<D iscreteObj ectKeyFram e KeyTime= "0" Value= "{StaticRe source Sna ppedBackBu ttonStyle} "/>
81		</Obje ctAnimatio nUsingKeyF rames>
82		<Objec tAnimation UsingKeyFr ames Story board.Targ etName="pa geTitle" S toryboard. TargetProp erty="Styl e">
83		<D iscreteObj ectKeyFram e KeyTime= "0" Value= "{StaticRe source Sna ppedPageHe aderTextSt yle}"/>
84		</Obje ctAnimatio nUsingKeyF rames>
85		</Storyboa rd>
86		</Vi sualState>
87		</Visual StateGroup >
88		</ VisualStat eManager.V isualState Groups>
89		</Grid >
90		</common:L ayoutAware Page>