Produced by Araxis Merge on 2/1/2017 2:57:37 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\Tools\WebResourceUtility | WebResourceUtility.csproj | Tue Dec 20 19:52:28 2016 UTC |
| 2 | Wed Feb 1 19:57:37 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 256 |
| 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 | <Expre ssionBlend Version>4. 0.20408.0< /Expressio nBlendVers ion> | |||||
| 7 | <Produ ctVersion> 8.0.30703< /ProductVe rsion> | |||||
| 8 | <Schem aVersion>2 .0</Schema Version> | |||||
| 9 | <Proje ctGuid>{98 E4360E-633 5-405A-B98 6-2D85BC68 FACF}</Pro jectGuid> | |||||
| 10 | <Outpu tType>WinE xe</Output Type> | |||||
| 11 | <AppDe signerFold er>Propert ies</AppDe signerFold er> | |||||
| 12 | <RootN amespace>W ebResource Utility</R ootNamespa ce> | |||||
| 13 | <Assem blyName>We bResourceU tility</As semblyName > | |||||
| 14 | <Targe tFramework Version>v4 .5.2</Targ etFramewor kVersion> | |||||
| 15 | <Targe tFramework Profile> | |||||
| 16 | </Targ etFramewor kProfile> | |||||
| 17 | <FileA lignment>5 12</FileAl ignment> | |||||
| 18 | <Proje ctTypeGuid s>{60dc813 4-eba5-43b 8-bcc9-bb4 bc16c2548} ;{FAE04EC0 -301F-11D3 -BF4B-00C0 4F79EFBC}< /ProjectTy peGuids> | |||||
| 19 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 20 | <Utf8O utput>true </Utf8Outp ut> | |||||
| 21 | </Proper tyGroup> | |||||
| 22 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Debug| x86' "> | |||||
| 23 | <Platf ormTarget> x86</Platf ormTarget> | |||||
| 24 | <Debug Symbols>tr ue</DebugS ymbols> | |||||
| 25 | <Debug Type>full< /DebugType > | |||||
| 26 | <Optim ize>false< /Optimize> | |||||
| 27 | <Outpu tPath>bin\ Debug\</Ou tputPath> | |||||
| 28 | <Defin eConstants >DEBUG;TRA CE</Define Constants> | |||||
| 29 | <Error Report>pro mpt</Error Report> | |||||
| 30 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 31 | <Prefe r32Bit>fal se</Prefer 32Bit> | |||||
| 32 | </Proper tyGroup> | |||||
| 33 | <Propert yGroup Con dition=" ' $(Configur ation)|$(P latform)' == 'Releas e|x86' "> | |||||
| 34 | <Platf ormTarget> x86</Platf ormTarget> | |||||
| 35 | <Debug Type>pdbon ly</DebugT ype> | |||||
| 36 | <Optim ize>true</ Optimize> | |||||
| 37 | <Outpu tPath>bin\ Release\</ OutputPath > | |||||
| 38 | <Defin eConstants >TRACE</De fineConsta nts> | |||||
| 39 | <Error Report>pro mpt</Error Report> | |||||
| 40 | <Warni ngLevel>4< /WarningLe vel> | |||||
| 41 | <Prefe r32Bit>fal se</Prefer 32Bit> | |||||
| 42 | </Proper tyGroup> | |||||
| 43 | <Propert yGroup> | |||||
| 44 | <Start upObject> | |||||
| 45 | </Star tupObject> | |||||
| 46 | </Proper tyGroup> | |||||
| 47 | <ItemGro up> | |||||
| 48 | <Refer ence Inclu de="Micros oft.Crm.Sd k.Proxy, V ersion=5.0 .0.0, Cult ure=neutra l, PublicK eyToken=31 bf3856ad36 4e35, proc essorArchi tecture=MS IL"> | |||||
| 49 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 50 | <Hin tPath>..\. .\Bin\Micr osoft.Crm. Sdk.Proxy. dll</HintP ath> | |||||
| 51 | </Refe rence> | |||||
| 52 | <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"> | |||||
| 53 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 54 | <Hin tPath>..\. .\..\..\.. \..\..\Pro gram Files \Reference Assemblie s\Microsof t\Windows Identity F oundation\ v3.5\Micro soft.Ident ityModel.d ll</HintPa th> | |||||
| 55 | </Refe rence> | |||||
| 56 | <Refer ence Inclu de="Micros oft.Xrm.Sd k, Version =5.0.0.0, Culture=ne utral, Pub licKeyToke n=31bf3856 ad364e35, processorA rchitectur e=MSIL"> | |||||
| 57 | <Spe cificVersi on>False</ SpecificVe rsion> | |||||
| 58 | <Hin tPath>..\. .\Bin\Micr osoft.Xrm. Sdk.dll</H intPath> | |||||
| 59 | </Refe rence> | |||||
| 60 | <Refer ence Inclu de="System " /> | |||||
| 61 | <Refer ence Inclu de="System .Data" /> | |||||
| 62 | <Refer ence Inclu de="System .Directory Services.A ccountMana gement" /> | |||||
| 63 | <Refer ence Inclu de="System .Runtime.S erializati on" /> | |||||
| 64 | <Refer ence Inclu de="System .Security" /> | |||||
| 65 | <Refer ence Inclu de="System .ServiceMo del" /> | |||||
| 66 | <Refer ence Inclu de="System .Windows.F orms" /> | |||||
| 67 | <Refer ence Inclu de="System .Xml" /> | |||||
| 68 | <Refer ence Inclu de="Micros oft.CSharp " /> | |||||
| 69 | <Refer ence Inclu de="System .Core" /> | |||||
| 70 | <Refer ence Inclu de="System .Xml.Linq" /> | |||||
| 71 | <Refer ence Inclu de="System .Data.Data SetExtensi ons" /> | |||||
| 72 | <Refer ence Inclu de="System .Xaml"> | |||||
| 73 | <Req uiredTarge tFramework >4.0</Requ iredTarget Framework> | |||||
| 74 | </Refe rence> | |||||
| 75 | <Refer ence Inclu de="Window sBase" /> | |||||
| 76 | <Refer ence Inclu de="Presen tationCore " /> | |||||
| 77 | <Refer ence Inclu de="Presen tationFram ework" /> | |||||
| 78 | </ItemGr oup> | |||||
| 79 | <ItemGro up> | |||||
| 80 | <Appli cationDefi nition Inc lude="App. xaml"> | |||||
| 81 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 82 | <Sub Type>Desig ner</SubTy pe> | |||||
| 83 | </Appl icationDef inition> | |||||
| 84 | <Compi le Include ="..\..\Sa mpleCode\C S\HelperCo de\CrmServ iceHelpers .cs"> | |||||
| 85 | <Lin k>DataAcce ss\CrmServ iceHelpers .cs</Link> | |||||
| 86 | </Comp ile> | |||||
| 87 | <Compi le Include ="..\..\Sa mpleCode\C S\HelperCo de\DeviceI dManager.c s"> | |||||
| 88 | <Lin k>DataAcce ss\DeviceI dManager.c s</Link> | |||||
| 89 | </Comp ile> | |||||
| 90 | <Compi le Include ="..\..\Sa mpleCode\C S\HelperCo de\MyOrgan izationCrm SdkTypes.c s"> | |||||
| 91 | <Lin k>DataAcce ss\MyOrgan izationCrm SdkTypes.c s</Link> | |||||
| 92 | </Comp ile> | |||||
| 93 | <Compi le Include ="..\..\Sa mpleCode\C S\HelperCo de\OptionS ets.cs"> | |||||
| 94 | <Lin k>DataAcce ss\OptionS ets.cs</Li nk> | |||||
| 95 | </Comp ile> | |||||
| 96 | <Compi le Include ="Converte rs\BoolToS tatusColor Converter. cs" /> | |||||
| 97 | <Compi le Include ="Converte rs\BoolToV isibilityC onverter.c s" /> | |||||
| 98 | <Compi le Include ="Converte rs\Validat ionErrorsT oStringCon verter.cs" /> | |||||
| 99 | <Compi le Include ="DataAcce ss\Console lessServer Connection .cs" /> | |||||
| 100 | <Compi le Include ="Model\Re sourceExte nsions.cs" /> | |||||
| 101 | <Compi le Include ="Validati on\RegexVa lidationRu le.cs" /> | |||||
| 102 | <Compi le Include ="ViewMode ls\RelayCo mmand.cs" /> | |||||
| 103 | <Compi le Include ="ViewMode ls\MainWin dowViewMod el.cs" /> | |||||
| 104 | <Compi le Include ="ViewMode ls\ViewMod elBase.cs" /> | |||||
| 105 | <Compi le Include ="Views\Co nnectionsV iew.xaml.c s"> | |||||
| 106 | <Dep endentUpon >Connectio nsView.xam l</Depende ntUpon> | |||||
| 107 | </Comp ile> | |||||
| 108 | <Compi le Include ="Views\Er rorWindow. xaml.cs"> | |||||
| 109 | <Dep endentUpon >ErrorWind ow.xaml</D ependentUp on> | |||||
| 110 | </Comp ile> | |||||
| 111 | <Compi le Include ="Views\Pa sswordWind ow.xaml.cs "> | |||||
| 112 | <Dep endentUpon >PasswordW indow.xaml </Dependen tUpon> | |||||
| 113 | </Comp ile> | |||||
| 114 | <Compi le Include ="Views\So lutionsVie w.xaml.cs" > | |||||
| 115 | <Dep endentUpon >Solutions View.xaml< /Dependent Upon> | |||||
| 116 | </Comp ile> | |||||
| 117 | <Compi le Include ="Views\We bResourceV iew.xaml.c s"> | |||||
| 118 | <Dep endentUpon >WebResour ceView.xam l</Depende ntUpon> | |||||
| 119 | </Comp ile> | |||||
| 120 | <Page Include="V iews\Error Window.xam l"> | |||||
| 121 | <Sub Type>Desig ner</SubTy pe> | |||||
| 122 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 123 | </Page > | |||||
| 124 | <Page Include="V iews\MainW indow.xaml "> | |||||
| 125 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 126 | <Sub Type>Desig ner</SubTy pe> | |||||
| 127 | </Page > | |||||
| 128 | <Compi le Include ="App.xaml .cs"> | |||||
| 129 | <Dep endentUpon >App.xaml< /Dependent Upon> | |||||
| 130 | <Sub Type>Code< /SubType> | |||||
| 131 | </Comp ile> | |||||
| 132 | <Compi le Include ="Views\Ma inWindow.x aml.cs"> | |||||
| 133 | <Dep endentUpon >MainWindo w.xaml</De pendentUpo n> | |||||
| 134 | <Sub Type>Code< /SubType> | |||||
| 135 | </Comp ile> | |||||
| 136 | <Page Include="V iews\Conne ctionsView .xaml"> | |||||
| 137 | <Sub Type>Desig ner</SubTy pe> | |||||
| 138 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 139 | </Page > | |||||
| 140 | <Page Include="V iews\Passw ordWindow. xaml"> | |||||
| 141 | <Sub Type>Desig ner</SubTy pe> | |||||
| 142 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 143 | </Page > | |||||
| 144 | <Page Include="V iews\Solut ionsView.x aml"> | |||||
| 145 | <Sub Type>Desig ner</SubTy pe> | |||||
| 146 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 147 | </Page > | |||||
| 148 | <Page Include="V iews\WebRe sourceUtil ityStyles. xaml"> | |||||
| 149 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 150 | <Sub Type>Desig ner</SubTy pe> | |||||
| 151 | </Page > | |||||
| 152 | <Page Include="V iews\WebRe sourceView .xaml"> | |||||
| 153 | <Gen erator>MSB uild:Compi le</Genera tor> | |||||
| 154 | <Sub Type>Desig ner</SubTy pe> | |||||
| 155 | </Page > | |||||
| 156 | </ItemGr oup> | |||||
| 157 | <ItemGro up> | |||||
| 158 | <Compi le Include ="Properti es\Assembl yInfo.cs"> | |||||
| 159 | <Sub Type>Code< /SubType> | |||||
| 160 | </Comp ile> | |||||
| 161 | <Compi le Include ="Properti es\Resourc es.Designe r.cs"> | |||||
| 162 | <Aut oGen>True< /AutoGen> | |||||
| 163 | <Des ignTime>Tr ue</Design Time> | |||||
| 164 | <Dep endentUpon >Resources .resx</Dep endentUpon > | |||||
| 165 | </Comp ile> | |||||
| 166 | <Compi le Include ="Properti es\Setting s.Designer .cs"> | |||||
| 167 | <Aut oGen>True< /AutoGen> | |||||
| 168 | <Dep endentUpon >Settings. settings</ DependentU pon> | |||||
| 169 | <Des ignTimeSha redInput>T rue</Desig nTimeShare dInput> | |||||
| 170 | </Comp ile> | |||||
| 171 | <Embed dedResourc e Include= "Propertie s\Resource s.resx"> | |||||
| 172 | <Gen erator>Res XFileCodeG enerator</ Generator> | |||||
| 173 | <Las tGenOutput >Resources .Designer. cs</LastGe nOutput> | |||||
| 174 | </Embe ddedResour ce> | |||||
| 175 | <None Include="a pp.config" /> | |||||
| 176 | <None Include="P roperties\ Settings.s ettings"> | |||||
| 177 | <Gen erator>Set tingsSingl eFileGener ator</Gene rator> | |||||
| 178 | <Las tGenOutput >Settings. Designer.c s</LastGen Output> | |||||
| 179 | </None > | |||||
| 180 | <AppDe signer Inc lude="Prop erties\" / > | |||||
| 181 | </ItemGr oup> | |||||
| 182 | <ItemGro up> | |||||
| 183 | <Conte nt Include ="configur ations.xml "> | |||||
| 184 | <Cop yToOutputD irectory>P reserveNew est</CopyT oOutputDir ectory> | |||||
| 185 | </Cont ent> | |||||
| 186 | <Conte nt Include ="packages .xml"> | |||||
| 187 | <Cop yToOutputD irectory>P reserveNew est</CopyT oOutputDir ectory> | |||||
| 188 | </Cont ent> | |||||
| 189 | </ItemGr oup> | |||||
| 190 | <ItemGro up> | |||||
| 191 | <Blend EmbeddedFo nt Include ="Fonts\ta homa.ttf"> | |||||
| 192 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 193 | <All >True</All > | |||||
| 194 | <Aut oFill>True </AutoFill > | |||||
| 195 | </Blen dEmbeddedF ont> | |||||
| 196 | <Blend EmbeddedFo nt Include ="Fonts\ta homabd.ttf "> | |||||
| 197 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 198 | <All >True</All > | |||||
| 199 | <Aut oFill>True </AutoFill > | |||||
| 200 | </Blen dEmbeddedF ont> | |||||
| 201 | </ItemGr oup> | |||||
| 202 | <ItemGro up> | |||||
| 203 | <Blend EmbeddedFo nt Include ="Fonts\ar ial.ttf"> | |||||
| 204 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 205 | <All >True</All > | |||||
| 206 | <Aut oFill>True </AutoFill > | |||||
| 207 | <Cha racters> | |||||
| 208 | </Ch aracters> | |||||
| 209 | <Upp ercase>Tru e</Upperca se> | |||||
| 210 | <Low ercase>Tru e</Lowerca se> | |||||
| 211 | <Num bers>True< /Numbers> | |||||
| 212 | <Pun ctuation>T rue</Punct uation> | |||||
| 213 | </Blen dEmbeddedF ont> | |||||
| 214 | <Blend EmbeddedFo nt Include ="Fonts\ar ialbd.ttf" > | |||||
| 215 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 216 | <All >True</All > | |||||
| 217 | <Aut oFill>True </AutoFill > | |||||
| 218 | <Cha racters> | |||||
| 219 | </Ch aracters> | |||||
| 220 | <Upp ercase>Tru e</Upperca se> | |||||
| 221 | <Low ercase>Tru e</Lowerca se> | |||||
| 222 | <Num bers>True< /Numbers> | |||||
| 223 | <Pun ctuation>T rue</Punct uation> | |||||
| 224 | </Blen dEmbeddedF ont> | |||||
| 225 | <Blend EmbeddedFo nt Include ="Fonts\ar ialbi.ttf" > | |||||
| 226 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 227 | <All >True</All > | |||||
| 228 | <Aut oFill>True </AutoFill > | |||||
| 229 | <Cha racters> | |||||
| 230 | </Ch aracters> | |||||
| 231 | <Upp ercase>Tru e</Upperca se> | |||||
| 232 | <Low ercase>Tru e</Lowerca se> | |||||
| 233 | <Num bers>True< /Numbers> | |||||
| 234 | <Pun ctuation>T rue</Punct uation> | |||||
| 235 | </Blen dEmbeddedF ont> | |||||
| 236 | <Blend EmbeddedFo nt Include ="Fonts\ar iali.ttf"> | |||||
| 237 | <IsS ystemFont> True</IsSy stemFont> | |||||
| 238 | <All >True</All > | |||||
| 239 | <Aut oFill>True </AutoFill > | |||||
| 240 | <Cha racters> | |||||
| 241 | </Ch aracters> | |||||
| 242 | <Upp ercase>Tru e</Upperca se> | |||||
| 243 | <Low ercase>Tru e</Lowerca se> | |||||
| 244 | <Num bers>True< /Numbers> | |||||
| 245 | <Pun ctuation>T rue</Punct uation> | |||||
| 246 | </Blen dEmbeddedF ont> | |||||
| 247 | </ItemGr oup> | |||||
| 248 | <Import Project="$ (MSBuildTo olsPath)\M icrosoft.C Sharp.targ ets" /> | |||||
| 249 | <!-- To modify you r build pr ocess, add your task inside on e of the t argets bel ow and unc omment it. | |||||
| 250 | Oth er similar extension points ex ist, see M icrosoft.C ommon.targ ets. | |||||
| 251 | <Target Name="Befo reBuild"> | |||||
| 252 | </Target > | |||||
| 253 | <Target Name="Afte rBuild"> | |||||
| 254 | </Target > | |||||
| 255 | --> | |||||
| 256 | </Project> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.