Produced by Araxis Merge on 2/1/2017 2:56:29 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\Client\WebResources\ImportWebResources\ImportWebResources | ImportWebResources.csproj | Tue Dec 20 19:51:45 2016 UTC |
| 2 | Wed Feb 1 19:56:29 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 103 |
| 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>{87 031FA7-6BE D-47AB-AAE D-BC7E3AA3 BF13}</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>Im portWebRes ources</As semblyName > | |||||
| 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.Impor tWebResour ces</Start upObject> | |||||
| 41 | </Proper tyGroup> | |||||
| 42 | <ItemGro up> | |||||
| 43 | <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy"> | |||||
| 44 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath> | |||||
| 45 | </Refe rence> | |||||
| 46 | <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"> | |||||
| 47 | <Pri vate>True< /Private> | |||||
| 48 | <Hin tPath>..\p ackages\Mi crosoft.Id entityMode l.6.1.7600 .16394\lib \net35\Mic rosoft.Ide ntityModel .dll</Hint Path> | |||||
| 49 | </Refe rence> | |||||
| 50 | <Refer ence Inclu de="Micros oft.Xrm.Sd k"> | |||||
| 51 | <Hin tPath>..\p ackages\Mi crosoft.Cr mSdk.CoreA ssemblies. 7.0.0\lib\ net45\Micr osoft.Xrm. Sdk.dll</H intPath> | |||||
| 52 | </Refe rence> | |||||
| 53 | <Refer ence Inclu de="System " /> | |||||
| 54 | <Refer ence Inclu de="System .Core" /> | |||||
| 55 | <Refer ence Inclu de="System .Directory Services" /> | |||||
| 56 | <Refer ence Inclu de="System .Directory Services.A ccountMana gement" /> | |||||
| 57 | <Refer ence Inclu de="System .IdentityM odel" /> | |||||
| 58 | <Refer ence Inclu de="System .Runtime.S erializati on" /> | |||||
| 59 | <Refer ence Inclu de="System .Security" /> | |||||
| 60 | <Refer ence Inclu de="System .ServiceMo del" /> | |||||
| 61 | <Refer ence Inclu de="System .ServiceMo del.Web" / > | |||||
| 62 | <Refer ence Inclu de="System .Web" /> | |||||
| 63 | <Refer ence Inclu de="System .Xml.Linq" /> | |||||
| 64 | <Refer ence Inclu de="System .Data.Data SetExtensi ons" /> | |||||
| 65 | <Refer ence Inclu de="Micros oft.CSharp " /> | |||||
| 66 | <Refer ence Inclu de="System .Data" /> | |||||
| 67 | <Refer ence Inclu de="System .Xml" /> | |||||
| 68 | </ItemGr oup> | |||||
| 69 | <ItemGro up> | |||||
| 70 | <Compi le Include ="..\..\.. \..\Helper Code\CrmSe rviceHelpe rs.cs"> | |||||
| 71 | <Lin k>CrmServi ceHelpers. cs</Link> | |||||
| 72 | </Comp ile> | |||||
| 73 | <Compi le Include ="..\..\.. \..\Helper Code\Devic eIdManager .cs"> | |||||
| 74 | <Lin k>DeviceId Manager.cs </Link> | |||||
| 75 | </Comp ile> | |||||
| 76 | <Compi le Include ="..\..\.. \..\Helper Code\MyOrg anizationC rmSdkTypes .cs"> | |||||
| 77 | <Lin k>MyOrgani zationCrmS dkTypes.cs </Link> | |||||
| 78 | </Comp ile> | |||||
| 79 | <Compi le Include ="ImportWe bResources .cs" /> | |||||
| 80 | <Compi le Include ="Properti es\Assembl yInfo.cs" /> | |||||
| 81 | </ItemGr oup> | |||||
| 82 | <ItemGro up> | |||||
| 83 | <None Include="a pp.config" /> | |||||
| 84 | <None Include="p ackages.co nfig" /> | |||||
| 85 | </ItemGr oup> | |||||
| 86 | <ItemGro up> | |||||
| 87 | <Conte nt Include ="FilesToI mport\CSS\ Styles.css " /> | |||||
| 88 | <Conte nt Include ="FilesToI mport\Data \Data.xml" /> | |||||
| 89 | <Conte nt Include ="FilesToI mport\Scri pt\Script. js" /> | |||||
| 90 | <Conte nt Include ="FilesToI mport\Show Data.htm" /> | |||||
| 91 | <Conte nt Include ="FilesToI mport\XSL\ Transform. xslt" /> | |||||
| 92 | <Conte nt Include ="ImportJo b.xml" /> | |||||
| 93 | </ItemGr oup> | |||||
| 94 | <ItemGro up /> | |||||
| 95 | <Import Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" /> | |||||
| 96 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 97 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 98 | <Target Name="Befo reBuild"> | |||||
| 99 | </Target > | |||||
| 100 | <Target Name="Afte rBuild"> | |||||
| 101 | </Target > | |||||
| 102 | --> | |||||
| 103 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.