719. Araxis Merge File Comparison Report

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

719.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\JS\RESTEndpoint\JavaScriptRESTAssociateDisassociate\JavaScriptRESTAssociateDisassociate JavaScriptRESTAssociateDisassociate.csproj Tue Dec 20 19:51:48 2016 UTC
2 Wed Feb 1 19:56:58 2017 UTC

719.2 Comparison summary

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

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

719.4 Active regular expressions

No regular expressions were active.

719.5 Comparison detail

1   <?xml vers ion="1.0"  encoding=" utf-8"?>        
2   <Project T oolsVersio n="4.0" De faultTarge ts="Build"  xmlns="ht tp://schem as.microso ft.com/dev eloper/msb uild/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       <Produ ctVersion>        
8       </Prod uctVersion >        
9       <Schem aVersion>2 .0</Schema Version>        
10       <Proje ctGuid>{F9 83392F-F62 B-4582-8F4 8-74B7ECDC F662}</Pro jectGuid>        
11       <Proje ctTypeGuid s>{349c585 1-65df-11d a-9384-000 65b846f21} ;{fae04ec0 -301f-11d3 -bf4b-00c0 4f79efbc}< /ProjectTy peGuids>        
12       <Outpu tType>Libr ary</Outpu tType>        
13       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
14       <RootN amespace>J avaScriptR ESTAssocia teDisassoc iate</Root Namespace>        
15       <Assem blyName>Ja vaScriptRE STAssociat eDisassoci ate</Assem blyName>        
16       <Targe tFramework Version>v4 .0</Target FrameworkV ersion>        
17       <UseII SExpress>f alse</UseI ISExpress>        
18       <FileU pgradeFlag s>        
19       </File UpgradeFla gs>        
20       <Upgra deBackupLo cation>        
21       </Upgr adeBackupL ocation>        
22       <OldTo olsVersion >4.0</OldT oolsVersio n>        
23       <IISEx pressSSLPo rt />        
24       <IISEx pressAnony mousAuthen tication / >        
25       <IISEx pressWindo wsAuthenti cation />        
26       <IISEx pressUseCl assicPipel ineMode />        
27     </Proper tyGroup>        
28     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
29       <Debug Symbols>tr ue</DebugS ymbols>        
30       <Debug Type>full< /DebugType >        
31       <Optim ize>false< /Optimize>        
32       <Outpu tPath>bin\ </OutputPa th>        
33       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
34       <Error Report>pro mpt</Error Report>        
35       <Warni ngLevel>4< /WarningLe vel>        
36       <Publi shDatabase s>false</P ublishData bases>        
37       <Packa geAsSingle File>false </PackageA sSingleFil e>        
38     </Proper tyGroup>        
39     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
40       <Debug Type>pdbon ly</DebugT ype>        
41       <Optim ize>true</ Optimize>        
42       <Outpu tPath>bin\ </OutputPa th>        
43       <Defin eConstants >TRACE</De fineConsta nts>        
44       <Error Report>pro mpt</Error Report>        
45       <Warni ngLevel>4< /WarningLe vel>        
46     </Proper tyGroup>        
47     <ItemGro up>        
48       <Folde r Include= "Propertie s\" />        
49     </ItemGr oup>        
50     <ItemGro up>        
51       <Conte nt Include ="Scripts\ JavaScript RESTAssoci ateDisasso ciate.js"  />        
52       <Conte nt Include ="JavaScri ptRESTAsso ciateDisas sociate.ht m" />        
53       <Conte nt Include ="Scripts\ SDK.REST.j s" />        
54     </ItemGr oup>        
55     <Propert yGroup>        
56       <Visua lStudioVer sion Condi tion="'$(V isualStudi oVersion)'  == ''">10 .0</Visual StudioVers ion>        
57       <VSToo lsPath Con dition="'$ (VSToolsPa th)' == '' ">$(MSBuil dExtension sPath32)\M icrosoft\V isualStudi o\v$(Visua lStudioVer sion)</VST oolsPath>        
58     </Proper tyGroup>        
59     <Import  Project="$ (MSBuildBi nPath)\Mic rosoft.CSh arp.target s" />        
60     <Import  Project="$ (VSToolsPa th)\WebApp lications\ Microsoft. WebApplica tion.targe ts" Condit ion="'$(VS ToolsPath) ' != ''" / >        
61     <Import  Project="$ (MSBuildEx tensionsPa th32)\Micr osoft\Visu alStudio\v 10.0\WebAp plications \Microsoft .WebApplic ation.targ ets" Condi tion="fals e" />        
62     <Project Extensions >        
63       <Visua lStudio>        
64         <Fla vorPropert ies GUID=" {349c5851- 65df-11da- 9384-00065 b846f21}">        
65           <W ebProjectP roperties>        
66              <UseIIS>Fa lse</UseII S>        
67              <AutoAssig nPort>True </AutoAssi gnPort>        
68              <Developme ntServerPo rt>16473</ Developmen tServerPor t>        
69              <Developme ntServerVP ath>/</Dev elopmentSe rverVPath>        
70              <IISUrl>        
71              </IISUrl>        
72              <NTLMAuthe ntication> False</NTL MAuthentic ation>        
73              <UseCustom Server>Fal se</UseCus tomServer>        
74              <CustomSer verUrl>        
75              </CustomSe rverUrl>        
76              <SaveServe rSettingsI nUserFile> False</Sav eServerSet tingsInUse rFile>        
77           </ WebProject Properties >        
78         </Fl avorProper ties>        
79       </Visu alStudio>        
80     </Projec tExtension s>        
81     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
82          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
83     <Target  Name="Befo reBuild">        
84     </Target >        
85     <Target  Name="Afte rBuild">        
86     </Target >        
87     -->        
88   </Project>