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

946.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	MainWindow.xaml	Tue Dec 20 19:52:28 2016 UTC
2			Wed Feb 1 19:57:36 2017 UTC

946.2 Comparison summary

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

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

946.4 Active regular expressions

No regular expressions were active.

946.5 Comparison detail

1		<Window
2		x:Cl ass="Micro soft.Crm.S dk.Samples .MainWindo w"
3		xm lns:view=" clr-namesp ace:Micros oft.Crm.Sd k.Samples"
4		xm lns="http: //schemas. microsoft. com/winfx/ 2006/xaml/ presentati on"
5		xm lns:x="htt p://schema s.microsof t.com/winf x/2006/xam l"
6		xm lns:d="htt p://schema s.microsof t.com/expr ession/ble nd/2008"
7		xmln s:mc="http ://schemas .openxmlfo rmats.org/ markup-com patibility /2006"
8		xm lns:xlinq= "clr-names pace:Syste m.Xml.Linq ;assembly= System.Xml .Linq"
9		xm lns:system ="clr-name space:Syst em;assembl y=mscorlib "
10
11
12		mc:I gnorable=" d"
13		Ti tle="Web R esource Up load Utili ty"
14		Heig ht="860"
15		Widt h="1000"
16		Wind owStyle="T oolWindow"
17		Wi ndowStartu pLocation= "CenterScr een">
18
19		<Windo w.Resource s>
20		<v iew:BoolTo StatusColo rConverter x:Key="bo olToStatus ColorConve rter" />
21		</Wind ow.Resourc es>
22
23		<G rid x:Name ="LayoutRo ot" >
24		<Gri d.Backgrou nd>
25		<Solid ColorBrush Color="{D ynamicReso urce Super DarkGray}" />
26		</Gr id.Backgro und>
27		<Gri d.ColumnDe finitions >
28		<ColumnD efinition Width="4*" />
29		</Gr id.ColumnD efinitions >
30		<Grid. RowDefinit ions >
31		<RowDefi nition Hei ght="*" />
32		</Gr id.RowDefi nitions>
33
34		<!-- T abControl containing the Conne ction, Sol utions and Packages -->
35		<TabCo ntrol x:Na me="AreasT abControl" Grid.Row= "1" Margin ="4"
36		Selected Index="{Bi nding Path =TabContro lSelectedI ndex, Mode =TwoWay}"
37		TabStrip Placement= "Left" Bac kground="# FFD1D1D1" >
38
39		<TabItem x:Name="C onnections TabItem">
40		<TabItem.H eader>
41		<G rid>
42		<Sta ckPanel Ma rgin="0,0, -0.001,0">
43		<TextB lock FontS ize="18.66 7"
44		Text="Co nnections"
45		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Tahoma"
46		FontWeig ht="Bold" />
47		<Group Box
48		Margin=" 0,15,6,4"
49		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial"
50		FontSize ="10.667">
51		<GroupBo x.Header>
52		<StackPane l Orientat ion="Horiz ontal">
53		<Ellipse F ill="{Bind ing Path=I sActiveCon nectionSet , Converte r={StaticR esource bo olToStatus ColorConve rter}}"
54		S napsToDevi cePixels=" True"
55		H eight="10"
56		W idth="10"
57		M argin="0,0 ,4,0"
58		S troke="Bla ck" />
59		<T extBlock T ext="Activ e Connecti on" Vertic alAlignmen t="Center" FontWeigh t="Bold" / >
60
61		</StackPan el>
62		</GroupB ox.Header>
63		<StackPa nel DataCo ntext="{Bi nding Acti veConfigur ation}"
64		Orientatio n="Vertica l"
65		Horizontal Alignment= "Center">
66		<TextBlock Text="{Bi nding Attr ibute[serv er].Value} " Margin=" 2" />
67		<TextBlock Text="{Bi nding Attr ibute[orgN ame].Value }" Margin= "2" />
68		</StackP anel>
69		</Grou pBox>
70		</St ackPanel>
71		</ Grid>
72		</TabItem. Header>
73		<AdornerDe corator>
74		<v iew:Connec tionsView DataContex t="{Bindin g}" Horizo ntalAlignm ent="Stret ch" />
75		</AdornerD ecorator>
76		</TabIte m>
77		<TabItem x:Name="S olutionsTa bItem">
78		<TabItem.H eader>
79		<G rid>
80		<Gri d.RowDefin itions>
81		<RowDe finition / >
82		<RowDe finition / >
83		</Gr id.RowDefi nitions>
84
85		<Tex tBlock Fon tSize="18. 667"
86		Text=" Solutions"
87		FontFa mily="/Web ResourceUt ility;comp onent/Font s/#Tahoma"
88		Horizo ntalAlignm ent="Left" FontWeigh t="Bold" / >
89		<Group Box Grid.R ow="1"
90		Horizont alAlignmen t="Stretch "
91		Margin=" 0,15,6,4"
92		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial"
93		FontSize ="10.667">
94		<GroupBo x.Header>
95		<StackPane l Orientat ion="Horiz ontal">
96		<E llipse Hei ght="10"
97		Width=" 10"
98		Margin= "0,0,4,0"
99		Stroke= "Black"
100		Fill ="{Binding IsActiveS olutionSet , Converte r={StaticR esource bo olToStatus ColorConve rter}}"/>
101		<T extBlock T ext="Activ e Solution " Vertical Alignment= "Center" F ontWeight= "Bold" />
102
103		</StackPan el>
104		</GroupB ox.Header>
105		<StackPa nel Vertic alAlignmen t="Center" Horizonta lAlignment ="Center">
106		<TextBlock Text="{Bi nding Acti veSolution .FriendlyN ame}" />
107		</StackP anel>
108		</Grou pBox>
109		</ Grid>
110		</TabItem. Header>
111		<AdornerDe corator>
112		<v iew:Soluti onsView Da taContext= "{Binding} " Horizont alAlignmen t="Stretch " />
113		</AdornerD ecorator>
114		</TabIte m>
115		<TabItem x:Name="P ackagesTab Item"
116		Background ="#FFD4D0C 8">
117		<TabItem.H eader>
118		<G rid>
119		<Gri d.RowDefin itions>
120		<RowDe finition / >
121		<RowDe finition / >
122		<RowDe finition / >
123		</Gr id.RowDefi nitions>
124
125		<Tex tBlock Tex t="Web Res ource"
126		FontSi ze="18.667 "
127		FontFa mily="/Web ResourceUt ility;comp onent/Font s/#Tahoma"
128		Horizo ntalAlignm ent="Left"
129		FontWe ight="Bold ">
130		</Te xtBlock>
131		<Tex tBlock Tex t="Package s"
132		Grid.R ow="1"
133		FontSi ze="18.667 "
134		FontFa mily="/Web ResourceUt ility;comp onent/Font s/#Tahoma"
135		Horizo ntalAlignm ent="Left"
136		FontWe ight="Bold ">
137		</Te xtBlock>
138		<Group Box Grid.R ow="2"
139		Horizont alAlignmen t="Stretch "
140		Margin=" 0,15,6,4"
141		FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial"
142		FontSize ="10.667">
143		<GroupBo x.Header>
144		<StackPane l Orientat ion="Horiz ontal">
145		<E llipse Hei ght="10"
146		Width=" 10"
147		Margin= "0,0,4,0"
148		Stroke= "Black"
149		Fill="{Bin ding IsAct ivePackage Set, Conve rter={Stat icResource boolToSta tusColorCo nverter}}" />
150		<TextB lock Text= "Active Pa ckage" Ver ticalAlign ment="Cent er" FontWe ight="Bold " />
151
152		</StackPan el>
153		</GroupB ox.Header>
154		<StackPa nel Vertic alAlignmen t="Center" Horizonta lAlignment ="Center">
155		<Tex tBlock Tex t="{Bindin g Path=Act ivePackage .Attribute [name].Val ue}" />
156		</StackP anel>
157		</Grou pBox>
158		</ Grid>
159		</TabItem. Header>
160		<AdornerDe corator>
161		<v iew:WebRes ourceView DataContex t="{Bindin g}" Horizo ntalAlignm ent="Stret ch" />
162		</AdornerD ecorator>
163		</TabIte m>
164
165		</TabC ontrol>
166		</Grid >
167
168		</Window>