680. Araxis Merge File Comparison Report

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

680.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\WsdlBasedProxies\ADClaims ADClaims.csproj Tue Dec 20 19:51:47 2016 UTC
2 Wed Feb 1 19:56:56 2017 UTC

680.2 Comparison summary

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

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

680.4 Active regular expressions

No regular expressions were active.

680.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="12.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.20826 </ProductV ersion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{E4 522DF7-514 C-4F41-9E2 D-88F3418B 40BF}</Pro jectGuid>        
9       <Outpu tType>Exe< /OutputTyp e>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>M icrosoft.C rm.Sdk.Sam ples</Root Namespace>        
12       <Assem blyName>AD Claims</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       <Publi shUrl>publ ish\</Publ ishUrl>        
19       <Insta ll>true</I nstall>        
20       <Insta llFrom>Dis k</Install From>        
21       <Updat eEnabled>f alse</Upda teEnabled>        
22       <Updat eMode>Fore ground</Up dateMode>        
23       <Updat eInterval> 7</UpdateI nterval>        
24       <Updat eIntervalU nits>Days< /UpdateInt ervalUnits >        
25       <Updat ePeriodica lly>false< /UpdatePer iodically>        
26       <Updat eRequired> false</Upd ateRequire d>        
27       <MapFi leExtensio ns>true</M apFileExte nsions>        
28       <Appli cationRevi sion>0</Ap plicationR evision>        
29       <Appli cationVers ion>1.0.0. %2a</Appli cationVers ion>        
30       <IsWeb Bootstrapp er>false</ IsWebBoots trapper>        
31       <UseAp plicationT rust>false </UseAppli cationTrus t>        
32       <Boots trapperEna bled>true< /Bootstrap perEnabled >        
33       <NoWin 32Manifest >true</NoW in32Manife st>        
34       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
35       <Targe tFramework Profile />        
36       <SignA ssembly>fa lse</SignA ssembly>        
37       <Assem blyOrigina torKeyFile >        
38       </Asse mblyOrigin atorKeyFil e>        
39     </Proper tyGroup>        
40     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
41       <Debug Symbols>tr ue</DebugS ymbols>        
42       <Debug Type>full< /DebugType >        
43       <Optim ize>false< /Optimize>        
44       <Outpu tPath>bin\ Debug\</Ou tputPath>        
45       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
46       <Error Report>pro mpt</Error Report>        
47       <Warni ngLevel>4< /WarningLe vel>        
48       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
49       <UseVS HostingPro cess>false </UseVSHos tingProces s>        
50       <Prefe r32Bit>fal se</Prefer 32Bit>        
51     </Proper tyGroup>        
52     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
53       <Debug Type>pdbon ly</DebugT ype>        
54       <Optim ize>true</ Optimize>        
55       <Outpu tPath>bin\ Release\</ OutputPath >        
56       <Defin eConstants >TRACE</De fineConsta nts>        
57       <Error Report>pro mpt</Error Report>        
58       <Warni ngLevel>4< /WarningLe vel>        
59       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
60       <Prefe r32Bit>fal se</Prefer 32Bit>        
61     </Proper tyGroup>        
62     <Propert yGroup>        
63       <Start upObject>M icrosoft.C rm.Sdk.Sam ples.Progr am</Startu pObject>        
64     </Proper tyGroup>        
65     <ItemGro up>        
66       <Refer ence Inclu de="System " />        
67       <Refer ence Inclu de="System .IdentityM odel" />        
68       <Refer ence Inclu de="System .Runtime.S erializati on" />        
69       <Refer ence Inclu de="System .ServiceMo del" />        
70       <Refer ence Inclu de="System .Web.Servi ces" />        
71       <Refer ence Inclu de="System .Xml" />        
72     </ItemGr oup>        
73     <ItemGro up>        
74       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.2. 0">        
75         <Vis ible>False </Visible>        
76         <Pro ductName>. NET Framew ork 2.0 %2 8x86%29</P roductName >        
77         <Ins tall>true< /Install>        
78       </Boot strapperPa ckage>        
79       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 0">        
80         <Vis ible>False </Visible>        
81         <Pro ductName>. NET Framew ork 3.0 %2 8x86%29</P roductName >        
82         <Ins tall>false </Install>        
83       </Boot strapperPa ckage>        
84       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5">        
85         <Vis ible>False </Visible>        
86         <Pro ductName>. NET Framew ork 3.5</P roductName >        
87         <Ins tall>false </Install>        
88       </Boot strapperPa ckage>        
89     </ItemGr oup>        
90     <ItemGro up>        
91       <Folde r Include= "Propertie s\" />        
92     </ItemGr oup>        
93     <ItemGro up>        
94       <Compi le Include ="Program. cs" />        
95       <Compi le Include ="Service  References \CrmSdk.Di scovery\Re ference.cs ">        
96         <Aut oGen>True< /AutoGen>        
97         <Des ignTime>Tr ue</Design Time>        
98         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
99       </Comp ile>        
100       <Compi le Include ="Service  References \CrmSdk\Re ference.cs ">        
101         <Aut oGen>True< /AutoGen>        
102         <Des ignTime>Tr ue</Design Time>        
103         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
104       </Comp ile>        
105     </ItemGr oup>        
106     <ItemGro up>        
107       <WCFMe tadata Inc lude="Serv ice Refere nces\" />        
108     </ItemGr oup>        
109     <ItemGro up>        
110       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Disco very.wsdl"  />        
111       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Disco very1.wsdl " />        
112       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Disco veryServic e.wsdl" />        
113       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Micro soft.Crm.S dk.Samples .CrmSdk.Di scovery.Di scoveryRes ponse.data source">        
114         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
115       </None >        
116       <None  Include="S ervice Ref erences\Cr mSdk\Micro soft.Crm.S dk.Samples .CrmSdk.En tity.datas ource">        
117         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
118       </None >        
119       <None  Include="S ervice Ref erences\Cr mSdk\Micro soft.Crm.S dk.Samples .CrmSdk.En tityCollec tion.datas ource">        
120         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
121       </None >        
122       <None  Include="S ervice Ref erences\Cr mSdk\Micro soft.Crm.S dk.Samples .CrmSdk.Or ganization Response.d atasource" >        
123         <Dep endentUpon >Reference .svcmap</D ependentUp on>        
124       </None >        
125       <None  Include="S ervice Ref erences\Cr mSdk\Organ ization.di sco" />        
126       <None  Include="S ervice Ref erences\Cr mSdk\confi guration91 .svcinfo"  />        
127       <None  Include="S ervice Ref erences\Cr mSdk\confi guration.s vcinfo" />        
128       <None  Include="S ervice Ref erences\Cr mSdk\Refer ence.svcma p">        
129         <Gen erator>WCF  Proxy Gen erator</Ge nerator>        
130         <Las tGenOutput >Reference .cs</LastG enOutput>        
131       </None >        
132       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Disco very.disco " />        
133       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\confi guration91 .svcinfo"  />        
134       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\confi guration.s vcinfo" />        
135       <None  Include="S ervice Ref erences\Cr mSdk.Disco very\Refer ence.svcma p">        
136         <Gen erator>WCF  Proxy Gen erator</Ge nerator>        
137         <Las tGenOutput >Reference .cs</LastG enOutput>        
138       </None >        
139       <Conte nt Include ="Setup.tx t" />        
140     </ItemGr oup>        
141     <ItemGro up>        
142       <None  Include="a pp.config"  />        
143       <None  Include="S ervice Ref erences\Cr mSdk\Organ ization.ws dl" />        
144       <None  Include="S ervice Ref erences\Cr mSdk\Organ izationSer vice.wsdl"  />        
145     </ItemGr oup>        
146     <ItemGro up>        
147       <WCFMe tadataStor age Includ e="Service  Reference s\CrmSdk.D iscovery\"  />        
148       <WCFMe tadataStor age Includ e="Service  Reference s\CrmSdk\"  />        
149     </ItemGr oup>        
150     <Import  Project="$ (MSBuildBi nPath)\Mic rosoft.CSh arp.target s" />        
151     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
152          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
153     <Target  Name="Befo reBuild">        
154     </Target >        
155     <Target  Name="Afte rBuild">        
156     </Target >        
157     -->        
158   </Project>