@babylonjs/react-native 2.0.0 → 2.0.1-preview

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/TestUtils.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include <napi/env.h>
 
 #if _MSC_VER
@@ -9,23 +10,20 @@
 #include <bimg/bimg.h>
 #include <Babylon/JsRuntime.h>
 #include <Babylon/Graphics/DeviceContext.h>
+#include <Babylon/Graphics/Platform.h>
+#include <vector>
 
 namespace Babylon::Plugins::Internal
 {
     class TestUtils final : public Napi::ObjectWrap<TestUtils>
     {
     public:
-        class ImplData;
-
         static inline constexpr const char* JS_INSTANCE_NAME{"TestUtils"};
 
         using ParentT = Napi::ObjectWrap<TestUtils>;
 
-        static void CreateInstance(Napi::Env env, std::shared_ptr<ImplData> implData)
+        static void CreateInstance(Napi::Env env, Graphics::WindowT window)
         {
-            m_implData = std::move(implData);
-            Napi::HandleScope scope{env};
-
             Napi::Function func = ParentT::DefineClass(
                 env,
                 "TestUtilsClass",
@@ -39,27 +37,28 @@ namespace Babylon::Plugins::Internal
                     ParentT::InstanceMethod("getImageData", &TestUtils::GetImageData),
                     ParentT::InstanceMethod("getOutputDirectory", &TestUtils::GetOutputDirectory),
                     ParentT::InstanceMethod("getFrameBufferData", &TestUtils::GetFrameBufferData),
-                });
+                },
+                &window);
+
             env.Global().Set(JS_INSTANCE_NAME, func.New({}));
         }
 
         TestUtils(const Napi::CallbackInfo& info)
-            : TestUtils(info, JsRuntime::GetFromJavaScript(info.Env()))
+            : TestUtils(info, JsRuntime::GetFromJavaScript(info.Env()), *static_cast<Graphics::WindowT*>(info.Data()))
         {
         }
 
-        explicit TestUtils(const Napi::CallbackInfo& info, JsRuntime& runtime)
+        explicit TestUtils(const Napi::CallbackInfo& info, JsRuntime& runtime, Graphics::WindowT window)
             : ParentT{info}
             , m_runtime{runtime}
-            , m_deviceContext{ Graphics::DeviceContext::GetFromJavaScript(info.Env()) }
+            , m_deviceContext{Graphics::DeviceContext::GetFromJavaScript(info.Env())}
+            , m_window{window}
         {
         }
 
     private:
         static inline Napi::FunctionReference constructor{};
 
-        inline static std::shared_ptr<ImplData> m_implData;
-
         void Exit(const Napi::CallbackInfo& info);
         void UpdateSize(const Napi::CallbackInfo& info);
         void SetTitle(const Napi::CallbackInfo& info);
@@ -73,6 +72,7 @@ namespace Babylon::Plugins::Internal
 
         JsRuntime& m_runtime;
         Graphics::DeviceContext& m_deviceContext;
+        Graphics::WindowT m_window;
 
         struct Image
         {
@@ -88,4 +88,4 @@ namespace Babylon::Plugins::Internal
             bimg::ImageContainer* m_Image{};
         };
     };
-} // namespace
+}

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/{Android/TestUtilsImpl.cpp → TestUtils_Android.cpp}

@@ -1,4 +1,4 @@
-#include "../TestUtilsImplData.h"
+#include "TestUtils.h"
 
 namespace Babylon::Plugins::Internal
 {
@@ -19,13 +19,4 @@ namespace Babylon::Plugins::Internal
         auto path = "/data/data/com.android.babylonnative.playground/cache";
         return Napi::Value::From(info.Env(), path);
     }
-}
-
-namespace Babylon::Plugins::TestUtils
-{
-    void Initialize(Napi::Env env, Graphics::WindowT window)
-    {
-        auto implData{std::make_shared<Internal::TestUtils::ImplData>(window)};
-        Internal::TestUtils::CreateInstance(env, implData);
-    }
 }

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/{Unix/TestUtilsImpl.cpp → TestUtils_Unix.cpp}

@@ -1,4 +1,4 @@
-#include "../TestUtilsImplData.h"
+#include "TestUtils.h"
 #define XK_MISCELLANY
 #define XK_LATIN1
 #include <X11/keysymdef.h>
@@ -8,25 +8,24 @@
 #undef None
 #include <filesystem>
 
-namespace Babylon::Plugins::TestUtils
-{
-    int errorCode{};
-}
-
 namespace Babylon::Plugins::Internal
 {
     void TestUtils::Exit(const Napi::CallbackInfo& info)
     {
-        auto window = (Window)m_implData->m_window;
-        const int32_t exitCode = info[0].As<Napi::Number>().Int32Value();
-        Plugins::TestUtils::errorCode = exitCode;
+        auto exitCode = info[0].As<Napi::Number>().Int32Value();
+        if (exitCode != 0)
+        {
+            std::quick_exit(exitCode);
+        }
+
+        auto window = (Window)m_window;
         auto display = XOpenDisplay(NULL);
         XClientMessageEvent dummyEvent;
         memset(&dummyEvent, 0, sizeof(XClientMessageEvent));
         dummyEvent.type = ClientMessage;
         dummyEvent.window = window;
         dummyEvent.format = 32;
-        dummyEvent.data.l[0] = XInternAtom(display, "WM_DELETE_WINDOW", False);;
+        dummyEvent.data.l[0] = XInternAtom(display, "WM_DELETE_WINDOW", False);
         XSendEvent(display, window, 0, 0, (XEvent*)&dummyEvent);
         XFlush(display);
         XCloseDisplay(display);
@@ -40,7 +39,7 @@ namespace Babylon::Plugins::Internal
     {
         const auto title = info[0].As<Napi::String>().Utf8Value();
         auto display = XOpenDisplay(NULL);
-        auto window = (Window)m_implData->m_window;
+        auto window = (Window)m_window;
         XStoreName(display, window, title.c_str());
         XCloseDisplay(display);
     }
@@ -58,13 +57,4 @@ namespace Babylon::Plugins::Internal
         auto path = std::filesystem::path{exe}.parent_path().generic_string();
         return Napi::Value::From(info.Env(), path);
     }
-}
-
-namespace Babylon::Plugins::TestUtils
-{
-    void Initialize(Napi::Env env, Graphics::WindowT window)
-    {
-        auto implData{std::make_shared<Internal::TestUtils::ImplData>(window)};
-        Internal::TestUtils::CreateInstance(env, implData);
-    }
 }

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/{Win32/TestUtilsImpl.cpp → TestUtils_Win32.cpp}

@@ -1,4 +1,4 @@
-#include "../TestUtilsImplData.h"
+#include "TestUtils.h"
 #include <filesystem>
 #include <Windowsx.h>
 #include <arcana/threading/task.h>
@@ -14,18 +14,17 @@ namespace
     }
 }
 
-namespace Babylon::Plugins::TestUtils
-{
-    int errorCode{};
-}
-
 namespace Babylon::Plugins::Internal
 {
     void TestUtils::Exit(const Napi::CallbackInfo& info)
     {
-        const int32_t exitCode = info[0].As<Napi::Number>().Int32Value();
-        Plugins::TestUtils::errorCode = exitCode;
-        PostMessageW(m_implData->m_window, WM_DESTROY, 0, 0);
+        auto exitCode = info[0].As<Napi::Number>().Int32Value();
+        if (exitCode != 0)
+        {
+            std::quick_exit(exitCode);
+        }
+
+        PostMessageW(m_window, WM_DESTROY, 0, 0);
     }
 
     void TestUtils::UpdateSize(const Napi::CallbackInfo& info)
@@ -33,7 +32,7 @@ namespace Babylon::Plugins::Internal
         const int32_t width = info[0].As<Napi::Number>().Int32Value();
         const int32_t height = info[1].As<Napi::Number>().Int32Value();
 
-        auto hWnd = m_implData->m_window;
+        auto hWnd = m_window;
         RECT rc{0, 0, width, height};
         AdjustWindowRectEx(&rc, GetWindowStyle(hWnd), GetMenu(hWnd) != NULL, GetWindowExStyle(hWnd));
         SetWindowPos(hWnd, NULL, 0, 0, rc.right - rc.left, rc.bottom - rc.top, SWP_NOMOVE | SWP_NOZORDER);
@@ -45,7 +44,7 @@ namespace Babylon::Plugins::Internal
         // is currently set up. If the main thread is calling FinishRenderingCurrentFrame, this will hang forever as
         // the main message loop is not pumping. Once we fix the rendering code to never block the main thread, this
         // threadpool scheduling will no longer be necessary.
-        arcana::threadpool_scheduler([hWnd = m_implData->m_window, title = info[0].As<Napi::String>().Utf8Value()] {
+        arcana::threadpool_scheduler([hWnd = m_window, title = info[0].As<Napi::String>().Utf8Value()] {
             SetWindowTextA(hWnd, title.c_str());
         });
     }
@@ -55,13 +54,4 @@ namespace Babylon::Plugins::Internal
         auto path = GetModulePath().parent_path().generic_string();
         return Napi::Value::From(info.Env(), path);
     }
-}
-
-namespace Babylon::Plugins::TestUtils
-{
-    void BABYLON_API Initialize(Napi::Env env, Graphics::WindowT window)
-    {
-        auto implData{std::make_shared<Internal::TestUtils::ImplData>(window)};
-        Internal::TestUtils::CreateInstance(env, implData);
-    }
 }

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/{WinRT/TestUtilsImpl.cpp → TestUtils_WinRT.cpp}

@@ -1,13 +1,18 @@
-#include "../TestUtilsImplData.h"
+#include "TestUtils.h"
+#include <winrt/Windows.ApplicationModel.Core.h>
 #include <winrt/windows.storage.h>
 
 namespace Babylon::Plugins::Internal
 {
     void TestUtils::Exit(const Napi::CallbackInfo& info)
     {
-        const int32_t exitCode = info[0].As<Napi::Number>().Int32Value();
-        // ceguille: I didn't find a better way to do it for UWP
-        exit(exitCode);
+        auto exitCode = info[0].As<Napi::Number>().Int32Value();
+        if (exitCode != 0)
+        {
+            std::quick_exit(exitCode);
+        }
+
+        winrt::Windows::ApplicationModel::Core::CoreApplication::Exit();
     }
 
     void TestUtils::UpdateSize(const Napi::CallbackInfo& /*info*/)
@@ -23,13 +28,4 @@ namespace Babylon::Plugins::Internal
         auto localFolder = winrt::Windows::Storage::ApplicationData::Current().LocalFolder();
         return Napi::Value::From(info.Env(), winrt::to_string(localFolder.Path().data()));
     }
-}
-
-namespace Babylon::Plugins::TestUtils
-{
-    void BABYLON_API Initialize(Napi::Env env, Graphics::WindowT window)
-    {
-        auto implData{std::make_shared<Internal::TestUtils::ImplData>(window)};
-        Internal::TestUtils::CreateInstance(env, implData);
-    }
 }

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/TestUtils_iOS.mm

@@ -0,0 +1,25 @@
+#include "TestUtils.h"
+
+namespace Babylon::Plugins::Internal
+{
+    void TestUtils::Exit(const Napi::CallbackInfo& /*info*/)
+    {
+        // Not implemented for iOS
+    }
+
+    void TestUtils::UpdateSize(const Napi::CallbackInfo& /*info*/)
+    {
+        // Not implemented for iOS
+    }
+
+    void TestUtils::SetTitle(const Napi::CallbackInfo& /*info*/)
+    {
+        // Not implemented for iOS
+    }
+
+    Napi::Value TestUtils::GetOutputDirectory(const Napi::CallbackInfo& /*info*/)
+    {
+        // Not implemented for iOS
+        return {};
+    }
+}

package/shared/BabylonNative/Repo/Plugins/TestUtils/Source/TestUtils_macOS.mm

@@ -0,0 +1,50 @@
+#include "TestUtils.h"
+
+#include <filesystem>
+
+#import <AppKit/AppKit.h>
+#import <QuartzCore/QuartzCore.h>
+
+namespace Babylon::Plugins::Internal
+{
+    void TestUtils::Exit(const Napi::CallbackInfo& info)
+    {
+        auto exitCode = info[0].As<Napi::Number>().Int32Value();
+        if (exitCode != 0)
+        {
+            std::quick_exit(exitCode);
+        }
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [NSApp terminate:nil];
+        });
+    }
+
+    void TestUtils::UpdateSize(const Napi::CallbackInfo& info)
+    {
+        const int32_t width = info[0].As<Napi::Number>().Int32Value();
+        const int32_t height = info[1].As<Napi::Number>().Int32Value();
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            auto* window = [(NSView*)((__bridge CAMetalLayer*)m_window).delegate window];
+            CGFloat scale = window.backingScaleFactor;
+            [window setContentSize:NSMakeSize(width / scale, height / scale)];
+        });
+    }
+
+    void TestUtils::SetTitle(const Napi::CallbackInfo& info)
+    {
+        NSString* title = @(info[0].As<Napi::String>().Utf8Value().c_str());
+        dispatch_async(dispatch_get_main_queue(), ^{
+            auto* window = [(NSView*)((__bridge CAMetalLayer*)m_window).delegate window];
+            [window setTitle:title];
+        });
+    }
+
+    Napi::Value TestUtils::GetOutputDirectory(const Napi::CallbackInfo& info)
+    {
+        auto path = std::filesystem::path{[[[NSBundle mainBundle] executablePath] UTF8String]}
+            .parent_path().parent_path().parent_path().parent_path().parent_path().generic_string();
+        return Napi::Value::From(info.Env(), path);
+    }
+}

package/shared/BabylonNative/Repo/Polyfills/Canvas/Source/Shaders/dx11/fs_boxblur.h

@@ -1,4 +1,4 @@
-static const uint8_t fs_boxblur_dx11[1117] =
+static const uint8_t fs_boxblur_dxbc[1117] =
 {
 	0x46, 0x53, 0x48, 0x0b, 0xcf, 0xda, 0x1b, 0x94, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0a, 0x75, // FSH............u
 	0x5f, 0x76, 0x69, 0x65, 0x77, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, // _viewSize.......

package/shared/BabylonNative/Repo/Polyfills/Canvas/Source/Shaders/dx11/fs_gaussblur.h

@@ -1,4 +1,4 @@
-static const uint8_t fs_gaussblur_dx11[1649] =
+static const uint8_t fs_gaussblur_dxbc[1649] =
 {
 	0x46, 0x53, 0x48, 0x0b, 0xcf, 0xda, 0x1b, 0x94, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x0a, 0x75, // FSH............u
 	0x5f, 0x76, 0x69, 0x65, 0x77, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, // _viewSize.......

package/shared/BabylonNative/Repo/Polyfills/Canvas/Source/Shaders/dx11/fs_nanovg_fill.h

@@ -1,4 +1,4 @@
-static const uint8_t fs_nanovg_fill_dx11[3258] =
+static const uint8_t fs_nanovg_fill_dxbc[3258] =
 {
 	0x46, 0x53, 0x48, 0x0b, 0x1e, 0x98, 0xde, 0xee, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x0c, 0x75, // FSH............u
 	0x5f, 0x73, 0x63, 0x69, 0x73, 0x73, 0x6f, 0x72, 0x4d, 0x61, 0x74, 0x13, 0x00, 0x00, 0x00, 0x03, // _scissorMat.....

package/shared/BabylonNative/Repo/Polyfills/Canvas/Source/Shaders/dx11/vs_fspass.h

@@ -1,4 +1,4 @@
-static const uint8_t vs_fspass_dx11[494] =
+static const uint8_t vs_fspass_dxbc[494] =
 {
 	0x56, 0x53, 0x48, 0x0b, 0x00, 0x00, 0x00, 0x00, 0xcf, 0xda, 0x1b, 0x94, 0x00, 0x00, 0xd4, 0x01, // VSH.............
 	0x00, 0x00, 0x44, 0x58, 0x42, 0x43, 0x2d, 0x40, 0xc0, 0xce, 0x39, 0x67, 0x5a, 0x73, 0x8a, 0xa9, // ..DXBC-@..9gZs..

package/shared/BabylonNative/Repo/Polyfills/Canvas/Source/Shaders/dx11/vs_nanovg_fill.h

@@ -1,4 +1,4 @@
-static const uint8_t vs_nanovg_fill_dx11[800] =
+static const uint8_t vs_nanovg_fill_dxbc[800] =
 {
 	0x56, 0x53, 0x48, 0x0b, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x98, 0xde, 0xee, 0x02, 0x00, 0x0a, 0x75, // VSH............u
 	0x5f, 0x76, 0x69, 0x65, 0x77, 0x53, 0x69, 0x7a, 0x65, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, // _viewSize.......

package/shared/BabylonNative/Repo/Polyfills/Canvas/shaderc.cmake

@@ -207,7 +207,7 @@ function(add_bgfx_shader FILE FOLDER)
                     PROFILE s_5_0
                     O 3
                     OUTPUT ${DX11_OUTPUT}
-                    BIN2C "${FILENAME}_dx11"
+                    BIN2C "${FILENAME}_dxbc"
                 )
             else()
                 _bn_shaderc_parse(
@@ -215,7 +215,7 @@ function(add_bgfx_shader FILE FOLDER)
                     PROFILE s_5_0
                     O 1
                     OUTPUT ${DX11_OUTPUT}
-                    BIN2C "${FILENAME}_dx11"
+                    BIN2C "${FILENAME}_dxbc"
                 )
             endif()
             list(APPEND OUTPUTS "DX11")

package/shared/BabylonNative/Repo/azure-pipelines.yml

@@ -19,78 +19,90 @@ jobs:
   - template: .github/jobs/macos.yml
     parameters:
       name: MacOS
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
+
+  - template: .github/jobs/macos.yml
+    parameters:
+      name: MacOS_Ninja
+      vmImage: macOS-latest
+      generator: Ninja Multi-Config
 
   - template: .github/jobs/macos.yml
     parameters:
       name: MacOS_Sanitizers
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       enableSanitizers: true
 
   - template: .github/jobs/ios.yml
     parameters:
       name: iOS_iOS180
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       deploymentTarget: 18.0
 
   - template: .github/jobs/ios.yml
     parameters:
       name: iOS_iOS175
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       deploymentTarget: 17.5
 
   # Win32
   - template: .github/jobs/win32.yml
     parameters:
       name: Win32_x64_D3D11
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
 
   - template: .github/jobs/win32.yml
     parameters:
       name: Win32_x64_JSI_D3D11
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
       napiType: jsi
 
   - template: .github/jobs/win32.yml
     parameters:
       name: Win32_x64_V8_D3D11
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
       napiType: V8
 
   - template: .github/jobs/win32.yml
     parameters:
       name: Win32_x64_D3D11_Sanitizers
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
       enableSanitizers: true
 
   - template: .github/jobs/win32.yml
     parameters:
       name: Win32_x64_D3D12
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
       graphics_api: D3D12
 
+  - template: .github/jobs/win32_precompiled_shader_test.yml
+    parameters:
+      name: Win32_x64_D3D11_PrecompiledShaderTest
+      vmImage: windows-latest
+      platform: x64
+
   # UWP
   - template: .github/jobs/uwp.yml
     parameters:
       name: UWP_x64
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: x64
 
   - template: .github/jobs/uwp.yml
     parameters:
       name: UWP_arm64
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: arm64
 
   - template: .github/jobs/uwp.yml
     parameters:
       name: UWP_arm64_JSI
-      vmImage: "windows-latest"
+      vmImage: windows-latest
       platform: arm64
       napiType: jsi
 
@@ -102,7 +114,7 @@ jobs:
   - template: .github/jobs/linux.yml
     parameters:
       name: Ubuntu_Clang_JSC
-      vmImage: "ubuntu-latest"
+      vmImage: ubuntu-latest
       CC: clang
       CXX: clang++
       JSEngine: JavaScriptCore
@@ -110,7 +122,7 @@ jobs:
   - template: .github/jobs/linux.yml
     parameters:
       name: Ubuntu_GCC_JSC
-      vmImage: "ubuntu-latest"
+      vmImage: ubuntu-latest
       CC: gcc
       CXX: g++
       JSEngine: JavaScriptCore
@@ -130,55 +142,55 @@ jobs:
   - template: .github/jobs/android.yml
     parameters:
       name: Android_Ubuntu_JSC
-      vmImage: "ubuntu-latest"
+      vmImage: ubuntu-latest
       JSEngine: JavaScriptCore
 
   - template: .github/jobs/android.yml
     parameters:
       name: Android_Ubuntu_V8
-      vmImage: "ubuntu-latest"
+      vmImage: ubuntu-latest
       JSEngine: V8
 
   - template: .github/jobs/android.yml
     parameters:
       name: Android_MacOS_JSC
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       JSEngine: JavaScriptCore
 
   - template: .github/jobs/android.yml
     parameters:
       name: Android_MacOS_V8
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       JSEngine: V8
 
   # Installation tests
   - template: .github/jobs/test_install_ios.yml
     parameters:
       name: iOS_Installation
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
       deploymentTarget: 17.2
   - template: .github/jobs/test_install_linux.yml
     parameters:
       name: Linux_Installation
-      vmImage: "ubuntu-latest"
+      vmImage: ubuntu-latest
   - template: .github/jobs/test_install_macos.yml
     parameters:
       name: MacOS_Installation
-      vmImage: "macOS-latest"
+      vmImage: macOS-latest
   - template: .github/jobs/test_install_win32.yml
     parameters:
       name: Win32_Installation
-      vmImage: "windows-latest"
+      vmImage: windows-latest
 
 # These Android tests are unstable on the CI emulator. Disabled until a more reliable solution is found.
 #  - template: .github/jobs/android_tests.yml
 #    parameters:
 #      name: Android_Tests_MacOS_JSC
-#      vmImage: 'macOS-latest'
+#      vmImage: macOS-latest
 #      JSEngine: JavaScriptCore
 #
 #  - template: .github/jobs/android_tests.yml
 #    parameters:
 #      name: Android_Tests_MacOS_V8
-#      vmImage: 'macOS-latest'
+#      vmImage: macOS-latest
 #      JSEngine: V8

package/shared/BabylonNative/deps/arcana.cpp-src/CMakeLists.txt

@@ -19,7 +19,7 @@ project(arcana.cpp)
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 FetchContent_MakeAvailable(GSL)
@@ -172,4 +172,20 @@ if(ARCANA_TESTS)
     set_property(TARGET gmock_main PROPERTY FOLDER Dependencies)
     set_property(TARGET gtest PROPERTY FOLDER Dependencies)
     set_property(TARGET gtest_main PROPERTY FOLDER Dependencies)
+
+    if(WIN32)
+        # Standalone executable that uses _CrtDumpMemoryLeaks to verify
+        # cancellation::none() does not leak due to the no_destroy pattern.
+        add_executable(cancellation_leak_test
+            "Source/Windows.Test/Threading/CancellationMemoryLeakTest.cpp")
+
+        target_include_directories(cancellation_leak_test
+            PRIVATE "Source/Shared"
+            PRIVATE "Source/Windows")
+
+        target_link_libraries(cancellation_leak_test
+            PRIVATE arcana)
+
+        add_test(NAME CancellationMemoryLeakTest COMMAND cancellation_leak_test)
+    endif()
 endif()

package/shared/BabylonNative/deps/arcana.cpp-src/README.md

@@ -13,7 +13,7 @@ You can learn more about API usage in the [arcana.cpp documentation](Source/Arca
 ### Prerequisites
 
 - CMake 3.15 or higher
-- A C++17 compatible compiler (Visual Studio 2019+, GCC 8+, or Clang 7+)
+- A C++20 compatible compiler (Visual Studio 2022+, GCC 11+, or Clang 12+)
 
 ### Building with CMake
 

package/shared/BabylonNative/deps/arcana.cpp-src/Source/Shared/arcana/string.h

@@ -5,19 +5,7 @@
 #include <locale>
 #include <string>
 
-#ifdef _MSC_VER
 #include <string_view>
-#else
-// llvm-libc++ included with Android NDK r15c hasn't yet promoted the C++1z library fundamentals
-// technical specification to the final C++17 specification for string_view.
-// Force promote the types we need up into the std namespace.
-#include <experimental/string_view>
-namespace std
-{
-    using string_view = experimental::string_view;
-    using wstring_view = experimental::wstring_view;
-}
-#endif
 
 namespace arcana
 {