296. Araxis Merge File Comparison Report

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

296.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\Client\SOAPLogger\SOAPLogger SOAPLogger.csproj Tue Dec 20 19:51:45 2016 UTC
2 Wed Feb 1 19:56:29 2017 UTC

296.2 Comparison summary

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

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

296.4 Active regular expressions

No regular expressions were active.

296.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     <Propert yGroup>        
4       <Confi guration C ondition="  '$(Config uration)'  == '' ">De bug</Confi guration>        
5       <Platf orm Condit ion=" '$(P latform)'  == '' ">x8 6</Platfor m>        
6       <Produ ctVersion> 8.0.30703< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{09 51D2FC-2F2 2-4953-BA9 4-58A0C9F0 73E6}</Pro jectGuid>        
9       <Outpu tType>Exe< /OutputTyp e>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>S OAPLogger< /RootNames pace>        
12       <Assem blyName>SO APLogger</ AssemblyNa me>        
13       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
14       <Targe tFramework Profile>        
15       </Targ etFramewor kProfile>        
16       <FileA lignment>5 12</FileAl ignment>        
17     </Proper tyGroup>        
18     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| x86' ">        
19       <Platf ormTarget> x86</Platf ormTarget>        
20       <Debug Symbols>tr ue</DebugS ymbols>        
21       <Debug Type>full< /DebugType >        
22       <Optim ize>false< /Optimize>        
23       <Outpu tPath>bin\ Debug\</Ou tputPath>        
24       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
25       <Error Report>pro mpt</Error Report>        
26       <Warni ngLevel>4< /WarningLe vel>        
27       <Prefe r32Bit>fal se</Prefer 32Bit>        
28     </Proper tyGroup>        
29     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|x86' ">        
30       <Platf ormTarget> x86</Platf ormTarget>        
31       <Debug Type>pdbon ly</DebugT ype>        
32       <Optim ize>true</ Optimize>        
33       <Outpu tPath>bin\ Release\</ OutputPath >        
34       <Defin eConstants >TRACE</De fineConsta nts>        
35       <Error Report>pro mpt</Error Report>        
36       <Warni ngLevel>4< /WarningLe vel>        
37       <Prefe r32Bit>fal se</Prefer 32Bit>        
38     </Proper tyGroup>        
39     <ItemGro up>        
40       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy">        
41         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath>        
42       </Refe rence>        
43       <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">        
44         <Pri vate>True< /Private>        
45         <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.6.1.7600 .16394\lib \net35\Mic rosoft.Ide ntityModel .dll</Hint Path>        
46       </Refe rence>        
47       <Refer ence Inclu de="Micros oft.Xrm.Sd k">        
48         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Xrm. Sdk.dll</H intPath>        
49       </Refe rence>        
50       <Refer ence Inclu de="System " />        
51       <Refer ence Inclu de="System .Core" />        
52       <Refer ence Inclu de="System .Directory Services"  />        
53       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
54       <Refer ence Inclu de="System .IdentityM odel" />        
55       <Refer ence Inclu de="System .Runtime.S erializati on" />        
56       <Refer ence Inclu de="System .Security"  />        
57       <Refer ence Inclu de="System .ServiceMo del" />        
58       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
59       <Refer ence Inclu de="System .Web" />        
60       <Refer ence Inclu de="System .Xml.Linq"  />        
61       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
62       <Refer ence Inclu de="Micros oft.CSharp " />        
63       <Refer ence Inclu de="System .Data" />        
64       <Refer ence Inclu de="System .Xml" />        
65     </ItemGr oup>        
66     <ItemGro up>        
67       <Compi le Include ="..\..\.. \HelperCod e\CrmServi ceHelpers. cs">        
68         <Lin k>CrmServi ceHelpers. cs</Link>        
69       </Comp ile>        
70       <Compi le Include ="..\..\.. \HelperCod e\DeviceId Manager.cs ">        
71         <Lin k>DeviceId Manager.cs </Link>        
72       </Comp ile>        
73       <Compi le Include ="..\..\.. \HelperCod e\MyOrgani zationCrmS dkTypes.cs ">        
74         <Lin k>MyOrgani zationCrmS dkTypes.cs </Link>        
75       </Comp ile>        
76       <Compi le Include ="SOAPLogg er.cs" />        
77       <Compi le Include ="Properti es\Assembl yInfo.cs"  />        
78       <Compi le Include ="SoapLogg erOrganiza tionServic e.cs" />        
79     </ItemGr oup>        
80     <ItemGro up>        
81       <None  Include="a pp.config"  />        
82       <None  Include="p ackages.co nfig" />        
83     </ItemGr oup>        
84     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
85     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
86          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
87     <Target  Name="Befo reBuild">        
88     </Target >        
89     <Target  Name="Afte rBuild">        
90     </Target >        
91     -->        
92   </Project>