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.
| # | 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 | QuickStart with Simplified Connection.csproj | Tue Dec 20 19:51:42 2016 UTC |
| 2 | Wed Feb 1 19:56:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 155 |
| 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 |
No regular expressions were active.
| 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>{DC A301FF-5F2 E-49BD-A7F B-615BF70B CAEB}</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>Si mpleConnec t</Assembl yName> | |||||
| 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 | <ItemGro up> | |||||
| 40 | <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"> | |||||
| 41 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 42 | <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.8.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath > | |||||
| 43 | <Pri vate>True< /Private> | |||||
| 44 | </Refe rence> | |||||
| 45 | <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"> | |||||
| 46 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 47 | <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h> | |||||
| 48 | <Pri vate>True< /Private> | |||||
| 49 | </Refe rence> | |||||
| 50 | <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"> | |||||
| 51 | <Hin tPath>pack ages\Micro soft.Ident ityModel.C lients.Act iveDirecto ry.2.18.20 6251556\li b\net45\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.dll< /HintPath> | |||||
| 52 | <Pri vate>True< /Private> | |||||
| 53 | </Refe rence> | |||||
| 54 | <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 "> | |||||
| 55 | <Hin tPath>pack ages\Micro soft.Ident ityModel.C lients.Act iveDirecto ry.2.18.20 6251556\li b\net45\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.Wind owsForms.d ll</HintPa th> | |||||
| 56 | <Pri vate>True< /Private> | |||||
| 57 | </Refe rence> | |||||
| 58 | <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"> | |||||
| 59 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 60 | <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.8.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path> | |||||
| 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>pack ages\Micro soft.CrmSd k.Deployme nt.8.0.0\l ib\net45\M icrosoft.X rm.Sdk.Dep loyment.dl l</HintPat h> | |||||
| 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>pack ages\Micro soft.CrmSd k.Workflow .8.0.0\lib \net45\Mic rosoft.Xrm .Sdk.Workf low.dll</H intPath> | |||||
| 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>pack ages\Micro soft.CrmSd k.XrmTooli ng.CoreAss embly.8.0. 0\lib\net4 5\Microsof t.Xrm.Tool ing.Connec tor.dll</H intPath> | |||||
| 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 .Drawing" /> | |||||
| 88 | <Refer ence Inclu de="System .IdentityM odel" /> | |||||
| 89 | <Refer ence Inclu de="System .Runtime.C aching" /> | |||||
| 90 | <Refer ence Inclu de="System .Runtime.S erializati on" /> | |||||
| 91 | <Refer ence Inclu de="System .Security" /> | |||||
| 92 | <Refer ence Inclu de="System .ServiceMo del" /> | |||||
| 93 | <Refer ence Inclu de="System .ServiceMo del.Activa tion" /> | |||||
| 94 | <Refer ence Inclu de="System .ServiceMo del.Web" / > | |||||
| 95 | <Refer ence Inclu de="System .Web" /> | |||||
| 96 | <Refer ence Inclu de="System .Web.Appli cationServ ices" /> | |||||
| 97 | <Refer ence Inclu de="System .Web.Exten sions" /> | |||||
| 98 | <Refer ence Inclu de="System .Web.Servi ces" /> | |||||
| 99 | <Refer ence Inclu de="System .Workflow. Activities " /> | |||||
| 100 | <Refer ence Inclu de="System .Workflow. ComponentM odel" /> | |||||
| 101 | <Refer ence Inclu de="System .Workflow. Runtime" / > | |||||
| 102 | <Refer ence Inclu de="System .Xaml" /> | |||||
| 103 | <Refer ence Inclu de="System .Xml.Linq" /> | |||||
| 104 | <Refer ence Inclu de="Micros oft.CSharp " /> | |||||
| 105 | <Refer ence Inclu de="System .Data" /> | |||||
| 106 | <Refer ence Inclu de="System .Xml" /> | |||||
| 107 | <Refer ence Inclu de="Window sBase" /> | |||||
| 108 | </ItemGr oup> | |||||
| 109 | <ItemGro up> | |||||
| 110 | <Compi le Include ="..\Helpe rCode\MyOr ganization CrmSdkType s.cs"> | |||||
| 111 | <Lin k>MyOrgani zationCrmS dkTypes.cs </Link> | |||||
| 112 | </Comp ile> | |||||
| 113 | <Compi le Include ="..\Helpe rCode\Opti onSets.cs" > | |||||
| 114 | <Lin k>OptionSe ts.cs</Lin k> | |||||
| 115 | </Comp ile> | |||||
| 116 | <Compi le Include ="Simplifi edConnecti on.cs" /> | |||||
| 117 | </ItemGr oup> | |||||
| 118 | <ItemGro up> | |||||
| 119 | <None Include="a pp.config" > | |||||
| 120 | <Sub Type>Desig ner</SubTy pe> | |||||
| 121 | <Cop yToOutputD irectory>A lways</Cop yToOutputD irectory> | |||||
| 122 | </None > | |||||
| 123 | <None Include="b in\Debug\B asicOperat ions.exe.c onfig" /> | |||||
| 124 | <None Include="b in\Debug\B asicOperat ions.vshos t.exe.conf ig" /> | |||||
| 125 | <None Include="b in\Debug\B asicOperat ions.vshos t.exe.mani fest" /> | |||||
| 126 | <None Include="p ackages.co nfig" /> | |||||
| 127 | </ItemGr oup> | |||||
| 128 | <ItemGro up> | |||||
| 129 | <Folde r Include= "Propertie s\" /> | |||||
| 130 | </ItemGr oup> | |||||
| 131 | <ItemGro up> | |||||
| 132 | <Conte nt Include ="bin\Debu g\BasicOpe rations.ex e" /> | |||||
| 133 | <Conte nt Include ="bin\Debu g\BasicOpe rations.pd b" /> | |||||
| 134 | <Conte nt Include ="bin\Debu g\BasicOpe rations.vs host.exe" /> | |||||
| 135 | <Conte nt Include ="bin\Debu g\Microsof t.Crm.Sdk. Proxy.dll" /> | |||||
| 136 | <Conte nt Include ="bin\Debu g\Microsof t.Crm.Sdk. Proxy.xml" /> | |||||
| 137 | <Conte nt Include ="bin\Debu g\Microsof t.Identity Model.dll" /> | |||||
| 138 | <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. dll" /> | |||||
| 139 | <Conte nt Include ="bin\Debu g\Microsof t.Xrm.Sdk. xml" /> | |||||
| 140 | <Conte nt Include ="bin\tool s\CrmSvcUt il.exe" /> | |||||
| 141 | <Conte nt Include ="bin\tool s\CrmSvcUt il.xml" /> | |||||
| 142 | <Conte nt Include ="bin\tool s\Microsof t.Crm.Sdk. Proxy.dll" /> | |||||
| 143 | <Conte nt Include ="bin\tool s\Microsof t.Xrm.Clie nt.dll" /> | |||||
| 144 | <Conte nt Include ="bin\tool s\Microsof t.Xrm.Sdk. dll" /> | |||||
| 145 | <Conte nt Include ="bin\tool s\WebsiteC opy.exe" / > | |||||
| 146 | </ItemGr oup> | |||||
| 147 | <Import Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" /> | |||||
| 148 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 149 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 150 | <Target Name="Befo reBuild"> | |||||
| 151 | </Target > | |||||
| 152 | <Target Name="Afte rBuild"> | |||||
| 153 | </Target > | |||||
| 154 | --> | |||||
| 155 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.