129. Araxis Merge File Comparison Report

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

129.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\Azure\AzureAwareWorkflowActivity AzureAwareWorkflowActivity.csproj Tue Dec 20 19:51:42 2016 UTC
2 Wed Feb 1 19:56:19 2017 UTC

129.2 Comparison summary

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

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

129.4 Active regular expressions

No regular expressions were active.

129.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> 8.0.30703< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{9D 0F1A98-C18 2-43BE-9E5 8-74A4B439 8BED}</Pro jectGuid>        
9       <Outpu tType>Libr ary</Outpu tType>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>M icrosoft.C rm.Sdk.Sam ples</Root Namespace>        
12       <Assem blyName>Az ureAwareWo rkflowActi vity</Asse mblyName>        
13       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
14       <FileA lignment>5 12</FileAl ignment>        
15       <Targe tFramework Profile />        
16     </Proper tyGroup>        
17     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| AnyCPU' ">        
18       <Debug Symbols>tr ue</DebugS ymbols>        
19       <Debug Type>full< /DebugType >        
20       <Optim ize>false< /Optimize>        
21       <Outpu tPath>bin\ Debug\</Ou tputPath>        
22       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
23       <Error Report>pro mpt</Error Report>        
24       <Warni ngLevel>4< /WarningLe vel>        
25       <Prefe r32Bit>fal se</Prefer 32Bit>        
26     </Proper tyGroup>        
27     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|AnyCPU'  ">        
28       <Debug Type>pdbon ly</DebugT ype>        
29       <Optim ize>true</ Optimize>        
30       <Outpu tPath>bin\ Release\</ OutputPath >        
31       <Defin eConstants >TRACE</De fineConsta nts>        
32       <Error Report>pro mpt</Error Report>        
33       <Warni ngLevel>4< /WarningLe vel>        
34       <Prefe r32Bit>fal se</Prefer 32Bit>        
35     </Proper tyGroup>        
36     <Propert yGroup>        
37       <SignA ssembly>tr ue</SignAs sembly>        
38     </Proper tyGroup>        
39     <Propert yGroup>        
40       <Assem blyOrigina torKeyFile >key.snk</ AssemblyOr iginatorKe yFile>        
41     </Proper tyGroup>        
42     <ItemGro up>        
43       <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">        
44         <Spe cificVersi on>False</ SpecificVe rsion>        
45         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath>        
46       </Refe rence>        
47       <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">        
48         <Spe cificVersi on>False</ SpecificVe rsion>        
49         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Xrm. Sdk.dll</H intPath>        
50       </Refe rence>        
51       <Refer ence Inclu de="Micros oft.Xrm.Sd k.Workflow , Version= 7.0.0.0, C ulture=neu tral, Publ icKeyToken =31bf3856a d364e35, p rocessorAr chitecture =MSIL">        
52         <Spe cificVersi on>False</ SpecificVe rsion>        
53         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.Workf low.7.0.0\ lib\net45\ Microsoft. Xrm.Sdk.Wo rkflow.dll </HintPath >        
54       </Refe rence>        
55       <Refer ence Inclu de="Presen tationFram ework" />        
56       <Refer ence Inclu de="System " />        
57       <Refer ence Inclu de="System .Activitie s" />        
58       <Refer ence Inclu de="System .Activitie s.Presenta tion" />        
59       <Refer ence Inclu de="System .Core" />        
60       <Refer ence Inclu de="System .Directory Services"  />        
61       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
62       <Refer ence Inclu de="System .IdentityM odel" />        
63       <Refer ence Inclu de="System .Runtime.S erializati on" />        
64       <Refer ence Inclu de="System .Security"  />        
65       <Refer ence Inclu de="System .ServiceMo del" />        
66       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
67       <Refer ence Inclu de="System .Web" />        
68       <Refer ence Inclu de="System .Workflow. Activities " />        
69       <Refer ence Inclu de="System .Workflow. ComponentM odel" />        
70       <Refer ence Inclu de="System .Workflow. Runtime" / >        
71       <Refer ence Inclu de="System .Xml.Linq"  />        
72       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
73       <Refer ence Inclu de="System .Data" />        
74       <Refer ence Inclu de="System .Xml" />        
75     </ItemGr oup>        
76     <ItemGro up>        
77       <Compi le Include ="Activity .cs" />        
78       <Compi le Include ="Properti es\Assembl yInfo.cs"  />        
79     </ItemGr oup>        
80     <ItemGro up>        
81       <None  Include="a pp.config"  />        
82       <None  Include="k ey.snk" />        
83       <None  Include="p ackages.co nfig" />        
84     </ItemGr oup>        
85     <ItemGro up>        
86       <Conte nt Include ="bin\Debu g\AzureAwa reWorkflow Activity.d ll" />        
87       <Conte nt Include ="bin\Debu g\AzureAwa reWorkflow Activity.p db" />        
88       <Conte nt Include ="bin\Debu g\Microsof t.Crm.Sdk. Proxy.dll"  />        
89       <Conte nt Include ="bin\Debu g\Microsof t.Crm.Sdk. Proxy.xml"  />        
90       <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. dll" />        
91       <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. Workflow.d ll" />        
92       <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. Workflow.x ml" />        
93       <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. xml" />        
94     </ItemGr oup>        
95     <ItemGro up>        
96       <Folde r Include= "bin\Relea se\" />        
97     </ItemGr oup>        
98     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
99     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
100          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
101     <Target  Name="Befo reBuild">        
102     </Target >        
103     <Target  Name="Afte rBuild">        
104     </Target >        
105     -->        
106   </Project>