Produced by Araxis Merge on 2/1/2017 2:56:27 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\BusinessDataModel\ProductCatalog | ProductCatalog.csproj | Tue Dec 20 19:51:44 2016 UTC |
| 2 | Wed Feb 1 19:56:27 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 99 |
| 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 | <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>{4D D090CA-3EB A-41C7-831 3-6AA12764 A7BF}</Pro jectGuid> | |||||
| 8 | <Outpu tType>Exe< /OutputTyp e> | |||||
| 9 | <AppDe signerFold er>Propert ies</AppDe signerFold er> | |||||
| 10 | <RootN amespace>P roductCata log</RootN amespace> | |||||
| 11 | <Assem blyName>Pr oductCatal og</Assemb lyName> | |||||
| 12 | <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion> | |||||
| 13 | <FileA lignment>5 12</FileAl ignment> | |||||
| 14 | <Targe tFramework Profile /> | |||||
| 15 | </Proper tyGroup> | |||||
| 16 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Debug| AnyCPU' "> | |||||
| 17 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 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 | </Proper tyGroup> | |||||
| 26 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Releas e|AnyCPU' "> | |||||
| 27 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 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 | </Proper tyGroup> | |||||
| 35 | <Propert yGroup> | |||||
| 36 | <Start upObject>M icrosoft.C rm.Sdk.Sam ples.Creat eAndPublis hProducts< /StartupOb ject> | |||||
| 37 | </Proper tyGroup> | |||||
| 38 | <ItemGro up> | |||||
| 39 | <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy"> | |||||
| 40 | <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Crm.Sdk .Proxy.dll </HintPath > | |||||
| 41 | </Refe rence> | |||||
| 42 | <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"> | |||||
| 43 | <Pri vate>True< /Private> | |||||
| 44 | <Hin tPath>pack ages\Micro soft.Ident ityModel.6 .1.7600.16 394\lib\ne t35\Micros oft.Identi tyModel.dl l</HintPat h> | |||||
| 45 | </Refe rence> | |||||
| 46 | <Refer ence Inclu de="Micros oft.Xrm.Sd k"> | |||||
| 47 | <Hin tPath>pack ages\Micro soft.CrmSd k.CoreAsse mblies.7.0 .0\lib\net 45\Microso ft.Xrm.Sdk .dll</Hint Path> | |||||
| 48 | </Refe rence> | |||||
| 49 | <Refer ence Inclu de="System " /> | |||||
| 50 | <Refer ence Inclu de="System .Core" /> | |||||
| 51 | <Refer ence Inclu de="System .Directory Services" /> | |||||
| 52 | <Refer ence Inclu de="System .Directory Services.A ccountMana gement" /> | |||||
| 53 | <Refer ence Inclu de="System .IdentityM odel" /> | |||||
| 54 | <Refer ence Inclu de="System .Runtime.S erializati on" /> | |||||
| 55 | <Refer ence Inclu de="System .Security" /> | |||||
| 56 | <Refer ence Inclu de="System .ServiceMo del" /> | |||||
| 57 | <Refer ence Inclu de="System .ServiceMo del.Web" / > | |||||
| 58 | <Refer ence Inclu de="System .Web" /> | |||||
| 59 | <Refer ence Inclu de="System .Xml.Linq" /> | |||||
| 60 | <Refer ence Inclu de="System .Data.Data SetExtensi ons" /> | |||||
| 61 | <Refer ence Inclu de="Micros oft.CSharp " /> | |||||
| 62 | <Refer ence Inclu de="System .Data" /> | |||||
| 63 | <Refer ence Inclu de="System .Xml" /> | |||||
| 64 | </ItemGr oup> | |||||
| 65 | <ItemGro up> | |||||
| 66 | <Compi le Include ="..\..\He lperCode\C rmServiceH elpers.cs" > | |||||
| 67 | <Lin k>CrmServi ceHelpers. cs</Link> | |||||
| 68 | </Comp ile> | |||||
| 69 | <Compi le Include ="..\..\He lperCode\D eviceIdMan ager.cs"> | |||||
| 70 | <Lin k>DeviceId Manager.cs </Link> | |||||
| 71 | </Comp ile> | |||||
| 72 | <Compi le Include ="..\..\He lperCode\M yOrganizat ionCrmSdkT ypes.cs"> | |||||
| 73 | <Lin k>MyOrgani zationCrmS dkTypes.cs </Link> | |||||
| 74 | </Comp ile> | |||||
| 75 | <Compi le Include ="..\..\He lperCode\O ptionSets. cs"> | |||||
| 76 | <Lin k>OptionSe ts.cs</Lin k> | |||||
| 77 | </Comp ile> | |||||
| 78 | <Compi le Include ="..\..\He lperCode\S ystemUserP rovider.cs "> | |||||
| 79 | <Lin k>SystemUs erProvider .cs</Link> | |||||
| 80 | </Comp ile> | |||||
| 81 | <Compi le Include ="AddProdu ctstoBundl e.cs" /> | |||||
| 82 | <Compi le Include ="ClonePro ducts.cs" /> | |||||
| 83 | <Compi le Include ="CreateAn dPublishPr oducts.cs" /> | |||||
| 84 | </ItemGr oup> | |||||
| 85 | <ItemGro up> | |||||
| 86 | <Folde r Include= "Propertie s\" /> | |||||
| 87 | </ItemGr oup> | |||||
| 88 | <ItemGro up> | |||||
| 89 | <None Include="p ackages.co nfig" /> | |||||
| 90 | </ItemGr oup> | |||||
| 91 | <Import Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" /> | |||||
| 92 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 93 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 94 | <Target Name="Befo reBuild"> | |||||
| 95 | </Target > | |||||
| 96 | <Target Name="Afte rBuild"> | |||||
| 97 | </Target > | |||||
| 98 | --> | |||||
| 99 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.