Produced by Araxis Merge on 2/1/2017 2:56:50 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\ModernAndMobileApps\ModernSoapApp | ModernSoapApp.csproj | Tue Dec 20 19:51:47 2016 UTC |
| 2 | Wed Feb 1 19:56:50 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 208 |
| 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>{2F 7B3C1C-733 0-4A52-822 B-A01FD9CC 3D99}</Pro jectGuid> | |||||
| 8 | <Outpu tType>AppC ontainerEx e</OutputT ype> | |||||
| 9 | <AppDe signerFold er>Propert ies</AppDe signerFold er> | |||||
| 10 | <RootN amespace>S ample</Roo tNamespace > | |||||
| 11 | <Assem blyName>Cr mSoapApp</ AssemblyNa me> | |||||
| 12 | <Defau ltLanguage >en-US</De faultLangu age> | |||||
| 13 | <FileA lignment>5 12</FileAl ignment> | |||||
| 14 | <Proje ctTypeGuid s>{BC8A1FF A-BEE3-463 4-8014-F33 4798102B3} ;{FAE04EC0 -301F-11D3 -BF4B-00C0 4F79EFBC}< /ProjectTy peGuids> | |||||
| 15 | <Packa geCertific ateKeyFile >CRM2011Me tro_Tempor aryKey.pfx </PackageC ertificate KeyFile> | |||||
| 16 | <Targe tPlatformV ersion>8.1 </TargetPl atformVers ion> | |||||
| 17 | <Minim umVisualSt udioVersio n>12</Mini mumVisualS tudioVersi on> | |||||
| 18 | <Targe tFramework Version /> | |||||
| 19 | </Proper tyGroup> | |||||
| 20 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Debug| AnyCPU' "> | |||||
| 21 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 22 | <Debug Symbols>tr ue</DebugS ymbols> | |||||
| 23 | <Debug Type>full< /DebugType > | |||||
| 24 | <Optim ize>false< /Optimize> | |||||
| 25 | <Outpu tPath>bin\ Debug\</Ou tputPath> | |||||
| 26 | <Defin eConstants >DEBUG;TRA CE;NETFX_C ORE</Defin eConstants > | |||||
| 27 | <Error Report>pro mpt</Error Report> | |||||
| 28 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 29 | </Proper tyGroup> | |||||
| 30 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Releas e|AnyCPU' "> | |||||
| 31 | <Platf ormTarget> AnyCPU</Pl atformTarg et> | |||||
| 32 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 33 | <Optim ize>true</ Optimize> | |||||
| 34 | <Outpu tPath>bin\ Release\</ OutputPath > | |||||
| 35 | <Defin eConstants >TRACE;NET FX_CORE</D efineConst ants> | |||||
| 36 | <Error Report>pro mpt</Error Report> | |||||
| 37 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 38 | </Proper tyGroup> | |||||
| 39 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Debug|A RM'"> | |||||
| 40 | <Debug Symbols>tr ue</DebugS ymbols> | |||||
| 41 | <Outpu tPath>bin\ ARM\Debug\ </OutputPa th> | |||||
| 42 | <Defin eConstants >DEBUG;TRA CE;NETFX_C ORE</Defin eConstants > | |||||
| 43 | <NoWar n>;2008</N oWarn> | |||||
| 44 | <Debug Type>full< /DebugType > | |||||
| 45 | <Platf ormTarget> ARM</Platf ormTarget> | |||||
| 46 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 47 | <Error Report>pro mpt</Error Report> | |||||
| 48 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 49 | </Proper tyGroup> | |||||
| 50 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Release |ARM'"> | |||||
| 51 | <Outpu tPath>bin\ ARM\Releas e\</Output Path> | |||||
| 52 | <Defin eConstants >TRACE;NET FX_CORE</D efineConst ants> | |||||
| 53 | <Optim ize>true</ Optimize> | |||||
| 54 | <NoWar n>;2008</N oWarn> | |||||
| 55 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 56 | <Platf ormTarget> ARM</Platf ormTarget> | |||||
| 57 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 58 | <Error Report>pro mpt</Error Report> | |||||
| 59 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 60 | </Proper tyGroup> | |||||
| 61 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Debug|x 64'"> | |||||
| 62 | <Debug Symbols>tr ue</DebugS ymbols> | |||||
| 63 | <Outpu tPath>bin\ x64\Debug\ </OutputPa th> | |||||
| 64 | <Defin eConstants >DEBUG;TRA CE;NETFX_C ORE</Defin eConstants > | |||||
| 65 | <NoWar n>;2008</N oWarn> | |||||
| 66 | <Debug Type>full< /DebugType > | |||||
| 67 | <Platf ormTarget> x64</Platf ormTarget> | |||||
| 68 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 69 | <Error Report>pro mpt</Error Report> | |||||
| 70 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 71 | </Proper tyGroup> | |||||
| 72 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Release |x64'"> | |||||
| 73 | <Outpu tPath>bin\ x64\Releas e\</Output Path> | |||||
| 74 | <Defin eConstants >TRACE;NET FX_CORE</D efineConst ants> | |||||
| 75 | <Optim ize>true</ Optimize> | |||||
| 76 | <NoWar n>;2008</N oWarn> | |||||
| 77 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 78 | <Platf ormTarget> x64</Platf ormTarget> | |||||
| 79 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 80 | <Error Report>pro mpt</Error Report> | |||||
| 81 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 82 | </Proper tyGroup> | |||||
| 83 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Debug|x 86'"> | |||||
| 84 | <Debug Symbols>tr ue</DebugS ymbols> | |||||
| 85 | <Outpu tPath>bin\ x86\Debug\ </OutputPa th> | |||||
| 86 | <Defin eConstants >DEBUG;TRA CE;NETFX_C ORE</Defin eConstants > | |||||
| 87 | <NoWar n>;2008</N oWarn> | |||||
| 88 | <Debug Type>full< /DebugType > | |||||
| 89 | <Platf ormTarget> x86</Platf ormTarget> | |||||
| 90 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 91 | <Error Report>pro mpt</Error Report> | |||||
| 92 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 93 | </Proper tyGroup> | |||||
| 94 | <Propert yGroup Con dition="'$ (Configura tion)|$(Pl atform)' = = 'Release |x86'"> | |||||
| 95 | <Outpu tPath>bin\ x86\Releas e\</Output Path> | |||||
| 96 | <Defin eConstants >TRACE;NET FX_CORE</D efineConst ants> | |||||
| 97 | <Optim ize>true</ Optimize> | |||||
| 98 | <NoWar n>;2008</N oWarn> | |||||
| 99 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 100 | <Platf ormTarget> x86</Platf ormTarget> | |||||
| 101 | <UseVS HostingPro cess>false </UseVSHos tingProces s> | |||||
| 102 | <Error Report>pro mpt</Error Report> | |||||
| 103 | <Prefe r32Bit>tru e</Prefer3 2Bit> | |||||
| 104 | </Proper tyGroup> | |||||
| 105 | <ItemGro up> | |||||
| 106 | <Compi le Include ="App.xaml .cs"> | |||||
| 107 | <Dep endentUpon >App.xaml< /Dependent Upon> | |||||
| 108 | </Comp ile> | |||||
| 109 | <Compi le Include ="Common\B indableBas e.cs"> | |||||
| 110 | <Sub Type>Code< /SubType> | |||||
| 111 | </Comp ile> | |||||
| 112 | <Compi le Include ="Common\B ooleanNega tionConver ter.cs"> | |||||
| 113 | <Sub Type>Code< /SubType> | |||||
| 114 | </Comp ile> | |||||
| 115 | <Compi le Include ="Common\B ooleanToVi sibilityCo nverter.cs "> | |||||
| 116 | <Sub Type>Code< /SubType> | |||||
| 117 | </Comp ile> | |||||
| 118 | <Compi le Include ="Common\L ayoutAware Page.cs"> | |||||
| 119 | <Sub Type>Code< /SubType> | |||||
| 120 | </Comp ile> | |||||
| 121 | <Compi le Include ="Common\R ichTextCol umns.cs"> | |||||
| 122 | <Sub Type>Code< /SubType> | |||||
| 123 | </Comp ile> | |||||
| 124 | <Compi le Include ="Common\S uspensionM anager.cs" > | |||||
| 125 | <Sub Type>Code< /SubType> | |||||
| 126 | </Comp ile> | |||||
| 127 | <Compi le Include ="CurrentE nvironment .cs" /> | |||||
| 128 | <Compi le Include ="MainPage Item.cs" / > | |||||
| 129 | <Compi le Include ="Models\A ccountsMod el.cs" /> | |||||
| 130 | <Compi le Include ="Models\T asksModel. cs" /> | |||||
| 131 | <Compi le Include ="RequestB uilder.cs" /> | |||||
| 132 | <Compi le Include ="MainPage .xaml.cs"> | |||||
| 133 | <Dep endentUpon >MainPage. xaml</Depe ndentUpon> | |||||
| 134 | </Comp ile> | |||||
| 135 | <Compi le Include ="Properti es\Assembl yInfo.cs" /> | |||||
| 136 | <Compi le Include ="ViewMode ls\Account sViewModel .cs" /> | |||||
| 137 | <Compi le Include ="ViewMode ls\TasksVi ewModel.cs " /> | |||||
| 138 | <Compi le Include ="Views\Ac countsView .xaml.cs"> | |||||
| 139 | <Dep endentUpon >AccountsV iew.xaml</ DependentU pon> | |||||
| 140 | </Comp ile> | |||||
| 141 | <Compi le Include ="Views\Ta sksView.xa ml.cs"> | |||||
| 142 | <Dep endentUpon >TasksView .xaml</Dep endentUpon > | |||||
| 143 | </Comp ile> | |||||
| 144 | </ItemGr oup> | |||||
| 145 | <ItemGro up> | |||||
| 146 | <AppxM anifest In clude="Pac kage.appxm anifest"> | |||||
| 147 | <Sub Type>Desig ner</SubTy pe> | |||||
| 148 | </Appx Manifest> | |||||
| 149 | <None Include="p ackages.co nfig" /> | |||||
| 150 | <None Include="S ample_Temp oraryKey.p fx" /> | |||||
| 151 | </ItemGr oup> | |||||
| 152 | <ItemGro up> | |||||
| 153 | <Conte nt Include ="Assets\L ogo.scale- 140.png" / > | |||||
| 154 | <Conte nt Include ="Assets\L ogo.scale- 180.png" / > | |||||
| 155 | <Conte nt Include ="Assets\M ainPage\Ac counts.png " /> | |||||
| 156 | <Conte nt Include ="Assets\M ainPage\Co ntacts.PNG " /> | |||||
| 157 | <Conte nt Include ="Assets\M ainPage\Le ads.png" / > | |||||
| 158 | <Conte nt Include ="Assets\M ainPage\Op portunitie s.png" /> | |||||
| 159 | <Conte nt Include ="Assets\M ainPage\Pl aceholder. png" /> | |||||
| 160 | <Conte nt Include ="Assets\M ainPage\Ta sks.png" / > | |||||
| 161 | <Conte nt Include ="Assets\S plashScree n.png" /> | |||||
| 162 | <Conte nt Include ="Assets\S plashScree n.scale-10 0.png" /> | |||||
| 163 | <Conte nt Include ="Assets\S plashScree n.scale-14 0.png" /> | |||||
| 164 | <Conte nt Include ="Assets\S plashScree n.scale-18 0.png" /> | |||||
| 165 | <Conte nt Include ="Common\R eadMe.txt" /> | |||||
| 166 | </ItemGr oup> | |||||
| 167 | <ItemGro up> | |||||
| 168 | <Appli cationDefi nition Inc lude="App. xaml"> | |||||
| 169 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 170 | <Sub Type>Desig ner</SubTy pe> | |||||
| 171 | </Appl icationDef inition> | |||||
| 172 | <Page Include="C ommon\Stan dardStyles .xaml"> | |||||
| 173 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 174 | <Sub Type>Desig ner</SubTy pe> | |||||
| 175 | </Page > | |||||
| 176 | <Page Include="M ainPage.xa ml"> | |||||
| 177 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 178 | <Sub Type>Desig ner</SubTy pe> | |||||
| 179 | </Page > | |||||
| 180 | <Page Include="V iews\Accou ntsView.xa ml"> | |||||
| 181 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 182 | <Sub Type>Desig ner</SubTy pe> | |||||
| 183 | </Page > | |||||
| 184 | <Page Include="V iews\Tasks View.xaml" > | |||||
| 185 | <Sub Type>Desig ner</SubTy pe> | |||||
| 186 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 187 | </Page > | |||||
| 188 | </ItemGr oup> | |||||
| 189 | <ItemGro up> | |||||
| 190 | <Refer ence Inclu de="Micros oft.Identi tyModel.Cl ients.Acti veDirector y"> | |||||
| 191 | <Hin tPath>pack ages\Micro soft.Ident ityModel.C lients.Act iveDirecto ry.2.14.20 1151115\li b\netcore4 5\Microsof t.Identity Model.Clie nts.Active Directory. winmd</Hin tPath> | |||||
| 192 | </Refe rence> | |||||
| 193 | </ItemGr oup> | |||||
| 194 | <Propert yGroup Con dition=" ' $(VisualSt udioVersio n)' == '' or '$(Visu alStudioVe rsion)' &l t; '12.0' "> | |||||
| 195 | <Visua lStudioVer sion>12.0< /VisualStu dioVersion > | |||||
| 196 | </Proper tyGroup> | |||||
| 197 | <Propert yGroup> | |||||
| 198 | <SignA ssembly>fa lse</SignA ssembly> | |||||
| 199 | </Proper tyGroup> | |||||
| 200 | <Import Project="$ (MSBuildEx tensionsPa th)\Micros oft\Window sXaml\v$(V isualStudi oVersion)\ Microsoft. Windows.UI .Xaml.CSha rp.targets " /> | |||||
| 201 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 202 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 203 | <Target Name="Befo reBuild"> | |||||
| 204 | </Target > | |||||
| 205 | <Target Name="Afte rBuild"> | |||||
| 206 | </Target > | |||||
| 207 | --> | |||||
| 208 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.