@nativescript/windows 0.1.0-alpha.76 → 0.1.0-alpha.77

package/framework/__PROJECT_NAME__/Directory.Build.targets

@@ -6,7 +6,7 @@
        easily overridden per-app or via MSBuild /p: properties. -->
 
   <!-- Inline merge task: will merge App_Resources/Windows/Package.appxmanifest or Package.appxmanifest.partial.xml into the generated Package.appxmanifest -->
-  <UsingTask TaskName="MergeAppxManifest" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+  <UsingTask TaskName="MergeAppxManifest" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll" Condition="'$(MSBuildRuntimeType)' != 'Core'">
     <ParameterGroup>
       <SourceManifest ParameterType="System.String" Required="true" />
       <TargetManifest ParameterType="System.String" Required="true" />
@@ -85,7 +85,7 @@
     </Task>
   </UsingTask>
 
-  <Target Name="MergeAppResourcesManifest" AfterTargets="ApplyManifestOverrides" Condition="Exists('$(MSBuildProjectDirectory)\Package.appxmanifest')">
+  <Target Name="MergeAppResourcesManifest" AfterTargets="ApplyManifestOverrides" Condition="Exists('$(MSBuildProjectDirectory)\Package.appxmanifest') and '$(MSBuildRuntimeType)' != 'Core'">
     <PropertyGroup>
       <_AppResourcesManifest>$(MSBuildProjectDirectory)\App_Resources\Windows\Package.appxmanifest</_AppResourcesManifest>
       <!-- Allow CLI or callers to override the source manifest via MSBuild property 'AppResourcesManifestPath' -->

package/framework/dotnet-bridge/Bridge.cs

@@ -326,6 +326,105 @@ public static partial class Bridge
         return 0;
     }
 
+    // Callback id registered by the runtime/JS that should receive unhandled
+    // managed exceptions and unobserved task exceptions.
+    private static int s_unhandledExceptionCallbackId = -1;
+
+    // Called from JS/Rust to request that managed unhandled exceptions be
+    // forwarded to the registered JS callback id.  The callback id must have
+    // been created on the Rust side and point to a JS function stored in the
+    // runtime's `DOTNET_JS_CALLBACKS` map.
+    public static int RegisterUnhandledExceptionCallback(int callbackId)
+    {
+        s_unhandledExceptionCallbackId = callbackId;
+
+        // Subscribe once (idempotent).
+        try
+        {
+            AppDomain.CurrentDomain.UnhandledException -= OnAppDomainUnhandledException;
+            AppDomain.CurrentDomain.UnhandledException += OnAppDomainUnhandledException;
+
+            TaskScheduler.UnobservedTaskException -= OnUnobservedTaskException;
+            TaskScheduler.UnobservedTaskException += OnUnobservedTaskException;
+
+            // Try to subscribe to Windows.CoreApplication.UnhandledErrorDetected if available
+            foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+            {
+                var coreAppType = asm.GetType("Windows.ApplicationModel.Core.CoreApplication");
+                if (coreAppType == null) continue;
+                var ev = coreAppType.GetEvent("UnhandledErrorDetected");
+                if (ev == null) continue;
+                try
+                {
+                    var handlerType = ev.EventHandlerType;
+                    var method = typeof(Bridge).GetMethod(nameof(CoreApplicationUnhandledErrorHandler), BindingFlags.NonPublic | BindingFlags.Static);
+                    if (method != null)
+                    {
+                        var del = Delegate.CreateDelegate(handlerType, method);
+                        ev.AddEventHandler(null, del);
+                    }
+                }
+                catch { }
+            }
+        }
+        catch { }
+
+        return 0;
+    }
+
+    private static void OnAppDomainUnhandledException(object? sender, UnhandledExceptionEventArgs e)
+    {
+        try
+        {
+            var ex = e.ExceptionObject as Exception;
+            var msg = ex?.ToString() ?? e.ExceptionObject?.ToString() ?? "(unknown)";
+            SendUnhandledToJs("unhandled", msg);
+        }
+        catch { }
+    }
+
+    private static void OnUnobservedTaskException(object? sender, UnobservedTaskExceptionEventArgs e)
+    {
+        try
+        {
+            var msg = e.Exception?.ToString() ?? "(unobserved task exception)";
+            SendUnhandledToJs("unobservedTask", msg);
+        }
+        catch { }
+    }
+
+    // Fallback handler for platform-specific CoreApplication unhandled events.
+    private static void CoreApplicationUnhandledErrorHandler(object? sender, object? args)
+    {
+        try
+        {
+            var msg = args?.ToString() ?? "(core unhandled)";
+            SendUnhandledToJs("coreUnhandled", msg);
+        }
+        catch { }
+    }
+
+    private static void SendUnhandledToJs(string kind, string message)
+    {
+        try
+        {
+            if (s_jsInvoker == null || s_unhandledExceptionCallbackId <= 0) return;
+            var payload = JsonSerializer.Serialize(new { kind = kind, message = message });
+            var bytes = System.Text.Encoding.UTF8.GetBytes(payload);
+            unsafe
+            {
+                fixed (byte* p = bytes)
+                {
+                    byte* respPtr = null;
+                    int respLen = 0;
+                    s_jsInvoker(s_unhandledExceptionCallbackId, p, bytes.Length, &respPtr, &respLen);
+                    if (respPtr != null && respLen > 0) Marshal.FreeHGlobal((IntPtr)respPtr);
+                }
+            }
+        }
+        catch { }
+    }
+
     [UnmanagedCallersOnly(EntryPoint = "Invoke",
         CallConvs = [typeof(System.Runtime.CompilerServices.CallConvCdecl)])]
     public static unsafe int Invoke(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.76",
+  "version": "0.1.0-alpha.77",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",