@@ -54,6 +54,32 @@ export var test_XmlParser_EntityReferencesInAttributeValuesAreDecoded = function
     TKUnit.assert(data === "<>\"&'", "Expected result: <>\"&'; Actual result: " + data + ";");
 };
 
+export var test_XmlParser_UnicodeEntitiesAreDecoded = function () {
+    var data;
+    var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
+        switch (event.eventType) {
+            case xmlModule.ParserEventType.Text:
+                data = event.data;
+                break;
+        }
+    });
+    xmlParser.parse("<element>&#x1f923;&#x2713;</element>");
+    TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
+};
+
+export var test_XmlParser_UnicodeEntitiesInAttributeValuesAreDecoded = function () {
+    var data;
+    var xmlParser = new xmlModule.XmlParser(function (event: xmlModule.ParserEvent) {
+        switch (event.eventType) {
+            case xmlModule.ParserEventType.StartElement:
+                data = event.attributes["text"];
+                break;
+        }
+    });
+    xmlParser.parse("<Label text=\"&#x1f923;&#x2713;\"/>");
+    TKUnit.assert(data === "\uD83E\uDD23\u2713", "Expected result: \uD83E\uDD23\u2713; Actual result: " + data + ";");
+};
+
 export var test_XmlParser_OnErrorIsCalledWhenAnErrorOccurs = function () {
     var e;
     var xmlParser = new xmlModule.XmlParser(
 
@@ -188,10 +188,10 @@ function rpEntities(s, d, x, z) {
     };
 
     if (d) {
-        return String.fromCharCode(d);
+        return String.fromCodePoint(d);
     };
 
-    return String.fromCharCode(parseInt(x, 16));
+    return String.fromCodePoint(parseInt(x, 16));
 };
 
 function unEntities(s, i) {
 
@@ -100,17 +100,17 @@ function _HandleAmpEntities(found: string, decimalValue: string, hexValue: strin
         }
         const res = _ampCodes.get(wordValue);
         if (res) {
-            return String.fromCharCode(res);
+            return String.fromCodePoint(res);
         }
 
         // Invalid word; so we just return it
         return found;
     }
     if (decimalValue) {
-        return String.fromCharCode(parseInt(decimalValue, 10));
+        return String.fromCodePoint(parseInt(decimalValue, 10));
     }
 
-    return String.fromCharCode(parseInt(hexValue, 16));
+    return String.fromCodePoint(parseInt(hexValue, 16));
 }
 
 export class XmlParser implements definition.XmlParser {
Original file line number	Diff line number	Diff line change
`@@ -100,17 +100,17 @@ function _HandleAmpEntities(found: string, decimalValue: string, hexValue: strin`
`100`	`100`	`}`
`101`	`101`	`const res = _ampCodes.get(wordValue);`
`102`	`102`	`if (res) {`
`103`		`- return String.fromCharCode(res);`
	`103`	`+ return String.fromCodePoint(res);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Invalid word; so we just return it`
`107`	`107`	`return found;`
`108`	`108`	`}`
`109`	`109`	`if (decimalValue) {`
`110`		`- return String.fromCharCode(parseInt(decimalValue, 10));`
	`110`	`+ return String.fromCodePoint(parseInt(decimalValue, 10));`
`111`	`111`	`}`
`112`	`112`
`113`		`- return String.fromCharCode(parseInt(hexValue, 16));`
	`113`	`+ return String.fromCodePoint(parseInt(hexValue, 16));`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`export class XmlParser implements definition.XmlParser {`