Produced by Araxis Merge on 2/1/2017 2:56:54 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\QuickStart\WinForms | WinCRUDOperations.resx | Tue Dec 20 19:51:42 2016 UTC |
| 2 | Wed Feb 1 19:56:54 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 0 | 0 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 1 | 120 |
| 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 | <root> | |||||
| 3 | <!-- | |||||
| 4 | Micros oft ResX S chema | |||||
| 5 | ||||||
| 6 | Versio n 2.0 | |||||
| 7 | ||||||
| 8 | The pr imary goal s of this format is to allow a simple XM L format | |||||
| 9 | that i s mostly h uman reada ble. The g eneration and parsin g of the | |||||
| 10 | variou s data typ es are don e through the TypeCo nverter cl asses | |||||
| 11 | associ ated with the data t ypes. | |||||
| 12 | ||||||
| 13 | Exampl e: | |||||
| 14 | ||||||
| 15 | ... ad o.net/XML headers & schema ... | |||||
| 16 | <reshe ader name= "resmimety pe">text/m icrosoft-r esx</reshe ader> | |||||
| 17 | <reshe ader name= "version"> 2.0</reshe ader> | |||||
| 18 | <reshe ader name= "reader">S ystem.Reso urces.ResX ResourceRe ader, Syst em.Windows .Forms, .. .</reshead er> | |||||
| 19 | <reshe ader name= "writer">S ystem.Reso urces.ResX ResourceWr iter, Syst em.Windows .Forms, .. .</reshead er> | |||||
| 20 | <data name="Name 1"><value> this is my long stri ng</value> <comment>t his is a c omment</co mment></da ta> | |||||
| 21 | <data name="Colo r1" type=" System.Dra wing.Color , System.D rawing">Bl ue</data> | |||||
| 22 | <data name="Bitm ap1" mimet ype="appli cation/x-m icrosoft.n et.object. binary.bas e64"> | |||||
| 23 | <v alue>[base 64 mime en coded seri alized .NE T Framewor k object]< /value> | |||||
| 24 | </data > | |||||
| 25 | <data name="Icon 1" type="S ystem.Draw ing.Icon, System.Dra wing" mime type="appl ication/x- microsoft. net.object .bytearray .base64"> | |||||
| 26 | <v alue>[base 64 mime en coded stri ng represe nting a by te array f orm of the .NET Fram ework obje ct]</value > | |||||
| 27 | <c omment>Thi s is a com ment</comm ent> | |||||
| 28 | </data > | |||||
| 29 | ||||||
| 30 | There are any nu mber of "r esheader" rows that contain si mple | |||||
| 31 | name/v alue pairs . | |||||
| 32 | ||||||
| 33 | Each d ata row co ntains a n ame, and v alue. The row also c ontains a | |||||
| 34 | type o r mimetype . Type cor responds t o a .NET c lass that support | |||||
| 35 | text/v alue conve rsion thro ugh the Ty peConverte r architec ture. | |||||
| 36 | Classe s that don 't support this are serialized and store d with the | |||||
| 37 | mimety pe set. | |||||
| 38 | ||||||
| 39 | The mi metype is used for s erialized objects, a nd tells t he | |||||
| 40 | ResXRe sourceRead er how to depersist the object . This is currently not | |||||
| 41 | extens ible. For a given mi metype the value mus t be set a ccordingly : | |||||
| 42 | ||||||
| 43 | Note - applicati on/x-micro soft.net.o bject.bina ry.base64 is the for mat | |||||
| 44 | that t he ResXRes ourceWrite r will gen erate, how ever the r eader can | |||||
| 45 | read a ny of the formats li sted below . | |||||
| 46 | ||||||
| 47 | mimety pe: applic ation/x-mi crosoft.ne t.object.b inary.base 64 | |||||
| 48 | value : The ob ject must be seriali zed with | |||||
| 49 | : System .Runtime.S erializati on.Formatt ers.Binary .BinaryFor matter | |||||
| 50 | : and th en encoded with base 64 encodin g. | |||||
| 51 | ||||||
| 52 | mimety pe: applic ation/x-mi crosoft.ne t.object.s oap.base64 | |||||
| 53 | value : The ob ject must be seriali zed with | |||||
| 54 | : System .Runtime.S erializati on.Formatt ers.Soap.S oapFormatt er | |||||
| 55 | : and th en encoded with base 64 encodin g. | |||||
| 56 | ||||||
| 57 | mimety pe: applic ation/x-mi crosoft.ne t.object.b ytearray.b ase64 | |||||
| 58 | value : The ob ject must be seriali zed into a byte arra y | |||||
| 59 | : using a System.C omponentMo del.TypeCo nverter | |||||
| 60 | : and th en encoded with base 64 encodin g. | |||||
| 61 | --> | |||||
| 62 | <xsd:sch ema id="ro ot" xmlns= "" xmlns:x sd="http:/ /www.w3.or g/2001/XML Schema" xm lns:msdata ="urn:sche mas-micros oft-com:xm l-msdata"> | |||||
| 63 | <xsd:i mport name space="htt p://www.w3 .org/XML/1 998/namesp ace" /> | |||||
| 64 | <xsd:e lement nam e="root" m sdata:IsDa taSet="tru e"> | |||||
| 65 | <xsd :complexTy pe> | |||||
| 66 | <x sd:choice maxOccurs= "unbounded "> | |||||
| 67 | <xsd:eleme nt name="m etadata"> | |||||
| 68 | <xsd:com plexType> | |||||
| 69 | <xsd:s equence> | |||||
| 70 | <xsd :element n ame="value " type="xs d:string" minOccurs= "0" /> | |||||
| 71 | </xsd: sequence> | |||||
| 72 | <xsd:a ttribute n ame="name" use="requ ired" type ="xsd:stri ng" /> | |||||
| 73 | <xsd:a ttribute n ame="type" type="xsd :string" / > | |||||
| 74 | <xsd:a ttribute n ame="mimet ype" type= "xsd:strin g" /> | |||||
| 75 | <xsd:a ttribute r ef="xml:sp ace" /> | |||||
| 76 | </xsd:co mplexType> | |||||
| 77 | </xsd:elem ent> | |||||
| 78 | <xsd:eleme nt name="a ssembly"> | |||||
| 79 | <xsd:com plexType> | |||||
| 80 | <xsd:a ttribute n ame="alias " type="xs d:string" /> | |||||
| 81 | <xsd:a ttribute n ame="name" type="xsd :string" / > | |||||
| 82 | </xsd:co mplexType> | |||||
| 83 | </xsd:elem ent> | |||||
| 84 | <xsd:eleme nt name="d ata"> | |||||
| 85 | <xsd:com plexType> | |||||
| 86 | <xsd:s equence> | |||||
| 87 | <xsd :element n ame="value " type="xs d:string" minOccurs= "0" msdata :Ordinal=" 1" /> | |||||
| 88 | <xsd :element n ame="comme nt" type=" xsd:string " minOccur s="0" msda ta:Ordinal ="2" /> | |||||
| 89 | </xsd: sequence> | |||||
| 90 | <xsd:a ttribute n ame="name" type="xsd :string" u se="requir ed" msdata :Ordinal=" 1" /> | |||||
| 91 | <xsd:a ttribute n ame="type" type="xsd :string" m sdata:Ordi nal="3" /> | |||||
| 92 | <xsd:a ttribute n ame="mimet ype" type= "xsd:strin g" msdata: Ordinal="4 " /> | |||||
| 93 | <xsd:a ttribute r ef="xml:sp ace" /> | |||||
| 94 | </xsd:co mplexType> | |||||
| 95 | </xsd:elem ent> | |||||
| 96 | <xsd:eleme nt name="r esheader"> | |||||
| 97 | <xsd:com plexType> | |||||
| 98 | <xsd:s equence> | |||||
| 99 | <xsd :element n ame="value " type="xs d:string" minOccurs= "0" msdata :Ordinal=" 1" /> | |||||
| 100 | </xsd: sequence> | |||||
| 101 | <xsd:a ttribute n ame="name" type="xsd :string" u se="requir ed" /> | |||||
| 102 | </xsd:co mplexType> | |||||
| 103 | </xsd:elem ent> | |||||
| 104 | </ xsd:choice > | |||||
| 105 | </xs d:complexT ype> | |||||
| 106 | </xsd: element> | |||||
| 107 | </xsd:sc hema> | |||||
| 108 | <reshead er name="r esmimetype "> | |||||
| 109 | <value >text/micr osoft-resx </value> | |||||
| 110 | </reshea der> | |||||
| 111 | <reshead er name="v ersion"> | |||||
| 112 | <value >2.0</valu e> | |||||
| 113 | </reshea der> | |||||
| 114 | <reshead er name="r eader"> | |||||
| 115 | <value >System.Re sources.Re sXResource Reader, Sy stem.Windo ws.Forms, Version=4. 0.0.0, Cul ture=neutr al, Public KeyToken=b 77a5c56193 4e089</val ue> | |||||
| 116 | </reshea der> | |||||
| 117 | <reshead er name="w riter"> | |||||
| 118 | <value >System.Re sources.Re sXResource Writer, Sy stem.Windo ws.Forms, Version=4. 0.0.0, Cul ture=neutr al, Public KeyToken=b 77a5c56193 4e089</val ue> | |||||
| 119 | </reshea der> | |||||
| 120 | </root> |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.