335. Araxis Merge File Comparison Report

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

335.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\Auditing UserAccessAuditing.csproj Tue Dec 20 19:51:43 2016 UTC
2 Wed Feb 1 19:56:30 2017 UTC

335.2 Comparison summary

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

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

335.4 Active regular expressions

No regular expressions were active.

335.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> 9.0.30729< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{F4 31C592-301 E-43AC-AC2 E-208D3406 2C48}</Pro jectGuid>        
9       <Outpu tType>Exe< /OutputTyp e>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>U serAccessA uditing</R ootNamespa ce>        
12       <Assem blyName>Us erAccessAu diting</As semblyName >        
13       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
14       <FileA lignment>5 12</FileAl ignment>        
15       <FileU pgradeFlag s>        
16       </File UpgradeFla gs>        
17       <OldTo olsVersion >3.5</OldT oolsVersio n>        
18       <Upgra deBackupLo cation />        
19       <Targe tFramework Profile />        
20       <Publi shUrl>publ ish\</Publ ishUrl>        
21       <Insta ll>true</I nstall>        
22       <Insta llFrom>Dis k</Install From>        
23       <Updat eEnabled>f alse</Upda teEnabled>        
24       <Updat eMode>Fore ground</Up dateMode>        
25       <Updat eInterval> 7</UpdateI nterval>        
26       <Updat eIntervalU nits>Days< /UpdateInt ervalUnits >        
27       <Updat ePeriodica lly>false< /UpdatePer iodically>        
28       <Updat eRequired> false</Upd ateRequire d>        
29       <MapFi leExtensio ns>true</M apFileExte nsions>        
30       <Appli cationRevi sion>0</Ap plicationR evision>        
31       <Appli cationVers ion>1.0.0. %2a</Appli cationVers ion>        
32       <IsWeb Bootstrapp er>false</ IsWebBoots trapper>        
33       <UseAp plicationT rust>false </UseAppli cationTrus t>        
34       <Boots trapperEna bled>true< /Bootstrap perEnabled >        
35     </Proper tyGroup>        
36     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
37       <Debug Symbols>tr ue</DebugS ymbols>        
38       <Debug Type>full< /DebugType >        
39       <Optim ize>false< /Optimize>        
40       <Outpu tPath>bin\ Debug\</Ou tputPath>        
41       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
42       <Error Report>pro mpt</Error Report>        
43       <Warni ngLevel>4< /WarningLe vel>        
44       <Prefe r32Bit>fal se</Prefer 32Bit>        
45     </Proper tyGroup>        
46     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
47       <Debug Type>pdbon ly</DebugT ype>        
48       <Optim ize>true</ Optimize>        
49       <Outpu tPath>bin\ Release\</ OutputPath >        
50       <Defin eConstants >TRACE</De fineConsta nts>        
51       <Error Report>pro mpt</Error Report>        
52       <Warni ngLevel>4< /WarningLe vel>        
53       <Prefe r32Bit>fal se</Prefer 32Bit>        
54     </Proper tyGroup>        
55     <Propert yGroup>        
56       <Start upObject>M icrosoft.C rm.Sdk.Sam ples.UserA ccessAudit ing</Start upObject>        
57     </Proper tyGroup>        
58     <ItemGro up>        
59       <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">        
60         <Spe cificVersi on>False</ SpecificVe rsion>        
61         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath >        
62       </Refe rence>        
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.Xrm.Sd k, Version =7.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35,  processorA rchitectur e=MSIL">        
68         <Spe cificVersi on>False</ SpecificVe rsion>        
69         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path>        
70       </Refe rence>        
71       <Refer ence Inclu de="System " />        
72       <Refer ence Inclu de="System .Core">        
73         <Req uiredTarge tFramework >3.5</Requ iredTarget Framework>        
74       </Refe rence>        
75       <Refer ence Inclu de="System .Directory Services"  />        
76       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
77       <Refer ence Inclu de="System .Enterpris eServices"  />        
78       <Refer ence Inclu de="System .IdentityM odel" />        
79       <Refer ence Inclu de="System .Runtime.S erializati on" />        
80       <Refer ence Inclu de="System .Security"  />        
81       <Refer ence Inclu de="System .ServiceMo del">        
82         <Req uiredTarge tFramework >3.0</Requ iredTarget Framework>        
83       </Refe rence>        
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.Linq" >        
88         <Req uiredTarge tFramework >3.5</Requ iredTarget Framework>        
89       </Refe rence>        
90       <Refer ence Inclu de="System .Data.Data SetExtensi ons">        
91         <Req uiredTarge tFramework >3.5</Requ iredTarget Framework>        
92       </Refe rence>        
93       <Refer ence Inclu de="System .Data" />        
94       <Refer ence Inclu de="System .Xml" />        
95     </ItemGr oup>        
96     <ItemGro up>        
97       <Compi le Include ="..\..\He lperCode\C rmServiceH elpers.cs" >        
98         <Lin k>CrmServi ceHelpers. cs</Link>        
99       </Comp ile>        
100       <Compi le Include ="..\..\He lperCode\D eviceIdMan ager.cs">        
101         <Lin k>DeviceId Manager.cs </Link>        
102       </Comp ile>        
103       <Compi le Include ="..\..\He lperCode\M yOrganizat ionCrmSdkT ypes.cs">        
104         <Lin k>MyOrgani zationCrmS dkTypes.cs </Link>        
105       </Comp ile>        
106       <Compi le Include ="..\..\He lperCode\O ptionSets. cs">        
107         <Lin k>OptionSe ts.cs</Lin k>        
108       </Comp ile>        
109       <Compi le Include ="UserAcce ssAuditing .cs" />        
110     </ItemGr oup>        
111     <ItemGro up>        
112       <Boots trapperPac kage Inclu de="Micros oft.Net.Cl ient.3.5">        
113         <Vis ible>False </Visible>        
114         <Pro ductName>. NET Framew ork 3.5 SP 1 Client P rofile</Pr oductName>        
115         <Ins tall>false </Install>        
116       </Boot strapperPa ckage>        
117       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5.SP1">        
118         <Vis ible>False </Visible>        
119         <Pro ductName>. NET Framew ork 3.5 SP 1</Product Name>        
120         <Ins tall>true< /Install>        
121       </Boot strapperPa ckage>        
122       <Boots trapperPac kage Inclu de="Micros oft.Window s.Installe r.3.1">        
123         <Vis ible>False </Visible>        
124         <Pro ductName>W indows Ins taller 3.1 </ProductN ame>        
125         <Ins tall>true< /Install>        
126       </Boot strapperPa ckage>        
127     </ItemGr oup>        
128     <ItemGro up>        
129       <Folde r Include= "Propertie s\" />        
130     </ItemGr oup>        
131     <ItemGro up>        
132       <None  Include="a pp.config"  />        
133       <None  Include="p ackages.co nfig" />        
134     </ItemGr oup>        
135     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
136     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
137          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
138     <Target  Name="Befo reBuild">        
139     </Target >        
140     <Target  Name="Afte rBuild">        
141     </Target >        
142     -->        
143   </Project>