365. Araxis Merge File Comparison Report

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

365.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\DataManagement\ExecuteTransaction ExecuteTransaction.csproj Tue Dec 20 19:51:43 2016 UTC
2 Wed Feb 1 19:56:31 2017 UTC

365.2 Comparison summary

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

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

365.4 Active regular expressions

No regular expressions were active.

365.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>{E7 664F53-16A B-4D7B-B97 8-B16F0F82 5277}</Pro jectGuid>        
8       <Outpu tType>Exe< /OutputTyp e>        
9       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
10       <RootN amespace>E xecuteTran saction</R ootNamespa ce>        
11       <Assem blyName>Ex ecuteTrans action</As semblyName >        
12       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
13       <FileA lignment>5 12</FileAl ignment>        
14       <AutoG enerateBin dingRedire cts>true</ AutoGenera teBindingR edirects>        
15     </Proper tyGroup>        
16     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
17       <Platf ormTarget> AnyCPU</Pl atformTarg et>        
18       <Debug Symbols>tr ue</DebugS ymbols>        
19       <Debug Type>full< /DebugType >        
20       <Optim ize>false< /Optimize>        
21       <Outpu tPath>bin\ Debug\</Ou tputPath>        
22       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
23       <Error Report>pro mpt</Error Report>        
24       <Warni ngLevel>4< /WarningLe vel>        
25     </Proper tyGroup>        
26     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
27       <Platf ormTarget> AnyCPU</Pl atformTarg et>        
28       <Debug Type>pdbon ly</DebugT ype>        
29       <Optim ize>true</ Optimize>        
30       <Outpu tPath>bin\ Release\</ OutputPath >        
31       <Defin eConstants >TRACE</De fineConsta nts>        
32       <Error Report>pro mpt</Error Report>        
33       <Warni ngLevel>4< /WarningLe vel>        
34     </Proper tyGroup>        
35     <ItemGro up>        
36       <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">        
37         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.1 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath >        
38         <Pri vate>True< /Private>        
39       </Refe rence>        
40       <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">        
41         <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h>        
42         <Pri vate>True< /Private>        
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         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.1 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path>        
46         <Pri vate>True< /Private>        
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 .IdentityM odel" />        
53       <Refer ence Inclu de="System .Runtime.S erializati on" />        
54       <Refer ence Inclu de="System .Security"  />        
55       <Refer ence Inclu de="System .ServiceMo del" />        
56       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
57       <Refer ence Inclu de="System .Web" />        
58       <Refer ence Inclu de="System .Xml.Linq"  />        
59       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
60       <Refer ence Inclu de="Micros oft.CSharp " />        
61       <Refer ence Inclu de="System .Data" />        
62       <Refer ence Inclu de="System .Xml" />        
63     </ItemGr oup>        
64     <ItemGro up>        
65       <Compi le Include ="..\..\He lperCode\C rmServiceH elpers.cs" >        
66         <Lin k>CrmServi ceHelpers. cs</Link>        
67       </Comp ile>        
68       <Compi le Include ="..\..\He lperCode\D eviceIdMan ager.cs">        
69         <Lin k>DeviceId Manager.cs </Link>        
70       </Comp ile>        
71       <Compi le Include ="..\..\He lperCode\M yOrganizat ionCrmSdkT ypes.cs">        
72         <Lin k>MyOrgani zationCrmS dkTypes.cs </Link>        
73       </Comp ile>        
74       <Compi le Include ="ExecuteT ransaction .cs" />        
75       <Compi le Include ="Properti es\Assembl yInfo.cs"  />        
76     </ItemGr oup>        
77     <ItemGro up>        
78       <None  Include="A pp.config"  />        
79       <None  Include="p ackages.co nfig" />        
80     </ItemGr oup>        
81     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
82     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
83          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
84     <Target  Name="Befo reBuild">        
85     </Target >        
86     <Target  Name="Afte rBuild">        
87     </Target >        
88     -->        
89   </Project>