632. Araxis Merge File Comparison Report

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

632.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\QuickStart\WinForms QuickStart using WinForms.csproj Tue Dec 20 19:51:42 2016 UTC
2 Wed Feb 1 19:56:54 2017 UTC

632.2 Comparison summary

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

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

632.4 Active regular expressions

No regular expressions were active.

632.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)'  == '' ">x8 6</Platfor m>        
6       <Produ ctVersion> 8.0.30703< /ProductVe rsion>        
7       <Schem aVersion>2 .0</Schema Version>        
8       <Proje ctGuid>{5B C50BE5-3B0 4-4745-B91 1-B7BAF72D B20B}</Pro jectGuid>        
9       <Outpu tType>WinE xe</Output Type>        
10       <AppDe signerFold er>Propert ies</AppDe signerFold er>        
11       <RootN amespace>M icrosoft.C rm.Sdk.Sam ples</Root Namespace>        
12       <Assem blyName>qu ickstartWF </Assembly Name>        
13       <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion>        
14       <Targe tFramework Profile>        
15       </Targ etFramewor kProfile>        
16       <FileA lignment>5 12</FileAl ignment>        
17     </Proper tyGroup>        
18     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Debug| x86' ">        
19       <Platf ormTarget> x86</Platf ormTarget>        
20       <Debug Symbols>tr ue</DebugS ymbols>        
21       <Debug Type>full< /DebugType >        
22       <Optim ize>false< /Optimize>        
23       <Outpu tPath>bin\ Debug\</Ou tputPath>        
24       <Defin eConstants >DEBUG;TRA CE</Define Constants>        
25       <Error Report>pro mpt</Error Report>        
26       <Warni ngLevel>4< /WarningLe vel>        
27       <Prefe r32Bit>fal se</Prefer 32Bit>        
28     </Proper tyGroup>        
29     <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)'  == 'Releas e|x86' ">        
30       <Platf ormTarget> x86</Platf ormTarget>        
31       <Debug Type>pdbon ly</DebugT ype>        
32       <Optim ize>true</ Optimize>        
33       <Outpu tPath>bin\ Release\</ OutputPath >        
34       <Defin eConstants >TRACE</De fineConsta nts>        
35       <Error Report>pro mpt</Error Report>        
36       <Warni ngLevel>4< /WarningLe vel>        
37       <Prefe r32Bit>fal se</Prefer 32Bit>        
38     </Proper tyGroup>        
39     <Propert yGroup>        
40       <Start upObject>M icrosoft.C rm.Sdk.Sam ples.Sampl eCRUD</Sta rtupObject >        
41     </Proper tyGroup>        
42     <ItemGro up>        
43       <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy, V ersion=8.0 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35, proc essorArchi tecture=MS IL">        
44         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 8.0.0\lib\ net45\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath>        
45         <Pri vate>True< /Private>        
46       </Refe rence>        
47       <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">        
48         <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.6.1.7600 .16394\lib \net35\Mic rosoft.Ide ntityModel .dll</Hint Path>        
49         <Pri vate>True< /Private>        
50       </Refe rence>        
51       <Refer ence Inclu de="Micros oft.Identi tyModel.Cl ients.Acti veDirector y, Version =2.18.0.0,  Culture=n eutral, Pu blicKeyTok en=31bf385 6ad364e35,  processor Architectu re=MSIL">        
52         <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.2.18 .206251556 \lib\net45 \Microsoft .IdentityM odel.Clien ts.ActiveD irectory.d ll</HintPa th>        
53         <Pri vate>True< /Private>        
54       </Refe rence>        
55       <Refer ence Inclu de="Micros oft.Identi tyModel.Cl ients.Acti veDirector y.WindowsF orms, Vers ion=2.18.0 .0, Cultur e=neutral,  PublicKey Token=31bf 3856ad364e 35, proces sorArchite cture=MSIL ">        
56         <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.2.18 .206251556 \lib\net45 \Microsoft .IdentityM odel.Clien ts.ActiveD irectory.W indowsForm s.dll</Hin tPath>        
57         <Pri vate>True< /Private>        
58       </Refe rence>        
59       <Refer ence Inclu de="Micros oft.Xrm.Sd k, Version =8.0.0.0,  Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35,  processorA rchitectur e=MSIL">        
60         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 8.0.0\lib\ net45\Micr osoft.Xrm. Sdk.dll</H intPath>        
61         <Pri vate>True< /Private>        
62       </Refe rence>        
63       <Refer ence Inclu de="Micros oft.Xrm.Sd k.Deployme nt, Versio n=8.0.0.0,  Culture=n eutral, Pu blicKeyTok en=31bf385 6ad364e35,  processor Architectu re=MSIL">        
64         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.Deplo yment.8.0. 0\lib\net4 5\Microsof t.Xrm.Sdk. Deployment .dll</Hint Path>        
65         <Pri vate>True< /Private>        
66       </Refe rence>        
67       <Refer ence Inclu de="Micros oft.Xrm.Sd k.Workflow , Version= 8.0.0.0, C ulture=neu tral, Publ icKeyToken =31bf3856a d364e35, p rocessorAr chitecture =MSIL">        
68         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.Workf low.8.0.0\ lib\net45\ Microsoft. Xrm.Sdk.Wo rkflow.dll </HintPath >        
69         <Pri vate>True< /Private>        
70       </Refe rence>        
71       <Refer ence Inclu de="Micros oft.Xrm.To oling.Conn ector, Ver sion=2.0.0 .0, Cultur e=neutral,  PublicKey Token=31bf 3856ad364e 35, proces sorArchite cture=MSIL ">        
72         <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.XrmTo oling.Core Assembly.8 .0.0\lib\n et45\Micro soft.Xrm.T ooling.Con nector.dll </HintPath >        
73         <Pri vate>True< /Private>        
74       </Refe rence>        
75       <Refer ence Inclu de="Presen tationCore " />        
76       <Refer ence Inclu de="Presen tationFram ework" />        
77       <Refer ence Inclu de="System " />        
78       <Refer ence Inclu de="System .Activitie s" />        
79       <Refer ence Inclu de="System .Activitie s.Presenta tion" />        
80       <Refer ence Inclu de="System .configura tion" />        
81       <Refer ence Inclu de="System .Core" />        
82       <Refer ence Inclu de="System .Data.Serv ices" />        
83       <Refer ence Inclu de="System .Data.Serv ices.Clien t" />        
84       <Refer ence Inclu de="System .Design" / >        
85       <Refer ence Inclu de="System .Directory Services"  />        
86       <Refer ence Inclu de="System .Directory Services.A ccountMana gement" />        
87       <Refer ence Inclu de="System .IdentityM odel" />        
88       <Refer ence Inclu de="System .Runtime.C aching" />        
89       <Refer ence Inclu de="System .Runtime.S erializati on" />        
90       <Refer ence Inclu de="System .Security"  />        
91       <Refer ence Inclu de="System .ServiceMo del" />        
92       <Refer ence Inclu de="System .ServiceMo del.Activa tion" />        
93       <Refer ence Inclu de="System .ServiceMo del.Web" / >        
94       <Refer ence Inclu de="System .Web" />        
95       <Refer ence Inclu de="System .Web.Appli cationServ ices" />        
96       <Refer ence Inclu de="System .Web.Exten sions" />        
97       <Refer ence Inclu de="System .Web.Servi ces" />        
98       <Refer ence Inclu de="System .Workflow. Activities " />        
99       <Refer ence Inclu de="System .Workflow. ComponentM odel" />        
100       <Refer ence Inclu de="System .Workflow. Runtime" / >        
101       <Refer ence Inclu de="System .Xaml" />        
102       <Refer ence Inclu de="System .Xml.Linq"  />        
103       <Refer ence Inclu de="System .Data.Data SetExtensi ons" />        
104       <Refer ence Inclu de="Micros oft.CSharp " />        
105       <Refer ence Inclu de="System .Data" />        
106       <Refer ence Inclu de="System .Deploymen t" />        
107       <Refer ence Inclu de="System .Drawing"  />        
108       <Refer ence Inclu de="System .Windows.F orms" />        
109       <Refer ence Inclu de="System .Xml" />        
110       <Refer ence Inclu de="Window sBase" />        
111     </ItemGr oup>        
112     <ItemGro up>        
113       <Compi le Include ="..\..\He lperCode\M yOrganizat ionCrmSdkT ypes.cs">        
114         <Lin k>MyOrgani zationCrmS dkTypes.cs </Link>        
115       </Comp ile>        
116       <Compi le Include ="..\..\He lperCode\O ptionSets. cs">        
117         <Lin k>OptionSe ts.cs</Lin k>        
118       </Comp ile>        
119       <Compi le Include ="Properti es\Assembl yInfo.cs"  />        
120       <Compi le Include ="SampleCR UD.cs" />        
121       <Compi le Include ="WinCRUDO perations. cs">        
122         <Sub Type>Form< /SubType>        
123       </Comp ile>        
124       <Compi le Include ="WinCRUDO perations. Designer.c s">        
125         <Dep endentUpon >WinCRUDOp erations.c s</Depende ntUpon>        
126       </Comp ile>        
127       <Embed dedResourc e Include= "Propertie s\Resource s.resx">        
128         <Gen erator>Res XFileCodeG enerator</ Generator>        
129         <Las tGenOutput >Resources .Designer. cs</LastGe nOutput>        
130         <Sub Type>Desig ner</SubTy pe>        
131       </Embe ddedResour ce>        
132       <Compi le Include ="Properti es\Resourc es.Designe r.cs">        
133         <Aut oGen>True< /AutoGen>        
134         <Dep endentUpon >Resources .resx</Dep endentUpon >        
135         <Des ignTime>Tr ue</Design Time>        
136       </Comp ile>        
137       <Embed dedResourc e Include= "WinCRUDOp erations.r esx">        
138         <Dep endentUpon >WinCRUDOp erations.c s</Depende ntUpon>        
139       </Embe ddedResour ce>        
140       <None  Include=". .\app.conf ig">        
141         <Lin k>app.conf ig</Link>        
142       </None >        
143       <None  Include="p ackages.co nfig" />        
144       <None  Include="P roperties\ Settings.s ettings">        
145         <Gen erator>Set tingsSingl eFileGener ator</Gene rator>        
146         <Las tGenOutput >Settings. Designer.c s</LastGen Output>        
147       </None >        
148       <Compi le Include ="Properti es\Setting s.Designer .cs">        
149         <Aut oGen>True< /AutoGen>        
150         <Dep endentUpon >Settings. settings</ DependentU pon>        
151         <Des ignTimeSha redInput>T rue</Desig nTimeShare dInput>        
152       </Comp ile>        
153     </ItemGr oup>        
154     <ItemGro up>        
155       <Conte nt Include ="bin\tool s\CrmSvcUt il.exe" />        
156       <Conte nt Include ="bin\tool s\CrmSvcUt il.xml" />        
157       <Conte nt Include ="bin\tool s\Microsof t.Crm.Sdk. Proxy.dll"  />        
158       <Conte nt Include ="bin\tool s\Microsof t.Xrm.Clie nt.dll" />        
159       <Conte nt Include ="bin\tool s\Microsof t.Xrm.Sdk. dll" />        
160       <Conte nt Include ="bin\tool s\WebsiteC opy.exe" / >        
161     </ItemGr oup>        
162     <ItemGro up>        
163       <Folde r Include= "bin\Debug \" />        
164       <Folde r Include= "bin\Relea se\" />        
165     </ItemGr oup>        
166     <Import  Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" />        
167     <!-- To  modify you r build pr ocess, add  your task  inside on e of the t argets bel ow and unc omment it.          
168          Oth er similar  extension  points ex ist, see M icrosoft.C ommon.targ ets.        
169     <Target  Name="Befo reBuild">        
170     </Target >        
171     <Target  Name="Afte rBuild">        
172     </Target >        
173     -->        
174   </Project>