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

318.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\CrmSvcUtilExtensions\GeneratePicklistEnums GeneratePicklistEnums.csproj Tue Dec 20 19:51:44 2016 UTC
2 Wed Feb 1 19:56:29 2017 UTC

318.2 Comparison summary

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

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

318.4 Active regular expressions

No regular expressions were active.

318.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)'  == '' ">An yCPU</Plat form>        
6       <Produ ctVersion> 8.0.30703< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{6B 498A14-F54 E-4E96-87B 3-5D44822E 898D}</Pro jectGuid>        
9       <Outpu tType>Libr ary</Outpu tType>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>G eneratePic klistEnums </RootName space>        
12       <Assem blyName>Ge neratePick listEnums< /AssemblyN ame>        
13       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
14       <FileA lignment>5 12</FileAl ignment>        
15       <Targe tFramework Profile />        
16     </Proper tyGroup>        
17     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
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       <Prefe r32Bit>fal se</Prefer 32Bit>        
26     </Proper tyGroup>        
27     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
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       <Prefe r32Bit>fal se</Prefer 32Bit>        
35     </Proper tyGroup>        
36     <Propert yGroup>        
37       <Start upObject / >        
38     </Proper tyGroup>        
39     <ItemGro up>        
40       <Refer ence Inclu de="CrmSvc Util">        
41         <Hin tPath>..\. .\..\..\Bi n\CrmSvcUt il.exe</Hi ntPath>        
42       </Refe rence>        
43       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy, V ersion=8.0 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35, proc essorArchi tecture=MS IL">        
44         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.8.0 .0-preview \lib\net45 \Microsoft .Crm.Sdk.P roxy.dll</ HintPath>        
45         <Pri vate>True< /Private>        
46       </Refe rence>        
47       <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">        
48         <Pri vate>True< /Private>        
49         <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h>        
50       </Refe rence>        
51       <Refer ence Inclu de="Micros oft.Xrm.Sd k, Version =8.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35,  processorA rchitectur e=MSIL">        
52         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.8.0 .0-preview \lib\net45 \Microsoft .Xrm.Sdk.d ll</HintPa th>        
53         <Pri vate>True< /Private>        
54       </Refe rence>        
55       <Refer ence Inclu de="System " />        
56       <Refer ence Inclu de="System .Core" />        
57       <Refer ence Inclu de="System .Directory Services"  />        
58       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
59       <Refer ence Inclu de="System .IdentityM odel" />        
60       <Refer ence Inclu de="System .Runtime.S erializati on" />        
61       <Refer ence Inclu de="System .Security"  />        
62       <Refer ence Inclu de="System .ServiceMo del" />        
63       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
64       <Refer ence Inclu de="System .Web" />        
65       <Refer ence Inclu de="System .Xml.Linq"  />        
66       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
67       <Refer ence Inclu de="Micros oft.CSharp " />        
68       <Refer ence Inclu de="System .Data" />        
69       <Refer ence Inclu de="System .Xml" />        
70     </ItemGr oup>        
71     <ItemGro up>        
72       <Compi le Include ="CodeCust omizationS ervice.cs"  />        
73       <Compi le Include ="Filterin gService.c s" />        
74       <Compi le Include ="NamingSe rvice.cs"  />        
75     </ItemGr oup>        
76     <ItemGro up>        
77       <Folde r Include= "Propertie s\" />        
78     </ItemGr oup>        
79     <ItemGro up>        
80       <None  Include="p ackages.co nfig" />        
81     </ItemGr oup>        
82     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
83     <Propert yGroup>        
84       <PostB uildEvent> copy "$(So lutionDir) GenerateOp tionSets.b at" .\</Po stBuildEve nt>        
85     </Proper tyGroup>        
86     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
87          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
88     <Target  Name="Befo reBuild">        
89     </Target >        
90     <Target  Name="Afte rBuild">        
91     </Target >        
92     -->        
93   </Project>