232. Araxis Merge File Comparison Report

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

232.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\BusinessDataModel\ProductCatalog\CustomPricePlug-In Plug-Ins.csproj Tue Dec 20 19:51:44 2016 UTC
2 Wed Feb 1 19:56:25 2017 UTC

232.2 Comparison summary

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

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

232.4 Active regular expressions

No regular expressions were active.

232.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <Project T oolsVersio n="12.0" D efaultTarg ets="Build " xmlns="h ttp://sche mas.micros oft.com/de veloper/ms build/2003 ">        
3     <Import  Project="$ (MSBuildEx tensionsPa th)\$(MSBu ildToolsVe rsion)\Mic rosoft.Com mon.props"  Condition ="Exists(' $(MSBuildE xtensionsP ath)\$(MSB uildToolsV ersion)\Mi crosoft.Co mmon.props ')" />        
4     <Propert yGroup>        
5       <Confi guration C ondition="  '$(Config uration)'  == '' ">De bug</Confi guration>        
6       <Platf orm Condit ion=" '$(P latform)'  == '' ">An yCPU</Plat form>        
7       <Proje ctGuid>{09 68412F-BE6 A-4731-932 A-CFC429E9 3236}</Pro jectGuid>        
8       <Outpu tType>Libr ary</Outpu tType>        
9       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
10       <RootN amespace>P lug_Ins</R ootNamespa ce>        
11       <Assem blyName>Ca lculatePri ce.Plugin< /AssemblyN ame>        
12       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
13       <FileA lignment>5 12</FileAl ignment>        
14       <Targe tFramework Profile />        
15     </Proper tyGroup>        
16     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
17       <Debug Symbols>tr ue</DebugS ymbols>        
18       <Debug Type>full< /DebugType >        
19       <Optim ize>false< /Optimize>        
20       <Outpu tPath>bin\ Debug\</Ou tputPath>        
21       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
22       <Error Report>pro mpt</Error Report>        
23       <Warni ngLevel>4< /WarningLe vel>        
24     </Proper tyGroup>        
25     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
26       <Debug Type>pdbon ly</DebugT ype>        
27       <Optim ize>true</ Optimize>        
28       <Outpu tPath>bin\ Release\</ OutputPath >        
29       <Defin eConstants >TRACE</De fineConsta nts>        
30       <Error Report>pro mpt</Error Report>        
31       <Warni ngLevel>4< /WarningLe vel>        
32     </Proper tyGroup>        
33     <Propert yGroup>        
34       <SignA ssembly>tr ue</SignAs sembly>        
35     </Proper tyGroup>        
36     <Propert yGroup>        
37       <Assem blyOrigina torKeyFile >Keyfile.s nk</Assemb lyOriginat orKeyFile>        
38     </Proper tyGroup>        
39     <ItemGro up>        
40       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy, V ersion=7.0 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35, proc essorArchi tecture=MS IL">        
41         <Spe cificVersi on>False</ SpecificVe rsion>        
42         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath >        
43       </Refe rence>        
44       <Refer ence Inclu de="Micros oft.Xrm.Sd k, Version =7.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35,  processorA rchitectur e=MSIL">        
45         <Spe cificVersi on>False</ SpecificVe rsion>        
46         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path>        
47       </Refe rence>        
48       <Refer ence Inclu de="System " />        
49       <Refer ence Inclu de="System .Core" />        
50       <Refer ence Inclu de="System .Directory Services"  />        
51       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
52       <Refer ence Inclu de="System .Enterpris eServices"  />        
53       <Refer ence Inclu de="System .IdentityM odel" />        
54       <Refer ence Inclu de="System .Runtime.S erializati on" />        
55       <Refer ence Inclu de="System .Security"  />        
56       <Refer ence Inclu de="System .ServiceMo del" />        
57       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
58       <Refer ence Inclu de="System .Web" />        
59       <Refer ence Inclu de="System .Xml.Linq"  />        
60       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
61       <Refer ence Inclu de="Micros oft.CSharp " />        
62       <Refer ence Inclu de="System .Data" />        
63       <Refer ence Inclu de="System .Xml" />        
64     </ItemGr oup>        
65     <ItemGro up>        
66       <Compi le Include ="Calculat ePricePlug in.cs" />        
67     </ItemGr oup>        
68     <ItemGro up>        
69       <None  Include="K eyfile.snk " />        
70       <None  Include="p ackages.co nfig" />        
71     </ItemGr oup>        
72     <ItemGro up>        
73       <Folde r Include= "Propertie s\" />        
74     </ItemGr oup>        
75     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
76     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
77          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
78     <Target  Name="Befo reBuild">        
79     </Target >        
80     <Target  Name="Afte rBuild">        
81     </Target >        
82     -->        
83   </Project>