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

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

950.2 Comparison summary

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

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

950.4 Active regular expressions

No regular expressions were active.

950.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       xmlns: d="http:// schemas.mi crosoft.co m/expressi on/blend/2 008"         
5       xmlns: mc="http:/ /schemas.o penxmlform ats.org/ma rkup-compa tibility/2 006"         
6       mc:Ign orable="d"          
7       x:Clas s="Microso ft.Crm.Sdk .Samples.S olutionsVi ew">        
8          
9       <Borde r CornerRa dius="8,8, 8,8" Backg round="Lig htGray" >        
10           <G rid Margin ="8">        
11                         <Grid.RowD efinitions >        
12                         <RowDefini tion Heigh t="Auto" / >        
13                                 <R owDefiniti on Height= "Auto" />        
14                    <Row Definition  Height="A uto" />        
15                    <Row Definition  Height="A uto" />        
16                </Grid.R owDefiniti ons>        
17                <Grid.Co lumnDefini tions>        
18                    <Col umnDefinit ion Width= "Auto" />        
19                    <Col umnDefinit ion/>        
20                </Grid.C olumnDefin itions>        
21          
22                <TextBlo ck Text="C hoose a Dy namics CRM  Unmanaged  Solution. "                                    
23                                      Grid.Col umnSpan="2 "        
24                    Font Weight="Bo ld"         
25                                      FontSize ="18.667"         
26                                      FontFami ly="/WebRe sourceUtil ity;compon ent/Fonts/ #Arial" >        
27                </TextBl ock>        
28          
29                <TextBlo ck Grid.Ro w="1"          
30                                 Te xt="Soluti ons"         
31                                 Fo ntWeight=" Bold"         
32                                 Ma rgin="0,10 ,0,0"  />        
33          
34                <ListBox  Grid.Row= "2"         
35                    MinH eight="140 "        
36                          MinWidth= "120"        
37                    Marg in="2"  x: Name="Solu tionList"        
38                                      ItemsSou rce="{Bind ing Path=U nmanagedSo lutions}"        
39                                      Selected Item="{Bin ding Path= SelectedSo lution, Mo de=TwoWay} " >        
40                                      <ListBox .ItemTempl ate>        
41                                               <DataTempl ate>        
42                                                       <S tackPanel  Orientatio n="Horizon tal">        
43                                                                <Tex tBlock Tex t="{Bindin g Path=Uni queName}"  />        
44                                                       </ StackPanel >        
45                                               </DataTemp late>        
46                                      </ListBo x.ItemTemp late>        
47                             </List Box>        
48                                              
49                <Button  Grid.Row=" 3" Content ="Choose"  Command="{ Binding Pa th=Activat eSolutionC ommand}" M argin="2"  />                                           
50                                                      
51           </ Grid>        
52       </Bord er>        
53   </UserCont rol>