467. Araxis Merge File Comparison Report

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

467.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\Metadata\Diagram MetadataDiagram.csproj Tue Dec 20 19:51:46 2016 UTC
2 Wed Feb 1 19:56:46 2017 UTC

467.2 Comparison summary

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

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

467.4 Active regular expressions

No regular expressions were active.

467.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <Project D efaultTarg ets="Build " xmlns="h ttp://sche mas.micros oft.com/de veloper/ms build/2003 " ToolsVer sion="12.0 ">        
3     <Propert yGroup>        
4       <Confi guration C ondition="  '$(Config uration)'  == '' ">De bug</Confi guration>        
5       <Platf orm Condit ion=" '$(P latform)'  == '' ">An yCPU</Plat form>        
6       <Produ ctVersion> 9.0.30729< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{15 69EADF-B34 0-4166-876 9-B46FB099 9847}</Pro jectGuid>        
9       <Outpu tType>Exe< /OutputTyp e>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>M etadataDia gramConsol e</RootNam espace>        
12       <Assem blyName>Me tadataDiag ramConsole </Assembly Name>        
13       <Start upObject>M icrosoft.C rm.Sdk.Sam ples.Diagr amBuilder< /StartupOb ject>        
14       <FileU pgradeFlag s>        
15       </File UpgradeFla gs>        
16       <Upgra deBackupLo cation>        
17       </Upgr adeBackupL ocation>        
18       <OldTo olsVersion >4.0</OldT oolsVersio n>        
19       <IsWeb Bootstrapp er>false</ IsWebBoots trapper>        
20       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
21       <Targe tFramework Profile />        
22       <Publi shUrl>publ ish\</Publ ishUrl>        
23       <Insta ll>true</I nstall>        
24       <Insta llFrom>Dis k</Install From>        
25       <Updat eEnabled>f alse</Upda teEnabled>        
26       <Updat eMode>Fore ground</Up dateMode>        
27       <Updat eInterval> 7</UpdateI nterval>        
28       <Updat eIntervalU nits>Days< /UpdateInt ervalUnits >        
29       <Updat ePeriodica lly>false< /UpdatePer iodically>        
30       <Updat eRequired> false</Upd ateRequire d>        
31       <MapFi leExtensio ns>true</M apFileExte nsions>        
32       <Appli cationRevi sion>0</Ap plicationR evision>        
33       <Appli cationVers ion>1.0.0. %2a</Appli cationVers ion>        
34       <UseAp plicationT rust>false </UseAppli cationTrus t>        
35       <Boots trapperEna bled>true< /Bootstrap perEnabled >        
36     </Proper tyGroup>        
37     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
38       <Debug Symbols>tr ue</DebugS ymbols>        
39       <Debug Type>full< /DebugType >        
40       <Optim ize>false< /Optimize>        
41       <Outpu tPath>bin\ Debug\</Ou tputPath>        
42       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
43       <Error Report>pro mpt</Error Report>        
44       <Warni ngLevel>4< /WarningLe vel>        
45       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
46       <Prefe r32Bit>fal se</Prefer 32Bit>        
47     </Proper tyGroup>        
48     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
49       <Debug Type>pdbon ly</DebugT ype>        
50       <Optim ize>true</ Optimize>        
51       <Outpu tPath>bin\ Release\</ OutputPath >        
52       <Defin eConstants >TRACE</De fineConsta nts>        
53       <Error Report>pro mpt</Error Report>        
54       <Warni ngLevel>4< /WarningLe vel>        
55       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
56       <Prefe r32Bit>fal se</Prefer 32Bit>        
57     </Proper tyGroup>        
58     <ItemGro up>        
59       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy">        
60         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath >        
61       </Refe rence>        
62       <Refer ence Inclu de="Micros oft.CSharp " />        
63       <Refer ence Inclu de="Micros oft.Identi tyModel, V ersion=3.5 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35, proc essorArchi tecture=MS IL">        
64         <Pri vate>True< /Private>        
65         <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h>        
66       </Refe rence>        
67       <Refer ence Inclu de="Micros oft.Office .Interop.V isio, Vers ion=14.0.0 .0, Cultur e=neutral,  PublicKey Token=71e9 bce111e942 9c, proces sorArchite cture=MSIL ">        
68         <Spe cificVersi on>False</ SpecificVe rsion>        
69         <Emb edInteropT ypes>True< /EmbedInte ropTypes>        
70         <Hin tPath>.\Mi crosoft.Of fice.Inter op.Visio.d ll</HintPa th>        
71       </Refe rence>        
72       <Refer ence Inclu de="Micros oft.Xrm.Sd k">        
73         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path>        
74       </Refe rence>        
75       <Refer ence Inclu de="System " />        
76       <Refer ence Inclu de="System .Data" />        
77       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
78       <Refer ence Inclu de="System .Directory Services"  />        
79       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
80       <Refer ence Inclu de="System .IdentityM odel" />        
81       <Refer ence Inclu de="System .Runtime.S erializati on" />        
82       <Refer ence Inclu de="System .Security"  />        
83       <Refer ence Inclu de="System .ServiceMo del" />        
84       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
85       <Refer ence Inclu de="System .Web" />        
86       <Refer ence Inclu de="System .Web.Servi ces" />        
87       <Refer ence Inclu de="System .Xml" />        
88       <Refer ence Inclu de="System .Xml.Linq"  />        
89     </ItemGr oup>        
90     <ItemGro up>        
91       <Compi le Include ="..\..\He lperCode\C rmServiceH elpers.cs" >        
92         <Lin k>CrmServi ceHelpers. cs</Link>        
93       </Comp ile>        
94       <Compi le Include ="..\..\He lperCode\D eviceIdMan ager.cs">        
95         <Lin k>DeviceId Manager.cs </Link>        
96       </Comp ile>        
97       <Compi le Include ="DiagramB uilder.cs"  />        
98       <Compi le Include ="Properti es\Assembl yInfo.cs"  />        
99       <Compi le Include ="Properti es\Setting s.Designer .cs">        
100         <Aut oGen>True< /AutoGen>        
101         <Des ignTimeSha redInput>T rue</Desig nTimeShare dInput>        
102         <Dep endentUpon >Settings. settings</ DependentU pon>        
103       </Comp ile>        
104     </ItemGr oup>        
105     <ItemGro up>        
106       <WebRe ferences I nclude="We b Referenc es\" />        
107     </ItemGr oup>        
108     <ItemGro up>        
109       <None  Include="a pp.config"  />        
110       <None  Include="p ackages.co nfig" />        
111       <None  Include="P roperties\ Settings.s ettings">        
112         <Gen erator>Set tingsSingl eFileGener ator</Gene rator>        
113         <Las tGenOutput >Settings. Designer.c s</LastGen Output>        
114       </None >        
115     </ItemGr oup>        
116     <ItemGro up>        
117       <Boots trapperPac kage Inclu de="Micros oft.Net.Cl ient.3.5">        
118         <Vis ible>False </Visible>        
119         <Pro ductName>. NET Framew ork 3.5 SP 1 Client P rofile</Pr oductName>        
120         <Ins tall>false </Install>        
121       </Boot strapperPa ckage>        
122       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.2. 0">        
123         <Vis ible>False </Visible>        
124         <Pro ductName>. NET Framew ork 2.0 %2 8x86%29</P roductName >        
125         <Ins tall>true< /Install>        
126       </Boot strapperPa ckage>        
127       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 0">        
128         <Vis ible>False </Visible>        
129         <Pro ductName>. NET Framew ork 3.0 %2 8x86%29</P roductName >        
130         <Ins tall>false </Install>        
131       </Boot strapperPa ckage>        
132       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5">        
133         <Vis ible>False </Visible>        
134         <Pro ductName>. NET Framew ork 3.5</P roductName >        
135         <Ins tall>false </Install>        
136       </Boot strapperPa ckage>        
137       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5.SP1">        
138         <Vis ible>False </Visible>        
139         <Pro ductName>. NET Framew ork 3.5 SP 1</Product Name>        
140         <Ins tall>false </Install>        
141       </Boot strapperPa ckage>        
142     </ItemGr oup>        
143     <Import  Project="$ (MSBuildBi nPath)\Mic rosoft.CSh arp.target s" />        
144     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
145          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
146     <Target  Name="Befo reBuild">        
147     </Target >        
148     <Target  Name="Afte rBuild">        
149     </Target >        
150     -->        
151   </Project>