849. Araxis Merge File Comparison Report

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

849.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\Tools\DeviceRegistration DeviceRegistration.csproj Tue Dec 20 19:52:28 2016 UTC
2 Wed Feb 1 19:57:16 2017 UTC

849.2 Comparison summary

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

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

849.4 Active regular expressions

No regular expressions were active.

849.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <Project D efaultTarg ets="Build " xmlns="h ttp://sche mas.micros oft.com/de veloper/ms build/2003 " ToolsVer sion="4.0" >        
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> 10.0.30319 </ProductV ersion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{55 89A06B-0B9 C-420B-84C 8-64122066 4514}</Pro jectGuid>        
9       <Outpu tType>Exe< /OutputTyp e>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>M icrosoft.C rm.Service s.Utility< /RootNames pace>        
12       <Assem blyName>De viceRegist ration</As semblyName >        
13       <FileU pgradeFlag s>        
14       </File UpgradeFla gs>        
15       <OldTo olsVersion >3.5</OldT oolsVersio n>        
16       <Upgra deBackupLo cation>        
17       </Upgr adeBackupL ocation>        
18       <IsWeb Bootstrapp er>true</I sWebBootst rapper>        
19       <Start upObject>M icrosoft.C rm.Service s.Utility. LiveDevice IdUtil</St artupObjec t>        
20       <Targe tFramework Version>v4 .0</Target FrameworkV ersion>        
21       <NoWin 32Manifest >true</NoW in32Manife st>        
22       <Publi shUrl>http ://localho st/ConfigF ileWriter/ </PublishU rl>        
23       <Insta ll>true</I nstall>        
24       <Insta llFrom>Web </InstallF rom>        
25       <Updat eEnabled>t rue</Updat eEnabled>        
26       <Updat eMode>Fore ground</Up dateMode>        
27       <Updat eInterval> 7</UpdateI nterval>        
28       <Updat eIntervalU nits>Days< /UpdateInt ervalUnits >        
29       <Updat ePeriodica lly>false< /UpdatePer iodically>        
30       <Updat eRequired> false</Upd ateRequire d>        
31       <MapFi leExtensio ns>true</M apFileExte nsions>        
32       <Appli cationRevi sion>0</Ap plicationR evision>        
33       <Appli cationVers ion>1.0.0. %2a</Appli cationVers ion>        
34       <UseAp plicationT rust>false </UseAppli cationTrus t>        
35       <Boots trapperEna bled>true< /Bootstrap perEnabled >        
36       <Targe tFramework Profile />        
37     </Proper tyGroup>        
38     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
39       <Debug Symbols>tr ue</DebugS ymbols>        
40       <Debug Type>full< /DebugType >        
41       <Optim ize>false< /Optimize>        
42       <Outpu tPath>bin\ Debug\</Ou tputPath>        
43       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
44       <Error Report>pro mpt</Error Report>        
45       <Warni ngLevel>4< /WarningLe vel>        
46       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
47     </Proper tyGroup>        
48     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
49       <Debug Type>pdbon ly</DebugT ype>        
50       <Optim ize>true</ Optimize>        
51       <Outpu tPath>bin\ Release\</ OutputPath >        
52       <Defin eConstants >TRACE</De fineConsta nts>        
53       <Error Report>pro mpt</Error Report>        
54       <Warni ngLevel>4< /WarningLe vel>        
55       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
56     </Proper tyGroup>        
57     <ItemGro up>        
58       <Refer ence Inclu de="System " />        
59       <Refer ence Inclu de="System .Security"  />        
60       <Refer ence Inclu de="System .ServiceMo del" />        
61       <Refer ence Inclu de="System .Web.Servi ces" />        
62       <Refer ence Inclu de="System .Xml" />        
63     </ItemGr oup>        
64     <ItemGro up>        
65       <Compi le Include ="..\..\Sa mpleCode\C S\HelperCo de\DeviceI dManager.c s">        
66         <Lin k>DeviceId Manager.cs </Link>        
67       </Comp ile>        
68       <Compi le Include ="CommandL ineParamet ers.cs" />        
69       <Compi le Include ="Program. cs" />        
70     </ItemGr oup>        
71     <ItemGro up>        
72       <Boots trapperPac kage Inclu de="Micros oft.Net.Cl ient.3.5">        
73         <Vis ible>False </Visible>        
74         <Pro ductName>. NET Framew ork 3.5 SP 1 Client P rofile</Pr oductName>        
75         <Ins tall>false </Install>        
76       </Boot strapperPa ckage>        
77       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.2. 0">        
78         <Vis ible>False </Visible>        
79         <Pro ductName>. NET Framew ork 2.0 %2 8x86%29</P roductName >        
80         <Ins tall>true< /Install>        
81       </Boot strapperPa ckage>        
82       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 0">        
83         <Vis ible>False </Visible>        
84         <Pro ductName>. NET Framew ork 3.0 %2 8x86%29</P roductName >        
85         <Ins tall>false </Install>        
86       </Boot strapperPa ckage>        
87       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5">        
88         <Vis ible>False </Visible>        
89         <Pro ductName>. NET Framew ork 3.5</P roductName >        
90         <Ins tall>false </Install>        
91       </Boot strapperPa ckage>        
92       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5.SP1">        
93         <Vis ible>False </Visible>        
94         <Pro ductName>. NET Framew ork 3.5 SP 1</Product Name>        
95         <Ins tall>false </Install>        
96       </Boot strapperPa ckage>        
97     </ItemGr oup>        
98     <ItemGro up>        
99       <Folde r Include= "Propertie s\" />        
100     </ItemGr oup>        
101     <Import  Project="$ (MSBuildBi nPath)\Mic rosoft.CSh arp.target s" />        
102     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
103          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
104     <Target  Name="Befo reBuild">        
105     </Target >        
106     <Target  Name="Afte rBuild">        
107     </Target >        
108     -->        
109   </Project>