608. Araxis Merge File Comparison Report

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

608.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\Process\CustomWorkflowActivities\TestNet4Activity TestNet4Activity.csproj Tue Dec 20 19:51:45 2016 UTC
2 Wed Feb 1 19:56:52 2017 UTC

608.2 Comparison summary

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

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

608.4 Active regular expressions

No regular expressions were active.

608.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       <Produ ctVersion> 10.0.30319 </ProductV ersion>        
6       <Schem aVersion>2 .0</Schema Version>        
7       <Proje ctGuid>{94 AD8D8B-B1A 4-48EF-B09 D-F245695F 9055}</Pro jectGuid>        
8       <Outpu tType>Libr ary</Outpu tType>        
9       <RootN amespace>M icrosoft.C rm.QA.Work flow</Root Namespace>        
10       <Assem blyName>Mi crosoft.Cr m.QA.Workf low.TestNe t4Activity </Assembly Name>        
11       <Proje ctTypeGuid s>{1482270 9-B5A1-472 4-98CA-57A 101D1B079} ;{FAE04EC0 -301F-11D3 -BF4B-00C0 4F79EFBC}< /ProjectTy peGuids>        
12       <Warni ngLevel>4< /WarningLe vel>        
13       <SignA ssembly>tr ue</SignAs sembly>        
14       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
15       <FileU pgradeFlag s>        
16       </File UpgradeFla gs>        
17       <OldTo olsVersion >3.5</OldT oolsVersio n>        
18       <Upgra deBackupLo cation>        
19       </Upgr adeBackupL ocation>        
20       <Targe tFramework Profile />        
21       <Publi shUrl>publ ish\</Publ ishUrl>        
22       <Insta ll>true</I nstall>        
23       <Insta llFrom>Dis k</Install From>        
24       <Updat eEnabled>f alse</Upda teEnabled>        
25       <Updat eMode>Fore ground</Up dateMode>        
26       <Updat eInterval> 7</UpdateI nterval>        
27       <Updat eIntervalU nits>Days< /UpdateInt ervalUnits >        
28       <Updat ePeriodica lly>false< /UpdatePer iodically>        
29       <Updat eRequired> false</Upd ateRequire d>        
30       <MapFi leExtensio ns>true</M apFileExte nsions>        
31       <Appli cationRevi sion>0</Ap plicationR evision>        
32       <Appli cationVers ion>1.0.0. %2a</Appli cationVers ion>        
33       <IsWeb Bootstrapp er>false</ IsWebBoots trapper>        
34       <UseAp plicationT rust>false </UseAppli cationTrus t>        
35       <Boots trapperEna bled>true< /Bootstrap perEnabled >        
36       <Assem blyOrigina torKeyFile >        
37       </Asse mblyOrigin atorKeyFil e>        
38     </Proper tyGroup>        
39     <Propert yGroup Con dition=" ' $(Configur ation)' ==  'Debug' " >        
40       <Debug Symbols>tr ue</DebugS ymbols>        
41       <Debug Type>full< /DebugType >        
42       <Optim ize>false< /Optimize>        
43       <Outpu tPath>.\bi n\Debug\</ OutputPath >        
44       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
45       <UseVS HostingPro cess>false </UseVSHos tingProces s>        
46       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
47       <Prefe r32Bit>fal se</Prefer 32Bit>        
48     </Proper tyGroup>        
49     <Propert yGroup Con dition=" ' $(Configur ation)' ==  'Release'  ">        
50       <Debug Symbols>fa lse</Debug Symbols>        
51       <Optim ize>true</ Optimize>        
52       <Outpu tPath>.\bi n\Release\ </OutputPa th>        
53       <Defin eConstants >TRACE</De fineConsta nts>        
54       <UseVS HostingPro cess>false </UseVSHos tingProces s>        
55       <CodeA nalysisRul eSet>AllRu les.rulese t</CodeAna lysisRuleS et>        
56       <Prefe r32Bit>fal se</Prefer 32Bit>        
57     </Proper tyGroup>        
58     <ItemGro up>        
59       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy">        
60         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath >        
61       </Refe rence>        
62       <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">        
63         <Pri vate>True< /Private>        
64         <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h>        
65       </Refe rence>        
66       <Refer ence Inclu de="Micros oft.Xrm.Sd k">        
67         <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path>        
68       </Refe rence>        
69       <Refer ence Inclu de="Micros oft.Xrm.Sd k.Workflow ">        
70         <Hin tPath>pack ages\Micro soft.CrmSd k.Workflow .7.0.0\lib \net45\Mic rosoft.Xrm .Sdk.Workf low.dll</H intPath>        
71       </Refe rence>        
72       <Refer ence Inclu de="Presen tationFram ework" />        
73       <Refer ence Inclu de="System .Activitie s" />        
74       <Refer ence Inclu de="System .Activitie s.Presenta tion" />        
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 .IdentityM odel" />        
78       <Refer ence Inclu de="System .Runtime.S erializati on" />        
79       <Refer ence Inclu de="System .Security"  />        
80       <Refer ence Inclu de="System .ServiceMo del" />        
81       <Refer ence Inclu de="System " />        
82       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
83       <Refer ence Inclu de="System .Web" />        
84       <Refer ence Inclu de="System .Workflow. Activities " />        
85       <Refer ence Inclu de="System .Workflow. ComponentM odel" />        
86       <Refer ence Inclu de="System .Workflow. Runtime" / >        
87       <Refer ence Inclu de="System .Xml" />        
88       <Refer ence Inclu de="System .Web.Servi ces" />        
89       <Refer ence Inclu de="System .Xml.Linq"  />        
90     </ItemGr oup>        
91     <ItemGro up>        
92       <Compi le Include ="..\..\.. \HelperCod e\MyOrgani zationCrmS dkTypes.cs ">        
93         <Lin k>MyOrgani zationCrmS dkTypes.cs </Link>        
94       </Comp ile>        
95       <Compi le Include ="HelperCl asses.cs">        
96         <Sub Type>Code< /SubType>        
97       </Comp ile>        
98       <Compi le Include ="SimpleSd kActivity. cs" />        
99       <Compi le Include ="ReleaseI SVActiviti es.cs" />        
100       <AppDe signer Inc lude="Prop erties\" / >        
101     </ItemGr oup>        
102     <ItemGro up>        
103       <Folde r Include= "Propertie s\" />        
104     </ItemGr oup>        
105     <ItemGro up>        
106       <Boots trapperPac kage Inclu de=".NETFr amework,Ve rsion=v4.0 ">        
107         <Vis ible>False </Visible>        
108         <Pro ductName>M icrosoft . NET Framew ork 4 %28x 86 and x64 %29</Produ ctName>        
109         <Ins tall>true< /Install>        
110       </Boot strapperPa ckage>        
111       <Boots trapperPac kage Inclu de="Micros oft.Net.Cl ient.3.5">        
112         <Vis ible>False </Visible>        
113         <Pro ductName>. NET Framew ork 3.5 SP 1 Client P rofile</Pr oductName>        
114         <Ins tall>false </Install>        
115       </Boot strapperPa ckage>        
116       <Boots trapperPac kage Inclu de="Micros oft.Net.Fr amework.3. 5.SP1">        
117         <Vis ible>False </Visible>        
118         <Pro ductName>. NET Framew ork 3.5 SP 1</Product Name>        
119         <Ins tall>false </Install>        
120       </Boot strapperPa ckage>        
121       <Boots trapperPac kage Inclu de="Micros oft.Window s.Installe r.3.1">        
122         <Vis ible>False </Visible>        
123         <Pro ductName>W indows Ins taller 3.1 </ProductN ame>        
124         <Ins tall>true< /Install>        
125       </Boot strapperPa ckage>        
126     </ItemGr oup>        
127     <ItemGro up>        
128       <None  Include="p ackages.co nfig" />        
129     </ItemGr oup>        
130     <Import  Project="$ (MSBuildBi nPath)\Mic rosoft.CSh arp.Target s" />        
131     <Import  Project="$ (MSBuildTo olsPath)\W orkflow.Ta rgets" />        
132   </Project>        

Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.