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

520.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	MainPage.xaml.cs	Tue Dec 20 19:51:47 2016 UTC
2			Wed Feb 1 19:56:49 2017 UTC

520.2 Comparison summary

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

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

520.4 Active regular expressions

No regular expressions were active.

520.5 Comparison detail

1		// ======= ========== ========== ========== ========== ========== ========== ==
2		//
3		// This f ile is par t of the M icrosoft D ynamics CR M SDK Code Samples.
4		//
5		// Copyri ght (C) Mi crosoft Co rporation. All righ ts reserve d.
6		//
7		// This s ource code is intend ed only as a supplem ent to Mic rosoft
8		// Develo pment Tool s and/or o nline docu mentation. See thes e other
9		// materi als for de tailed inf ormation r egarding M icrosoft c ode sample s.
10		//
11		// THIS C ODE AND IN FORMATION ARE PROVID ED "AS IS" WITHOUT W ARRANTY OF ANY
12		// KIND, EITHER EXP RESSED OR IMPLIED, I NCLUDING B UT NOT LIM ITED TO TH E
13		// IMPLIE D WARRANTI ES OF MERC HANTABILIT Y AND/OR F ITNESS FOR A
14		// PARTIC ULAR PURPO SE.
15		//
16		// ======= ========== ========== ========== ========== ========== ========== ==
17
18		using Syst em;
19		using Mode rnOdataApp .Models;
20		using Mode rnOdataApp .Views;
21		using Wind ows.UI.Cor e;
22		using Wind ows.UI.Xam l;
23		using Wind ows.UI.Xam l.Controls ;
24		using Wind ows.UI.Xam l.Navigati on;
25		using Wind ows.Storag e;
26		using Syst em.Collect ions.Objec tModel;
27		using Wind ows.UI.Pop ups;
28		using Micr osoft.Iden tityModel. Clients.Ac tiveDirect ory;
29		using Mode rnOdataApp .Common;
30		using Wind ows.Securi ty.Authent ication.We b;
31		// The Bla nk Page it em templat e is docum ented at h ttp://go.m icrosoft.c om/fwlink/ ?LinkId=23 4238
32
33		namespace ModernOdat aApp
34		{
35		/// <s ummary>
36		/// An empty pag e that can be used o n its own or navigat ed to with in a Frame .
37		/// </ summary>
38		public sealed pa rtial clas s MainPage : Page
39		{
40		#r egion Clas s Level Me mbers
41
42		pr ivate stri ng _access Token = st ring.Empty ;
43		pr ivate stat ic string _strItemCl icked;
44		// Currently using sta tic fields as menu i tems for d isplaying
45		pr ivate stri ng[] _strM enuItems = new strin g[] { "Lea ds", "Oppo rtunities" , "Account s", "Conta cts", "Tas ks", "Plac eholder", "Placehold er" };
46		pr ivate Obse rvableColl ection<Mai nPageItem> _theMenuI tems { get ; set; }
47
48		# endregion
49
50		pu blic MainP age()
51		{
52		this.Ini tializeCom ponent();
53		}
54
55		// / <summary >
56		// / Invoked when this page is ab out to be displayed in a Frame .
57		// / </summar y>
58		// / <param n ame="e">Ev ent data t hat descri bes how th is page wa s reached. The Para meter
59		// / property is typica lly used t o configur e the page .</param>
60		pr otected ov erride voi d OnNaviga tedTo(Navi gationEven tArgs e)
61		{
62		progress Bar.Visibi lity = Vis ibility.Vi sible;
63		Initiali ze();
64		}
65
66		// / <summary >
67		// / Binding Menu items to Main P age
68		// / </summar y>
69		pr ivate asyn c void Ini tialize()
70		{
71		_accessT oken = awa it Current Environmen t.Initiali ze();
72
73		pageTitl e.Text = " Welcome to the Windo ws 8 Moder n OData Ap p";
74		_theMenu Items = ne w Observab leCollecti on<MainPag eItem>();
75		for (int i = 0; i < 7; i++)
76		{
77		Main PageItem a nItem = ne w MainPage Item()
78		{
79		Name = _st rMenuItems [i]
80		};
81		_the MenuItems. Add(anItem );
82		}
83		itemsVie wSource.So urce = _th eMenuItems ;
84		progress Bar.Visibi lity = Vis ibility.Co llapsed;
85		}
86
87		pr ivate asyn c void Nav igateTo(Ty pe pageTyp e, object parameter)
88		{
89		await Di spatcher.R unAsync(Co reDispatch erPriority .Normal, ( ) => Frame .Navigate( pageType, parameter) );
90		}
91
92		pr ivate void itemGridV iew_ItemCl ick(object sender, I temClickEv entArgs e)
93		{
94		MainPage Item selIt em = (Main PageItem)e .ClickedIt em;
95		_strItem Clicked = selItem.Na me;
96		if (_str ItemClicke d.Equals(" Tasks"))
97		{
98		this .NavigateT o(typeof(T asks), _ac cessToken) ;
99		}
100
101		else if (_strItemC licked.Equ als("Accou nts"))
102		{
103		this .NavigateT o(typeof(A ccounts), _accessTok en);
104		}
105		}
106
107		}
108		}