Produced by Araxis Merge on 2/1/2017 2:56:57 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\XRMTooling\QuickStartXRMToolingWPFClient | QuickStartXRMToolingWPFClient.csproj | Tue Dec 20 19:51:43 2016 UTC |
| 2 | Wed Feb 1 19:56:57 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 183 |
| 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="4.0" De faultTarge ts="Build" xmlns="ht tp://schem as.microso ft.com/dev eloper/msb uild/2003" > | |||||
| 3 | <Import Project="$ (MSBuildEx tensionsPa th)\$(MSBu ildToolsVe rsion)\Mic rosoft.Com mon.props" Condition ="Exists(' $(MSBuildE xtensionsP ath)\$(MSB uildToolsV ersion)\Mi crosoft.Co mmon.props ')" /> | |||||
| 4 | <Propert yGroup> | |||||
| 5 | <Confi guration C ondition=" '$(Config uration)' == '' ">De bug</Confi guration> | |||||
| 6 | <Platf orm Condit ion=" '$(P latform)' == '' ">An yCPU</Plat form> | |||||
| 7 | <Proje ctGuid>{FE 6CB7F7-1F2 E-44F1-815 6-ACB55D8E 4369}</Pro jectGuid> | |||||
| 8 | <Outpu tType>WinE xe</Output Type> | |||||
| 9 | <AppDe signerFold er>Propert ies</AppDe signerFold er> | |||||
| 10 | <RootN amespace>Q uickStartX RMToolingW PFClient</ RootNamesp ace> | |||||
| 11 | <Assem blyName>Qu ickStartXR MToolingWP FClient</A ssemblyNam e> | |||||
| 12 | <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion> | |||||
| 13 | <FileA lignment>5 12</FileAl ignment> | |||||
| 14 | <Proje ctTypeGuid s>{60dc813 4-eba5-43b 8-bcc9-bb4 bc16c2548} ;{FAE04EC0 -301F-11D3 -BF4B-00C0 4F79EFBC}< /ProjectTy peGuids> | |||||
| 15 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 16 | <Solut ionDir Con dition="$( SolutionDi r) == '' O r $(Soluti onDir) == '*Undefine d*'">..\</ SolutionDi r> | |||||
| 17 | </Proper tyGroup> | |||||
| 18 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Debug| AnyCPU' "> | |||||
| 19 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 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 | </Proper tyGroup> | |||||
| 28 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Releas e|AnyCPU' "> | |||||
| 29 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 30 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 31 | <Optim ize>true</ Optimize> | |||||
| 32 | <Outpu tPath>bin\ Release\</ OutputPath > | |||||
| 33 | <Defin eConstants >TRACE</De fineConsta nts> | |||||
| 34 | <Error Report>pro mpt</Error Report> | |||||
| 35 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 36 | </Proper tyGroup> | |||||
| 37 | <ItemGro up> | |||||
| 38 | <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"> | |||||
| 39 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 8.1.0\lib\ net45\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath> | |||||
| 40 | <Pri vate>True< /Private> | |||||
| 41 | </Refe rence> | |||||
| 42 | <Refer ence Inclu de="Micros oft.Identi tyModel.Cl ients.Acti veDirector y"> | |||||
| 43 | <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.2.19 .208020213 \lib\net45 \Microsoft .IdentityM odel.Clien ts.ActiveD irectory.d ll</HintPa th> | |||||
| 44 | </Refe rence> | |||||
| 45 | <Refer ence Inclu de="Micros oft.Identi tyModel.Cl ients.Acti veDirector y.WindowsF orms"> | |||||
| 46 | <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.Clients. ActiveDire ctory.2.19 .208020213 \lib\net45 \Microsoft .IdentityM odel.Clien ts.ActiveD irectory.W indowsForm s.dll</Hin tPath> | |||||
| 47 | </Refe rence> | |||||
| 48 | <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"> | |||||
| 49 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 8.1.0\lib\ net45\Micr osoft.Xrm. Sdk.dll</H intPath> | |||||
| 50 | <Pri vate>True< /Private> | |||||
| 51 | </Refe rence> | |||||
| 52 | <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"> | |||||
| 53 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.Deplo yment.8.1. 0\lib\net4 5\Microsof t.Xrm.Sdk. Deployment .dll</Hint Path> | |||||
| 54 | <Pri vate>True< /Private> | |||||
| 55 | </Refe rence> | |||||
| 56 | <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"> | |||||
| 57 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.Workf low.8.1.0\ lib\net45\ Microsoft. Xrm.Sdk.Wo rkflow.dll </HintPath > | |||||
| 58 | <Pri vate>True< /Private> | |||||
| 59 | </Refe rence> | |||||
| 60 | <Refer ence Inclu de="Micros oft.Xrm.To oling.Conn ector, Ver sion=2.1.0 .0, Cultur e=neutral, PublicKey Token=31bf 3856ad364e 35, proces sorArchite cture=MSIL "> | |||||
| 61 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.XrmTo oling.Core Assembly.8 .1.0.1\lib \net45\Mic rosoft.Xrm .Tooling.C onnector.d ll</HintPa th> | |||||
| 62 | <Pri vate>True< /Private> | |||||
| 63 | </Refe rence> | |||||
| 64 | <Refer ence Inclu de="Micros oft.Xrm.To oling.CrmC onnectCont rol, Versi on=2.1.0.0 , Culture= neutral, P ublicKeyTo ken=31bf38 56ad364e35 , processo rArchitect ure=MSIL"> | |||||
| 65 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.XrmTo oling.WpfC ontrols.8. 1.0\lib\ne t45\Micros oft.Xrm.To oling.CrmC onnectCont rol.dll</H intPath> | |||||
| 66 | <Pri vate>True< /Private> | |||||
| 67 | </Refe rence> | |||||
| 68 | <Refer ence Inclu de="Micros oft.Xrm.To oling.Ui.S tyles, Ver sion=3.0.0 .0, Cultur e=neutral, PublicKey Token=31bf 3856ad364e 35, proces sorArchite cture=MSIL "> | |||||
| 69 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.XrmTo oling.WpfC ontrols.8. 1.0\lib\ne t45\Micros oft.Xrm.To oling.Ui.S tyles.dll< /HintPath> | |||||
| 70 | <Pri vate>True< /Private> | |||||
| 71 | </Refe rence> | |||||
| 72 | <Refer ence Inclu de="Micros oft.Xrm.To oling.WebR esourceUti lity, Vers ion=2.1.0. 0, Culture =neutral, PublicKeyT oken=31bf3 856ad364e3 5, process orArchitec ture=MSIL" > | |||||
| 73 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.XrmTo oling.WpfC ontrols.8. 1.0\lib\ne t45\Micros oft.Xrm.To oling.WebR esourceUti lity.dll</ HintPath> | |||||
| 74 | <Pri vate>True< /Private> | |||||
| 75 | </Refe rence> | |||||
| 76 | <Refer ence Inclu de="System " /> | |||||
| 77 | <Refer ence Inclu de="System .Activitie s" /> | |||||
| 78 | <Refer ence Inclu de="System .Activitie s.Presenta tion" /> | |||||
| 79 | <Refer ence Inclu de="System .Data" /> | |||||
| 80 | <Refer ence Inclu de="System .Directory Services" /> | |||||
| 81 | <Refer ence Inclu de="System .Directory Services.A ccountMana gement" /> | |||||
| 82 | <Refer ence Inclu de="System .IdentityM odel" /> | |||||
| 83 | <Refer ence Inclu de="System .Runtime.S erializati on" /> | |||||
| 84 | <Refer ence Inclu de="System .Security" /> | |||||
| 85 | <Refer ence Inclu de="System .ServiceMo del" /> | |||||
| 86 | <Refer ence Inclu de="System .ServiceMo del.Web" / > | |||||
| 87 | <Refer ence Inclu de="System .Web" /> | |||||
| 88 | <Refer ence Inclu de="System .Web.Servi ces" /> | |||||
| 89 | <Refer ence Inclu de="System .Workflow. Activities " /> | |||||
| 90 | <Refer ence Inclu de="System .Workflow. ComponentM odel" /> | |||||
| 91 | <Refer ence Inclu de="System .Workflow. Runtime" / > | |||||
| 92 | <Refer ence Inclu de="System .Xml" /> | |||||
| 93 | <Refer ence Inclu de="Micros oft.CSharp " /> | |||||
| 94 | <Refer ence Inclu de="System .Core" /> | |||||
| 95 | <Refer ence Inclu de="System .Xml.Linq" /> | |||||
| 96 | <Refer ence Inclu de="System .Data.Data SetExtensi ons" /> | |||||
| 97 | <Refer ence Inclu de="System .Xaml"> | |||||
| 98 | <Req uiredTarge tFramework >4.0</Requ iredTarget Framework> | |||||
| 99 | </Refe rence> | |||||
| 100 | <Refer ence Inclu de="Window sBase" /> | |||||
| 101 | <Refer ence Inclu de="Presen tationCore " /> | |||||
| 102 | <Refer ence Inclu de="Presen tationFram ework" /> | |||||
| 103 | </ItemGr oup> | |||||
| 104 | <ItemGro up> | |||||
| 105 | <Appli cationDefi nition Inc lude="App. xaml"> | |||||
| 106 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 107 | <Sub Type>Desig ner</SubTy pe> | |||||
| 108 | </Appl icationDef inition> | |||||
| 109 | <Page Include="L oginWindow \CrmLogin. xaml"> | |||||
| 110 | <Sub Type>Desig ner</SubTy pe> | |||||
| 111 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 112 | </Page > | |||||
| 113 | <Page Include="M ainWindow. xaml"> | |||||
| 114 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 115 | <Sub Type>Desig ner</SubTy pe> | |||||
| 116 | </Page > | |||||
| 117 | <Compi le Include ="App.xaml .cs"> | |||||
| 118 | <Dep endentUpon >App.xaml< /Dependent Upon> | |||||
| 119 | <Sub Type>Code< /SubType> | |||||
| 120 | </Comp ile> | |||||
| 121 | <Compi le Include ="LoginWin dow\CrmLog in.xaml.cs "> | |||||
| 122 | <Dep endentUpon >CrmLogin. xaml</Depe ndentUpon> | |||||
| 123 | </Comp ile> | |||||
| 124 | <Compi le Include ="MainWind ow.xaml.cs "> | |||||
| 125 | <Dep endentUpon >MainWindo w.xaml</De pendentUpo n> | |||||
| 126 | <Sub Type>Code< /SubType> | |||||
| 127 | </Comp ile> | |||||
| 128 | </ItemGr oup> | |||||
| 129 | <ItemGro up> | |||||
| 130 | <Compi le Include ="Properti es\Assembl yInfo.cs"> | |||||
| 131 | <Sub Type>Code< /SubType> | |||||
| 132 | </Comp ile> | |||||
| 133 | <Compi le Include ="Properti es\Resourc es.Designe r.cs"> | |||||
| 134 | <Aut oGen>True< /AutoGen> | |||||
| 135 | <Des ignTime>Tr ue</Design Time> | |||||
| 136 | <Dep endentUpon >Resources .resx</Dep endentUpon > | |||||
| 137 | </Comp ile> | |||||
| 138 | <Compi le Include ="Properti es\Setting s.Designer .cs"> | |||||
| 139 | <Aut oGen>True< /AutoGen> | |||||
| 140 | <Dep endentUpon >Settings. settings</ DependentU pon> | |||||
| 141 | <Des ignTimeSha redInput>T rue</Desig nTimeShare dInput> | |||||
| 142 | </Comp ile> | |||||
| 143 | <Embed dedResourc e Include= "Propertie s\Resource s.resx"> | |||||
| 144 | <Gen erator>Res XFileCodeG enerator</ Generator> | |||||
| 145 | <Las tGenOutput >Resources .Designer. cs</LastGe nOutput> | |||||
| 146 | </Embe ddedResour ce> | |||||
| 147 | <None Include="p ackages.co nfig"> | |||||
| 148 | <Sub Type>Desig ner</SubTy pe> | |||||
| 149 | </None > | |||||
| 150 | <None Include="P roperties\ Settings.s ettings"> | |||||
| 151 | <Gen erator>Set tingsSingl eFileGener ator</Gene rator> | |||||
| 152 | <Las tGenOutput >Settings. Designer.c s</LastGen Output> | |||||
| 153 | </None > | |||||
| 154 | <AppDe signer Inc lude="Prop erties\" / > | |||||
| 155 | </ItemGr oup> | |||||
| 156 | <ItemGro up> | |||||
| 157 | <None Include="A pp.config" /> | |||||
| 158 | </ItemGr oup> | |||||
| 159 | <ItemGro up> | |||||
| 160 | <Conte nt Include ="GettingS tarted\Get tingStarte d.htm" /> | |||||
| 161 | <Resou rce Includ e="Getting Started\su pport\clea r.gif" /> | |||||
| 162 | <Conte nt Include ="GettingS tarted\sup port\Combi ned.css" / > | |||||
| 163 | <Resou rce Includ e="Getting Started\su pport\dn61 0975.msdnL ogo-black. jpg" /> | |||||
| 164 | <Resou rce Includ e="Getting Started\su pport\IC72 6475.png" /> | |||||
| 165 | <Resou rce Includ e="Getting Started\su pport\IC72 6478.png" /> | |||||
| 166 | <Resou rce Includ e="Getting Started\su pport\IC72 6479.png" /> | |||||
| 167 | <Resou rce Includ e="Getting Started\su pport\IC72 6480.png" /> | |||||
| 168 | <Resou rce Includ e="Getting Started\su pport\IC72 6482.png" /> | |||||
| 169 | <Resou rce Includ e="Getting Started\su pport\IC75 5649.png" /> | |||||
| 170 | <Resou rce Includ e="Getting Started\su pport\IC75 5650.png" /> | |||||
| 171 | <Resou rce Includ e="Getting Started\su pport\IC75 5651.png" /> | |||||
| 172 | <Resou rce Includ e="Getting Started\su pport\Imag eSprite.pn g" /> | |||||
| 173 | <Resou rce Includ e="Getting Started\su pport\micr osoftLogoF orHeader.p ng" /> | |||||
| 174 | </ItemGr oup> | |||||
| 175 | <Import Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" /> | |||||
| 176 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 177 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 178 | <Target Name="Befo reBuild"> | |||||
| 179 | </Target > | |||||
| 180 | <Target Name="Afte rBuild"> | |||||
| 181 | </Target > | |||||
| 182 | --> | |||||
| 183 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.