From a12ad21bfdeaeb249a38596e56a36cd72ee13d37 Mon Sep 17 00:00:00 2001
From: Tsvetan Raikov <tsvetan.raikov@telerik.com>
Date: Wed, 7 Dec 2016 13:52:48 +0200
Subject: [PATCH 1/2] Fixed: XML/HTML livesync not working on iOS

---
 tns-core-modules/application/application.ios.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tns-core-modules/application/application.ios.ts b/tns-core-modules/application/application.ios.ts
index bc6aae7519..096b933a9d 100644
--- a/tns-core-modules/application/application.ios.ts
+++ b/tns-core-modules/application/application.ios.ts
@@ -87,7 +87,7 @@ class IOSApplication implements definition.iOSApplication {
 
     get window(): Window {
         return this._window;
-    }    
+    }
 
     get delegate(): typeof UIApplicationDelegate {
         return this._delegate;
@@ -225,7 +225,7 @@ global.__onUncaughtError = function (error: definition.NativeScriptError) {
     if (types.isFunction(typedExports.onUncaughtError)) {
         typedExports.onUncaughtError(error);
     }
-    
+
     typedExports.notify({ eventName: typedExports.uncaughtErrorEvent, object: typedExports.ios, ios: error });
 }
 
@@ -276,11 +276,11 @@ typedExports.start = function (entry?: NavigationEntry) {
     if (entry) {
         exports.mainEntry = entry;
     }
-
+    started = true;
     loadCss();
 
     if(!iosApp.nativeApp) {
-        // Normal NativeScript app will need UIApplicationMain. 
+        // Normal NativeScript app will need UIApplicationMain.
         UIApplicationMain(0, null, null, typedExports.ios && typedExports.ios.delegate ? NSStringFromClass(typedExports.ios.delegate) : NSStringFromClass(Responder));
     } else {
         let rootView = createRootView();

From d368d35e0a9b086605f123fcdb1add7a9f64c820 Mon Sep 17 00:00:00 2001
From: Nedyalko Nikolov <nedyalko.nikolov@telerik.com>
Date: Fri, 16 Dec 2016 12:16:12 +0200
Subject: [PATCH 2/2] Fixed tests tns-core-modules true plugin.

---
 tests/app/xml-declaration/xml-declaration-tests.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
index fa8cc2b19a..7b4f25f0a9 100644
--- a/tests/app/xml-declaration/xml-declaration-tests.ts
+++ b/tests/app/xml-declaration/xml-declaration-tests.ts
@@ -126,7 +126,7 @@ export function test_loadWithOptionsFromTNS() {
 
 export function test_loadWithOptionsFromTNSPath() {
     var v = builder.load({
-        path: "tns_modules/ui/label",
+        path: "tns_modules/tns-core-modules/ui/label",
         name: "Label"
     });
 
@@ -139,7 +139,7 @@ export function test_loadWithAttributes() {
     var lColor = "#FF0000"; // red
 
     var v = builder.load({
-        path: "tns_modules/ui/label",
+        path: "tns_modules/tns-core-modules/ui/label",
         name: "Label",
         attributes: {
             text: lText,
@@ -517,7 +517,7 @@ export function test_parse_ShouldParseCustomComponentWithoutXml() {
 };
 
 export function test_parse_ShouldParseCustomComponentWithoutXmlFromTNSModules() {
-    var p = <Page>builder.parse('<Page xmlns' + ':customControls="tns_modules/ui/label"><customControls:Label /></Page>');
+    var p = <Page>builder.parse('<Page xmlns' + ':customControls="tns_modules/tns-core-modules/ui/label"><customControls:Label /></Page>');
     var ctrl = p.content;
 
     TKUnit.assert(ctrl instanceof Label, "Expected result: custom control is defined!; Actual result: " + ctrl);