953. Araxis Merge File Comparison Report

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

953.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\WebResourceUtility\Views	WebResourceView.xaml	Tue Dec 20 19:52:28 2016 UTC
2			Wed Feb 1 19:57:36 2017 UTC

953.2 Comparison summary

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

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

953.4 Active regular expressions

No regular expressions were active.

953.5 Comparison detail

1		<UserContr ol
2		xm lns="http: //schemas. microsoft. com/winfx/ 2006/xaml/ presentati on"
3		xm lns:x="htt p://schema s.microsof t.com/winf x/2006/xam l"
4		xm lns:d="htt p://schema s.microsof t.com/expr ession/ble nd/2008"
5		xm lns:mc="ht tp://schem as.openxml formats.or g/markup-c ompatibili ty/2006"
6		mc :Ignorable ="d"
7		x: Class="Mic rosoft.Crm .Sdk.Sampl es.WebReso urceView"
8		xmlns: view="clr- namespace: Microsoft. Crm.Sdk.Sa mples"
9		x: Name="User Control" d :DesignWid th="500"
10		>
11
12		<UserC ontrol.Res ources>
13		<v iew:BoolTo Visibility Converter x:Key="boo lToVisibil ityConvert er" />
14		</User Control.Re sources>
15		<Borde r x:Name=" LayoutRoot " CornerRa dius="8,8, 8,8" Backg round="Lig htGray" >
16		<G rid>
17		<Grid.Ro wDefinitio ns>
18		<Row Definition Height="A uto" />
19		<Row Definition Height="A uto" />
20		<Row Definition Height="A uto" />
21		<Row Definition Height="A uto" />
22		<Row Definition Height="A uto" />
23		<Row Definition Height="A uto" />
24		</Grid.R owDefiniti ons>
25
26		<TextBlo ck Text="L oad an exi sting pack age or cre ate a new one."
27		Marg in="4"
28		FontWeig ht="Bold"
29		FontSize ="18.667"
30		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial" >
31		</TextBl ock>
32
33		<TextBlo ck Grid.Ro w="1"
34		Te xt="Packag es"
35		Fo ntWeight=" Bold"
36		Ma rgin="4,10 ,4,0" />
37
38		<!-- Pac kages -->
39		<ScrollV iewer Grid .Row="2" V erticalScr ollBarVisi bility="Au to" Height ="Auto" Ma xHeight="1 20" Margin ="4,0,4,0" >
40		<Dat aGrid x:Na me="WebRes ourcePacka gesGrid"
41		IsManipula tionEnable d="False"
42		Item sSource="{ Binding Pa th=Package s}"
43		Sele ctedItem=" {Binding P ath=Select edPackage, Mode=TwoW ay}"
44		Sele ctionMode= "Single"
45		AutoGenera teColumns= "False"
46		IsReadOnly ="True" >
47		<DataGrid. Columns>
48		<DataG ridTextCol umn Header ="Package Name" Bind ing="{Bind ing Path=A ttribute[n ame].Value }" Width=" Auto" MinW idth="120" />
49		<DataG ridTextCol umn Header ="Root Pat h" Binding ="{Binding Path=Attr ibute[root Path].Valu e}" Width= "*" />
50		</DataGrid .Columns>
51		</Da taGrid>
52		</Scroll Viewer>
53
54		<!-- Pac kage Comma nds -->
55		<StackPa nel Orient ation="Hor izontal" G rid.Row="3 " Margin=" 0,0,0,20"
56
57		Horizont alAlignmen t="Stretch ">
58		<But ton x:Name ="LoadPack ageButton"
59		Command= "{Binding Path=Activ ateSelecte dPackageCo mmand}"
60		Content= "Load Pack age"
61		Margin=" 4,2,0,0" / >
62
63		<But ton x:Name ="NewPacka geButton" Command="{ Binding Pa th=CreateN ewPackageC ommand}" Content="N ew Package " Margin=" 4,2,0,0" H eight="20. 277" Verti calAlignme nt="Top"/>
64		<But ton x:Name ="DeletePa ckageButto n" Command ="{Binding Path=Dele teActivePa ckageComma nd}" Cont ent="Delet e" Margin= "4,2,4,0" />
65		</StackP anel>
66
67
68		<!-- Pac kage Works tation -->
69		<Border x:Name="Ou tputBorder "
70		Grid.Row=" 4"
71		Margin="4, 0,4,8"
72		CornerRadi us="8,8,8, 8"
73		Background ="DarkGray "
74		Visibility ="{Binding Path=IsAc tivePackag eSet, Conv erter={Sta ticResourc e boolToVi sibilityCo nverter}}" >
75		<Gri d>
76		<Grid Grid .Row="0" V isibility= "{Binding Path=IsWor kstationDi splayed, C onverter={ StaticReso urce boolT oVisibilit yConverter }}">
77		<Grid.RowD efinitions >
78		<RowDe finition H eight="Aut o"/>
79		<RowDe finition H eight="Aut o"/>
80		<RowDe finition H eight="Aut o"/>
81		<RowDe finition H eight="Aut o"/>
82		<RowDe finition H eight="Aut o"/>
83		<RowDe finition H eight="Aut o"/>
84		</Grid.Row Definition s>
85		<Grid.Colu mnDefiniti ons>
86		<Colum nDefinitio n />
87		<Colum nDefinitio n />
88		<Colum nDefinitio n />
89		<Colum nDefinitio n />
90		</Grid.Col umnDefinit ions>
91
92		<Label Mar gin="4" Ho rizontalAl ignment="R ight" Font Weight="Bo ld">Packag e Name</La bel>
93		<TextB ox Margin= "4"
94		Gr id.Column= "1"
95		Gr id.ColumnS pan="2"
96		To olTip="{Bi nding Rela tiveSource ={Relative Source Sel f}, Path=( Validation .Errors)[0 ].ErrorCon tent}"
97		>
98		<T extBox.Tex t>
99		<Binding Path="Act ivePackage .Attribute [name].Val ue" Mode=" TwoWay" Up dateSource Trigger="P ropertyCha nged" >
100		<Bin ding.Valid ationRules >
101		<view:Rege xValidatio nRule Patt ern="[^a-z 0-9A-Z_\\. /]\|[/]{2,} " Message= "Error: Ca n only con tain alphn umeric, pe riods, und erscores, and single forward s lash" />
102		</Bi nding.Vali dationRule s>
103		</Bindin g>
104		</ TextBox.Te xt>
105		</Text Box>
106		<L abel Grid. Row="1" Ho rizontalAl ignment="R ight" Marg in="4" Fon tWeight="B old">Root Path</Labe l>
107		<TextBox I sEnabled=" False" Tex t="{Bindin g Path=Act ivePackage .Attribute [rootPath] .Value, Mo de=TwoWay} "
108		Grid.Row=" 1"
109		Grid.Colum n="1"
110		Grid.Colum nSpan="2"
111		Margin="4" />
112		<Button x: Name="Brow seButton"
113		Co mmand="{Bi nding Brow seFolderCo mmand}"
114		Co ntent="Bro wse"
115		Gr id.Row="1"
116		Ma rgin="2,4, 0,4"
117		Gr id.Column= "3"
118		Wi dth="60"
119		Ho rizontalAl ignment="L eft"/>
120
121
122
123		<!-- File Search Sec tion -->
124		<GroupBox Grid.Row=" 2"
125		Grid.C olumnSpan= "4"
126		Margin ="4" >
127		<Group Box.Header >
128		<TextBlo ck Text="F ile Search " FontWeig ht="Bold" />
129		</ GroupBox.H eader>
130		<Grid>
131		<G rid.RowDef initions>
132		<RowDefi nition Hei ght="Auto" />
133		<RowDefi nition Hei ght="Auto" />
134		<RowDefi nition Hei ght="Auto" />
135		<RowDefi nition Hei ght="*"/>
136		<RowDefi nition Hei ght="Auto" />
137		</ Grid.RowDe finitions>
138		<G rid.Column Definition s>
139		<ColumnD efinition Width="Aut o" />
140		<ColumnD efinition Width="*" />
141		<ColumnD efinition Width="Aut o" />
142		</ Grid.Colum nDefinitio ns>
143
144		<L abel Verti calAlignme nt="Bottom " Horizont alAlignmen t="Right" FontWeight ="Bold">Se arch by Fi lename:</L abel>
145
146		<T extBox x:N ame="FileN ameTextBox "
147		Te xt="{Bindi ng Path=Fi leSearchTe xt, Mode=T woWay}"
148		Gr id.Row="0"
149		Gr id.Column= "1"
150		/>
151
152		<B utton x:Na me="Refres hFilesButt on"
153		Marg in="4,0,0, 0"
154		Widt h="100"
155		Comm and="{Bind ing Path=R efreshFile sCommand}"
156		Conten t="Search"
157		Grid.R ow="0"
158		Grid.C olumn="3"
159		/>
160
161		<D ataGrid x: Name="File DataGrid"
162		IsReadOn ly="True"
163		Selectio nMode="Ext ended"
164		Selectio nUnit="Ful lRow"
165		ItemsSou rce="{Bind ing Path=C urrentFile s}"
166		AutoGene rateColumn s="False"
167		Grid.Row=" 3"
168		Grid.Col umnSpan="3 "
169		Height=" 140"
170		Margin=" 0,4,0,0" >
171		<DataGri d.Columns>
172		<Dat aGridTextC olumn Hea der="Type" Binding=" {Binding P ath=Extens ion}" />
173		<Dat aGridTextC olumn Hea der="File Name" Bind ing="{Bind ing Path=N ame}" />
174		<Dat aGridTextC olumn Hea der="Path" Binding=" {Binding P ath=FullNa me}"/>
175		</DataGr id.Columns >
176		</ DataGrid>
177
178
179
180		<! -- The Dat aGrid's Se lectedItem s property is read-o nly and ca n not be
181		bo und via XA ML. We nee d to have the Select edItems to know whic h
182		to add to th e Web Reso urce datag rid.
183		Wo rkaround:
184		Wh en the use r clicks t he Add Web Resource button, se nd a Comma ndParamete r
185		al ong with t he Command that is b ound to th e grid's S electedIte ms. In
186		th e RelayCom mand, extr act the It ems and up date the V iewModel a ccordingly .
187		NO TE: This w ill only k eep the Vi ewModel sy nced with the select edrows whe n
188		th e button i s clicked. Any chang es thereaf ter are un recognized until cli cked
189		ag ain
190		-- >
191
192		<B utton x:Na me="AddFil eButton"
193		Co mmand="{Bi nding Path =ConvertFi leToResour ceCommand} "
194		Co mmandParam eter="{Bin ding Eleme ntName=Fil eDataGrid, Path=Sele ctedItems} "
195		Ma rgin="0,2, 0,4"
196		Cont ent="Add F iles to We b Resource s"
197		Grid .Row="4"
198		Grid .Column="0 "/>
199		</Grid >
200		</GroupBox >
201
202		<!-- Web R esources S ection -->
203		<GroupBox
204		Grid.Row=" 3"
205		Grid.Colum nSpan="4"
206		Margin="4, 4,4,8">
207		<Group Box.Header >
208		<TextBlo ck Text="W eb Resourc es" FontWe ight="Bold " />
209		</ GroupBox.H eader>
210		<Grid>
211		<G rid.RowDef initions>
212		<RowDefi nition Hei ght="Auto" />
213		<RowDefi nition Hei ght="Auto" />
214		<RowDefi nition Hei ght="*"/>
215		<RowDefi nition Hei ght="Auto" />
216
217		</ Grid.RowDe finitions>
218		<G rid.Column Definition s>
219		<ColumnD efinition Width="Aut o" />
220		<ColumnD efinition Width="*" />
221		</ Grid.Colum nDefinitio ns>
222
223		<C heckBox Gr id.Row="1" x:Name="P ackageName PrefixChec kBox" Cont ent="Use P ackage Nam e as Web R esource na mespace"
224		IsChecke d="{Bindin g Path=Act ivePackage .Attribute [isNamePre fix].Value }"
225		Margin=" 0,4,0,0"
226		Grid.Col umnSpan="2 "/>
227
228		<S tackPanel Grid.Colum nSpan="2" Orientati on="Horizo ntal">
229		<TextBlo ck >Web Re source nam e prefix:< /TextBlock >
230		<TextBlo ck Margin= "4,0,0,0"
231		Text="{Bin ding Path= ActivePubl isher.Cust omizationP refix}"></ TextBlock>
232		<TextBlo ck Text="_ "
233		V isibility= "{Binding Path=IsAct iveSolutio nSet, Conv erter={Sta ticResourc e boolToVi sibilityCo nverter}}" />
234		<TextBlo ck Text="/ "
235		Visibility ="{Binding ElementNa me=Package NamePrefix CheckBox, Path=IsChe cked, Conv erter={Sta ticResourc e boolToVi sibilityCo nverter}}" />
236		<TextBlo ck Text="{ Binding Pa th=ActiveP ackage.Att ribute[nam e].Value}"
237		V isibility= "{Binding ElementNam e=PackageN amePrefixC heckBox, P ath=IsChec ked, Conve rter={Stat icResource boolToVis ibilityCon verter}}"/ >
238
239		</ StackPanel >
240
241
242		<D ataGrid x: Name="WebR esourcesDa taGrid"
243		It emsSource= "{Binding Path=WebRe sourceInfo s}"
244		Se lectionMod e="Extende d"
245		Au toGenerate Columns="F alse"
246		Gr id.Row="2"
247		Grid .ColumnSpa n="2"
248		He ight="140" Margin="0 ,4,0,0">
249		<DataGri d.Columns>
250		<Dat aGridTextC olumn IsRe adOnly="Tr ue" Header ="Type" Bi nding="{Bi nding Path =Attribute [type].Val ue}" />
251		<Dat aGridTextC olumn Head er="Name ( editable)" Binding=" {Binding P ath=Attrib ute[name]. Value}" />
252		<Dat aGridTextC olumn Head er="Displa y Name (ed itable)" B inding="{B inding Pat h=Attribut e[displayN ame].Value , Mode=Two Way}" />
253		<Dat aGridTextC olumn Head er="Descri ption (edi table)" Bi nding="{Bi nding Path =Attribute [descripti on].Value, Mode=TwoW ay}" />
254		</DataGr id.Columns >
255		</ DataGrid>
256
257		<B utton Grid .Row="3" x :Name="Rem oveWebReso urceButton " Margin=" 0,2,0,0"
258		Content="R emove Web Resource"
259		Command= "{Binding Path=Delet eWebResour cesCommand }"
260		CommandP arameter=" {Binding E lementName =WebResour cesDataGri d, Path=Se lectedItem s}"
261		/>
262
263		</Grid >
264		</GroupBox >
265
266		<!-- Publi sh options -->
267		<Check Box Horizo ntalAlignm ent="Cente r" Margin= "4"
268		Grid.Row= "4" Grid.C olumnSpan= "4"
269		IsChecked ="{Binding Path=Shou ldPublishA llAfterUpl oad, Mode= TwoWay}"
270		Content=" Publish al l customiz ations aft er uploadi ng web res ources." / >
271
272		<!-- Packa ge Command s -->
273		<StackPane l
274		Grid.R ow="5"
275		Grid.C olumn="0"
276		Grid.C olumnSpan= "4"
277		Orient ation="Hor izontal"
278		Horizo ntalAlignm ent="Cente r" >
279		<Butto n x:Name=" SavePackag eButton"
280		Command= "{Binding Path=SaveA ctivePacka geCommand} "
281		Content= "Save Pack age"
282		Margin=" 4"
283		Grid.Row ="4"
284		Grid.Col umnSpan="4 " Width="1 20" Height ="30"/>
285		<Butto n x:Name=" DeployAllB utton"
286		Width="1 20"
287		Command= "{Binding Path=Uploa dAllWebRes ourcesComm and}"
288		Margin=" 4"
289		Content="U pload All"
290		/>
291		<Butto n x:Name=" DeployWebR esourcesBu tton"
292		Command= "{Binding Path=Uploa dWebResour cesCommand }"
293		Width="1 20"
294		CommandP arameter=" {Binding E lementName =WebResour cesDataGri d, Path=Se lectedItem s}"
295		Margin=" 4"
296		Content="U pload Sele cted"
297		/>
298		<Butto n Command ="{Binding Path=Show OutputWind ow}"
299		Horizont alAlignmen t="Right"
300		Margin=" 4"
301		Content="S how Output "
302		/>
303		</Stac kPanel>
304
305		</Gr id>
306		<Grid Grid .Row="0"
307		Visi bility="{B inding Pat h=IsOutput WindowDisp layed, Con verter={St aticResour ce boolToV isibilityC onverter}} "
308		MaxH eight="{Bi nding Elem entName=Ou tputBorder , Path=Act ualHeight} ">
309		<Grid. RowDefinit ions>
310		<R owDefiniti on Height= "Auto" />
311		<R owDefiniti on Height= "*" />
312		<R owDefiniti on Height= "Auto" />
313		</Grid .RowDefini tions>
314		<TextB lock Text= "Output" F ontWeight= "Bold" Mar gin="4" />
315		<Scrol lViewer Gr id.Row="1"
316		Ma rgin="4"
317		Ho rizontalSc rollBarVis ibility="V isible"
318		Ve rticalScro llBarVisib ility="Vis ible" >
319		<T extBox IsR eadOnly="T rue" Text= "{Binding Path=Progr essMessage }" />
320		</Scro llViewer>
321		<Butto n Grid.Row ="2" Conte nt="Hide O utput" Com mand="{Bin ding Path= HideOutput Window}" W idth="140" Margin="4 " />
322		</Grid>
323		</Gr id>
324		</Border >
325
326
327		</ Grid>
328		</Bord er>
329
330		</UserCont rol>