From 8e02701116be6cc9520faf45c60a7667747ad61e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 18:10:31 -0700 Subject: [PATCH 01/12] Update packages.json --- .../packages.lock.json | 49 ++++++---- .../packages.lock.json | 49 ++++++---- .../packages.lock.json | 90 ++++++++++++++++--- 3 files changed, 147 insertions(+), 41 deletions(-) diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json index 07a542860f7..af953654219 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json @@ -26,15 +26,6 @@ "NETStandard.Library": "2.0.3" } }, - "Microsoft.UI.Xaml": { - "type": "Direct", - "requested": "[2.8.0, )", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, "MSTest.TestAdapter": { "type": "Direct", "requested": "[2.2.10, )", @@ -53,6 +44,16 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "boost": { + "type": "Transitive", + "resolved": "1.76.0", + "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" + }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.15", + "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -77,22 +78,35 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" + "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, "Microsoft.Web.WebView2": { "type": "Transitive", "resolved": "1.0.1264.42", "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22000.194", + "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", - "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -292,6 +306,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -300,21 +315,25 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.15, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.76.0, )" } }, "microsoft.reactnative.managed": { "type": "Project", "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "[6.2.9, )", - "Microsoft.ReactNative": "[1.0.0, )", - "NETStandard.Library": "[2.0.3, )" + "Microsoft.ReactNative": "[1.0.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.76.0, )" } } }, diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json index 07a542860f7..af953654219 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json @@ -26,15 +26,6 @@ "NETStandard.Library": "2.0.3" } }, - "Microsoft.UI.Xaml": { - "type": "Direct", - "requested": "[2.8.0, )", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, "MSTest.TestAdapter": { "type": "Direct", "requested": "[2.2.10, )", @@ -53,6 +44,16 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, + "boost": { + "type": "Transitive", + "resolved": "1.76.0", + "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" + }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.15", + "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -77,22 +78,35 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" + "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, "Microsoft.Web.WebView2": { "type": "Transitive", "resolved": "1.0.1264.42", "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22000.194", + "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" + }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", - "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -292,6 +306,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -300,21 +315,25 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.15, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.76.0, )" } }, "microsoft.reactnative.managed": { "type": "Project", "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "[6.2.9, )", - "Microsoft.ReactNative": "[1.0.0, )", - "NETStandard.Library": "[2.0.3, )" + "Microsoft.ReactNative": "[1.0.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.76.0, )" } } }, diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index 9dbbec600ce..e4fc0a3a896 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,20 +24,21 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, - "NETStandard.Library": { - "type": "Direct", - "requested": "[2.0.3, )", - "resolved": "2.0.3", - "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } + "boost": { + "type": "Transitive", + "resolved": "1.76.0", + "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, + "Microsoft.JavaScript.Hermes": { + "type": "Transitive", + "resolved": "0.1.15", + "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" + }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -62,13 +63,39 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" + "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" }, + "Microsoft.UI.Xaml": { + "type": "Transitive", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, + "Microsoft.Windows.SDK.BuildTools": { + "type": "Transitive", + "resolved": "10.0.22000.194", + "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" + }, + "NETStandard.Library": { + "type": "Transitive", + "resolved": "2.0.3", + "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, "runtime.win10-arm.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -145,6 +172,7 @@ "folly": { "type": "Project", "dependencies": { + "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -153,13 +181,18 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "ReactCommon": "[1.0.0, )" + "Microsoft.JavaScript.Hermes": "[0.1.15, )", + "Microsoft.UI.Xaml": "[2.8.0, )", + "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", + "ReactCommon": "[1.0.0, )", + "boost": "[1.76.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )" + "Folly": "[1.0.0, )", + "boost": "[1.76.0, )" } } }, @@ -177,6 +210,11 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -197,6 +235,11 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -217,6 +260,11 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -237,6 +285,11 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -257,6 +310,11 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -277,6 +335,11 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -297,6 +360,11 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, + "Microsoft.Web.WebView2": { + "type": "Transitive", + "resolved": "1.0.1264.42", + "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" + }, "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", From 27044e045e69987b4293e69bb36be662a21adfca Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 18:10:59 -0700 Subject: [PATCH 02/12] Define GetHttpTurboModuleName --- .../Base/CoreNativeModules.cpp | 29 ++++++++++--------- vnext/Shared/CreateModules.h | 26 ++++++++++++----- vnext/Shared/Modules/HttpModule.cpp | 5 ++++ 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp index e7cdc886edb..3893a54a504 100644 --- a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp +++ b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp @@ -23,20 +23,21 @@ std::vector GetCoreModules( Mso::CntPtr &&context) noexcept { std::vector modules; - modules.emplace_back( - "Networking", - [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); }, - jsMessageQueue); - - modules.emplace_back( - Microsoft::React::GetBlobModuleName(), - [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); }, - batchingUIMessageQueue); - - modules.emplace_back( - Microsoft::React::GetFileReaderModuleName(), - [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); }, - batchingUIMessageQueue); + //TODO: Remove + //modules.emplace_back( + // "Networking", + // [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); }, + // jsMessageQueue); + + //modules.emplace_back( + // Microsoft::React::GetBlobModuleName(), + // [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); }, + // batchingUIMessageQueue); + + //modules.emplace_back( + // Microsoft::React::GetFileReaderModuleName(), + // [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); }, + // batchingUIMessageQueue); return modules; } diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index 535f26e0273..071b6fb902d 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -34,20 +34,30 @@ extern std::unique_ptr CreateTimingModule( namespace Microsoft::React { -extern const char *GetHttpModuleName() noexcept; +#pragma region CxxModules + +extern const char* GetHttpModuleName() noexcept; extern std::unique_ptr CreateHttpModule( - winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; -extern const char *GetWebSocketModuleName() noexcept; +extern const char* GetWebSocketModuleName() noexcept; extern std::unique_ptr CreateWebSocketModule( - winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; -extern const char *GetBlobModuleName() noexcept; +extern const char* GetBlobModuleName() noexcept; extern std::unique_ptr CreateBlobModule( - winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; -extern const char *GetFileReaderModuleName() noexcept; +extern const char* GetFileReaderModuleName() noexcept; extern std::unique_ptr CreateFileReaderModule( - winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; + +#pragma endregion CxxModules + +#pragma region TurboModules + +extern const wchar_t* GetHttpTurboModuleName() noexcept; + +#pragma endregion TurboModules } // namespace Microsoft::React diff --git a/vnext/Shared/Modules/HttpModule.cpp b/vnext/Shared/Modules/HttpModule.cpp index cab864e3d33..5da0702db69 100644 --- a/vnext/Shared/Modules/HttpModule.cpp +++ b/vnext/Shared/Modules/HttpModule.cpp @@ -32,6 +32,7 @@ using Microsoft::React::Modules::SendEvent; using Microsoft::React::Networking::IHttpResource; constexpr char s_moduleName[] = "Networking"; +constexpr wchar_t s_moduleNameW[] = L"Networking"; // React event names constexpr char completedResponse[] = "didCompleteNetworkResponse"; @@ -327,4 +328,8 @@ std::vector HttpModule::getMethods() return s_moduleName; } +/*extern*/ const wchar_t* GetHttpTurboModuleName() noexcept { + return s_moduleNameW; +} + } // namespace Microsoft::React From 872852f179b4f82918aa02eec530a4753ccc27e0 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 18:28:57 -0700 Subject: [PATCH 03/12] Update packages.json --- .../packages.lock.json | 42 +++-------- .../packages.lock.json | 42 +++-------- .../packages.lock.json | 73 +------------------ 3 files changed, 24 insertions(+), 133 deletions(-) diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json index af953654219..bdf7eafba25 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json @@ -26,6 +26,15 @@ "NETStandard.Library": "2.0.3" } }, + "Microsoft.UI.Xaml": { + "type": "Direct", + "requested": "[2.8.0, )", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, "MSTest.TestAdapter": { "type": "Direct", "requested": "[2.2.10, )", @@ -44,16 +53,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "boost": { - "type": "Transitive", - "resolved": "1.76.0", - "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" - }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.15", - "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -85,24 +84,11 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, "Microsoft.Web.WebView2": { "type": "Transitive", "resolved": "1.0.1264.42", "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22000.194", - "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -306,7 +292,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -315,11 +300,7 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.15, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.76.0, )" + "ReactCommon": "[1.0.0, )" } }, "microsoft.reactnative.managed": { @@ -332,8 +313,7 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.76.0, )" + "Folly": "[1.0.0, )" } } }, diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json index af953654219..bdf7eafba25 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json @@ -26,6 +26,15 @@ "NETStandard.Library": "2.0.3" } }, + "Microsoft.UI.Xaml": { + "type": "Direct", + "requested": "[2.8.0, )", + "resolved": "2.8.0", + "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", + "dependencies": { + "Microsoft.Web.WebView2": "1.0.1264.42" + } + }, "MSTest.TestAdapter": { "type": "Direct", "requested": "[2.2.10, )", @@ -44,16 +53,6 @@ "resolved": "13.0.1", "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" }, - "boost": { - "type": "Transitive", - "resolved": "1.76.0", - "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" - }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.15", - "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -85,24 +84,11 @@ "resolved": "1.0.1", "contentHash": "rkn+fKobF/cbWfnnfBOQHKVKIOpxMZBvlSHkqDWgBpwGDcLRduvs3D9OLGeV6GWGvVwNlVi2CBbTjuPmtHvyNw==" }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, "Microsoft.Web.WebView2": { "type": "Transitive", "resolved": "1.0.1264.42", "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22000.194", - "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -306,7 +292,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -315,11 +300,7 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.15, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.76.0, )" + "ReactCommon": "[1.0.0, )" } }, "microsoft.reactnative.managed": { @@ -332,8 +313,7 @@ "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.76.0, )" + "Folly": "[1.0.0, )" } } }, diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index e4fc0a3a896..e0306df356f 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,21 +24,11 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, - "boost": { - "type": "Transitive", - "resolved": "1.76.0", - "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA==" - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", "contentHash": "z2fpmmt+1Jfl+ZnBki9nSP08S1/tbEOxFdsK1rSR+LBehIJz1Xv9/6qOOoGNqlwnAGGVGis1Oj6S8Kt9COEYlQ==" }, - "Microsoft.JavaScript.Hermes": { - "type": "Transitive", - "resolved": "0.1.15", - "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ==" - }, "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00", @@ -70,24 +60,6 @@ "resolved": "1.0.0", "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" }, - "Microsoft.UI.Xaml": { - "type": "Transitive", - "resolved": "2.8.0", - "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==", - "dependencies": { - "Microsoft.Web.WebView2": "1.0.1264.42" - } - }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, - "Microsoft.Windows.SDK.BuildTools": { - "type": "Transitive", - "resolved": "10.0.22000.194", - "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg==" - }, "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", @@ -172,7 +144,6 @@ "folly": { "type": "Project", "dependencies": { - "boost": "[1.76.0, )", "fmt": "[1.0.0, )" } }, @@ -181,18 +152,13 @@ "dependencies": { "Common": "[1.0.0, )", "Folly": "[1.0.0, )", - "Microsoft.JavaScript.Hermes": "[0.1.15, )", - "Microsoft.UI.Xaml": "[2.8.0, )", - "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )", - "ReactCommon": "[1.0.0, )", - "boost": "[1.76.0, )" + "ReactCommon": "[1.0.0, )" } }, "reactcommon": { "type": "Project", "dependencies": { - "Folly": "[1.0.0, )", - "boost": "[1.76.0, )" + "Folly": "[1.0.0, )" } } }, @@ -210,11 +176,6 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -235,11 +196,6 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -260,11 +216,6 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -285,11 +236,6 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -310,11 +256,6 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -335,11 +276,6 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", @@ -360,11 +296,6 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": "6.2.9" } }, - "Microsoft.Web.WebView2": { - "type": "Transitive", - "resolved": "1.0.1264.42", - "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA==" - }, "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.9", From 3332db5eb260c1e394dc85173372a0dc54521598 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 19:09:52 -0700 Subject: [PATCH 04/12] Define GetHttpModuleProvider --- .../Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp | 9 +++++++-- vnext/Shared/CreateModules.h | 7 +++++++ vnext/Shared/Modules/HttpModule.cpp | 6 ++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp index 5a80b6c3bc2..820e3d14918 100644 --- a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +++ b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp @@ -6,7 +6,7 @@ #include "MsoUtils.h" #include -#include +#include //TODO: Remove #include #include #include @@ -30,7 +30,6 @@ #include #include #include -#include #include #include "DynamicWriter.h" #ifndef CORE_ABI @@ -86,6 +85,7 @@ #include #include "ChakraRuntimeHolder.h" +#include #include #include "CrashManager.h" #include "JsiApi.h" @@ -392,6 +392,11 @@ void ReactInstanceWin::LoadModules( registerTurboModule( L"Timing", winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::Timing>()); #endif + + registerTurboModule( + ::Microsoft::React::GetHttpTurboModuleName(), + ::Microsoft::React::GetHttpModuleProvider() + ); } //! Initialize() is called from the native queue. diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index 071b6fb902d..552f78d8197 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -14,6 +14,12 @@ #include // Forward declarations. Desktop projects can not access +namespace winrt::Microsoft::ReactNative +{ + //struct ReactContext; + //struct ReactModuleProvider; +} + namespace Mso::React { struct IReactContext; } @@ -57,6 +63,7 @@ extern std::unique_ptr CreateFileReaderModul #pragma region TurboModules extern const wchar_t* GetHttpTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetHttpModuleProvider() noexcept; #pragma endregion TurboModules diff --git a/vnext/Shared/Modules/HttpModule.cpp b/vnext/Shared/Modules/HttpModule.cpp index 5da0702db69..ac453f620e7 100644 --- a/vnext/Shared/Modules/HttpModule.cpp +++ b/vnext/Shared/Modules/HttpModule.cpp @@ -49,6 +49,8 @@ constexpr wchar_t receivedIncrementalDataW[] = L"didReceiveNetworkIncrementalDat constexpr wchar_t receivedDataProgressW[] = L"didReceiveNetworkDataProgress"; constexpr wchar_t receivedDataW[] = L"didReceiveNetworkData"; +msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider(); + static void SetUpHttpResource( shared_ptr resource, weak_ptr weakReactInstance, @@ -332,4 +334,8 @@ std::vector HttpModule::getMethods() return s_moduleNameW; } +/*extern*/ const msrn::ReactModuleProvider& GetHttpModuleProvider() noexcept { + return s_moduleProvider; +} + } // namespace Microsoft::React From d973539f053e72588b887c7a2fbb34108230f6c7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 19:27:04 -0700 Subject: [PATCH 05/12] Define other netwk modules provider methods --- vnext/Shared/CreateModules.h | 9 +++++++++ vnext/Shared/Modules/BlobModule.cpp | 15 ++++++++++++++- vnext/Shared/Modules/FileReaderModule.cpp | 12 ++++++++++++ vnext/Shared/Modules/HttpModule.cpp | 1 + vnext/Shared/Modules/WebSocketModule.cpp | 12 ++++++++++++ 5 files changed, 48 insertions(+), 1 deletion(-) diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index 552f78d8197..bfba1d2eac8 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -62,9 +62,18 @@ extern std::unique_ptr CreateFileReaderModul #pragma region TurboModules +extern const wchar_t* GetBlobTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetBlobModuleProvider() noexcept; + extern const wchar_t* GetHttpTurboModuleName() noexcept; extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetHttpModuleProvider() noexcept; +extern const wchar_t* GetFileReaderTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetFileReaderModuleProvider() noexcept; + +extern const wchar_t* GetWebSocketTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetWebSocketModuleProvider() noexcept; + #pragma endregion TurboModules } // namespace Microsoft::React diff --git a/vnext/Shared/Modules/BlobModule.cpp b/vnext/Shared/Modules/BlobModule.cpp index d76a462c670..b5038d9a421 100644 --- a/vnext/Shared/Modules/BlobModule.cpp +++ b/vnext/Shared/Modules/BlobModule.cpp @@ -4,6 +4,7 @@ #include "BlobModule.h" #include +#include // React Native #include @@ -19,9 +20,13 @@ using winrt::Windows::Foundation::IInspectable; namespace msrn = winrt::Microsoft::ReactNative; namespace { -constexpr char s_moduleName[] = "BlobModule"; + constexpr char s_moduleName[] = "BlobModule"; + constexpr wchar_t s_moduleNameW[] = L"BlobModule"; const auto &blobKeys = IBlobResource::FieldNames(); + +msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider(); + } // namespace namespace Microsoft::React { @@ -156,4 +161,12 @@ vector BlobModule::getMethods() { return nullptr; } +/*extern*/ const wchar_t* GetBlobTurboModuleName() noexcept { + return s_moduleNameW; +} + +/*extern*/ const msrn::ReactModuleProvider& GetBlobModuleProvider() noexcept { + return s_moduleProvider; +} + } // namespace Microsoft::React diff --git a/vnext/Shared/Modules/FileReaderModule.cpp b/vnext/Shared/Modules/FileReaderModule.cpp index 19a2910be34..d9d46308e5d 100644 --- a/vnext/Shared/Modules/FileReaderModule.cpp +++ b/vnext/Shared/Modules/FileReaderModule.cpp @@ -3,6 +3,7 @@ #include "FileReaderModule.h" +#include #include #include @@ -28,6 +29,9 @@ using winrt::Windows::Foundation::IInspectable; namespace { constexpr char s_moduleName[] = "FileReaderModule"; +constexpr wchar_t s_moduleNameW[] = L"FileReaderModule"; + +msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider(); } // namespace namespace Microsoft::React { @@ -198,4 +202,12 @@ void FileReaderTurboModule::ReadAsText( return nullptr; } +/*extern*/ const wchar_t* GetFileReaderTurboModuleName() noexcept { + return s_moduleNameW; +} + +/*extern*/ const msrn::ReactModuleProvider& GetFileReaderModuleProvider() noexcept { + return s_moduleProvider; +} + } // namespace Microsoft::React diff --git a/vnext/Shared/Modules/HttpModule.cpp b/vnext/Shared/Modules/HttpModule.cpp index ac453f620e7..ecfe12fd74a 100644 --- a/vnext/Shared/Modules/HttpModule.cpp +++ b/vnext/Shared/Modules/HttpModule.cpp @@ -6,6 +6,7 @@ #include "HttpModule.h" #include +#include #include // React Native diff --git a/vnext/Shared/Modules/WebSocketModule.cpp b/vnext/Shared/Modules/WebSocketModule.cpp index f53b62e5321..2b5724a5fb3 100644 --- a/vnext/Shared/Modules/WebSocketModule.cpp +++ b/vnext/Shared/Modules/WebSocketModule.cpp @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -50,6 +51,9 @@ using Microsoft::React::Modules::SendEvent; using Microsoft::React::Networking::IWebSocketResource; constexpr char s_moduleName[] = "WebSocketModule"; +constexpr wchar_t s_moduleNameW[] = L"WebSocketModule"; + +msrn::ReactModuleProvider s_moduleProvider = msrn::MakeTurboModuleProvider(); static shared_ptr GetOrCreateWebSocket(int64_t id, string &&url, weak_ptr weakState) { @@ -495,4 +499,12 @@ void WebSocketTurboModule::RemoveListeners(double /*count*/) noexcept {} return nullptr; } +/*extern*/ const wchar_t* GetWebSocketTurboModuleName() noexcept { + return s_moduleNameW; +} + +/*extern*/ const msrn::ReactModuleProvider& GetWebSocketModuleProvider() noexcept { + return s_moduleProvider; +} + } // namespace Microsoft::React From 697075596ad0020d46f5024aa368c62621a94e84 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 19:32:33 -0700 Subject: [PATCH 06/12] Register networking turbomodules --- .../ReactHost/ReactInstanceWin.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp index 820e3d14918..04c7b91c124 100644 --- a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +++ b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp @@ -393,10 +393,25 @@ void ReactInstanceWin::LoadModules( L"Timing", winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::Timing>()); #endif + registerTurboModule( + ::Microsoft::React::GetBlobTurboModuleName(), + ::Microsoft::React::GetBlobModuleProvider() + ); + registerTurboModule( ::Microsoft::React::GetHttpTurboModuleName(), ::Microsoft::React::GetHttpModuleProvider() ); + + registerTurboModule( + ::Microsoft::React::GetFileReaderTurboModuleName(), + ::Microsoft::React::GetFileReaderModuleProvider() + ); + + registerTurboModule( + ::Microsoft::React::GetWebSocketTurboModuleName(), + ::Microsoft::React::GetWebSocketModuleProvider() + ); } //! Initialize() is called from the native queue. From 074244d43b7c5acff783d1885f1eccc45c9a35cd Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 19:33:37 -0700 Subject: [PATCH 07/12] Change files --- ...ative-windows-2d37aae0-3bb6-4f89-8428-11cefbabf3b5.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 change/react-native-windows-2d37aae0-3bb6-4f89-8428-11cefbabf3b5.json diff --git a/change/react-native-windows-2d37aae0-3bb6-4f89-8428-11cefbabf3b5.json b/change/react-native-windows-2d37aae0-3bb6-4f89-8428-11cefbabf3b5.json new file mode 100644 index 00000000000..84f9578f0f5 --- /dev/null +++ b/change/react-native-windows-2d37aae0-3bb6-4f89-8428-11cefbabf3b5.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Use TurboModules for networking in MSRN", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch" +} From f5b61f340b848b23ccec380a0086020a0703294d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 19:34:44 -0700 Subject: [PATCH 08/12] clang format --- .../Base/CoreNativeModules.cpp | 30 +++++++------- .../ReactHost/ReactInstanceWin.cpp | 20 +++------- vnext/Shared/CreateModules.h | 39 +++++++++---------- vnext/Shared/Modules/BlobModule.cpp | 10 ++--- vnext/Shared/Modules/FileReaderModule.cpp | 4 +- vnext/Shared/Modules/HttpModule.cpp | 6 +-- vnext/Shared/Modules/WebSocketModule.cpp | 4 +- 7 files changed, 51 insertions(+), 62 deletions(-) diff --git a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp index 3893a54a504..3583572329c 100644 --- a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp +++ b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp @@ -23,21 +23,21 @@ std::vector GetCoreModules( Mso::CntPtr &&context) noexcept { std::vector modules; - //TODO: Remove - //modules.emplace_back( - // "Networking", - // [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); }, - // jsMessageQueue); - - //modules.emplace_back( - // Microsoft::React::GetBlobModuleName(), - // [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); }, - // batchingUIMessageQueue); - - //modules.emplace_back( - // Microsoft::React::GetFileReaderModuleName(), - // [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); }, - // batchingUIMessageQueue); + // TODO: Remove + // modules.emplace_back( + // "Networking", + // [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); }, + // jsMessageQueue); + + // modules.emplace_back( + // Microsoft::React::GetBlobModuleName(), + // [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); }, + // batchingUIMessageQueue); + + // modules.emplace_back( + // Microsoft::React::GetFileReaderModuleName(), + // [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); }, + // batchingUIMessageQueue); return modules; } diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp index 04c7b91c124..534d22d4615 100644 --- a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +++ b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp @@ -6,7 +6,7 @@ #include "MsoUtils.h" #include -#include //TODO: Remove +#include //TODO: Remove #include #include #include @@ -393,25 +393,15 @@ void ReactInstanceWin::LoadModules( L"Timing", winrt::Microsoft::ReactNative::MakeTurboModuleProvider<::Microsoft::ReactNative::Timing>()); #endif - registerTurboModule( - ::Microsoft::React::GetBlobTurboModuleName(), - ::Microsoft::React::GetBlobModuleProvider() - ); + registerTurboModule(::Microsoft::React::GetBlobTurboModuleName(), ::Microsoft::React::GetBlobModuleProvider()); - registerTurboModule( - ::Microsoft::React::GetHttpTurboModuleName(), - ::Microsoft::React::GetHttpModuleProvider() - ); + registerTurboModule(::Microsoft::React::GetHttpTurboModuleName(), ::Microsoft::React::GetHttpModuleProvider()); registerTurboModule( - ::Microsoft::React::GetFileReaderTurboModuleName(), - ::Microsoft::React::GetFileReaderModuleProvider() - ); + ::Microsoft::React::GetFileReaderTurboModuleName(), ::Microsoft::React::GetFileReaderModuleProvider()); registerTurboModule( - ::Microsoft::React::GetWebSocketTurboModuleName(), - ::Microsoft::React::GetWebSocketModuleProvider() - ); + ::Microsoft::React::GetWebSocketTurboModuleName(), ::Microsoft::React::GetWebSocketModuleProvider()); } //! Initialize() is called from the native queue. diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index bfba1d2eac8..91aef79ed46 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -14,10 +14,9 @@ #include // Forward declarations. Desktop projects can not access -namespace winrt::Microsoft::ReactNative -{ - //struct ReactContext; - //struct ReactModuleProvider; +namespace winrt::Microsoft::ReactNative { +// struct ReactContext; +// struct ReactModuleProvider; } namespace Mso::React { @@ -42,37 +41,37 @@ namespace Microsoft::React { #pragma region CxxModules -extern const char* GetHttpModuleName() noexcept; +extern const char *GetHttpModuleName() noexcept; extern std::unique_ptr CreateHttpModule( - winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; -extern const char* GetWebSocketModuleName() noexcept; +extern const char *GetWebSocketModuleName() noexcept; extern std::unique_ptr CreateWebSocketModule( - winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; -extern const char* GetBlobModuleName() noexcept; +extern const char *GetBlobModuleName() noexcept; extern std::unique_ptr CreateBlobModule( - winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; -extern const char* GetFileReaderModuleName() noexcept; +extern const char *GetFileReaderModuleName() noexcept; extern std::unique_ptr CreateFileReaderModule( - winrt::Windows::Foundation::IInspectable const& inspectableProperties) noexcept; + winrt::Windows::Foundation::IInspectable const &inspectableProperties) noexcept; #pragma endregion CxxModules #pragma region TurboModules -extern const wchar_t* GetBlobTurboModuleName() noexcept; -extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetBlobModuleProvider() noexcept; +extern const wchar_t *GetBlobTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetBlobModuleProvider() noexcept; -extern const wchar_t* GetHttpTurboModuleName() noexcept; -extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetHttpModuleProvider() noexcept; +extern const wchar_t *GetHttpTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetHttpModuleProvider() noexcept; -extern const wchar_t* GetFileReaderTurboModuleName() noexcept; -extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetFileReaderModuleProvider() noexcept; +extern const wchar_t *GetFileReaderTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetFileReaderModuleProvider() noexcept; -extern const wchar_t* GetWebSocketTurboModuleName() noexcept; -extern const winrt::Microsoft::ReactNative::ReactModuleProvider& GetWebSocketModuleProvider() noexcept; +extern const wchar_t *GetWebSocketTurboModuleName() noexcept; +extern const winrt::Microsoft::ReactNative::ReactModuleProvider &GetWebSocketModuleProvider() noexcept; #pragma endregion TurboModules diff --git a/vnext/Shared/Modules/BlobModule.cpp b/vnext/Shared/Modules/BlobModule.cpp index b5038d9a421..4750d3e58a1 100644 --- a/vnext/Shared/Modules/BlobModule.cpp +++ b/vnext/Shared/Modules/BlobModule.cpp @@ -3,8 +3,8 @@ #include "BlobModule.h" -#include #include +#include // React Native #include @@ -20,8 +20,8 @@ using winrt::Windows::Foundation::IInspectable; namespace msrn = winrt::Microsoft::ReactNative; namespace { - constexpr char s_moduleName[] = "BlobModule"; - constexpr wchar_t s_moduleNameW[] = L"BlobModule"; +constexpr char s_moduleName[] = "BlobModule"; +constexpr wchar_t s_moduleNameW[] = L"BlobModule"; const auto &blobKeys = IBlobResource::FieldNames(); @@ -161,11 +161,11 @@ vector BlobModule::getMethods() { return nullptr; } -/*extern*/ const wchar_t* GetBlobTurboModuleName() noexcept { +/*extern*/ const wchar_t *GetBlobTurboModuleName() noexcept { return s_moduleNameW; } -/*extern*/ const msrn::ReactModuleProvider& GetBlobModuleProvider() noexcept { +/*extern*/ const msrn::ReactModuleProvider &GetBlobModuleProvider() noexcept { return s_moduleProvider; } diff --git a/vnext/Shared/Modules/FileReaderModule.cpp b/vnext/Shared/Modules/FileReaderModule.cpp index d9d46308e5d..09db7bdd4fd 100644 --- a/vnext/Shared/Modules/FileReaderModule.cpp +++ b/vnext/Shared/Modules/FileReaderModule.cpp @@ -202,11 +202,11 @@ void FileReaderTurboModule::ReadAsText( return nullptr; } -/*extern*/ const wchar_t* GetFileReaderTurboModuleName() noexcept { +/*extern*/ const wchar_t *GetFileReaderTurboModuleName() noexcept { return s_moduleNameW; } -/*extern*/ const msrn::ReactModuleProvider& GetFileReaderModuleProvider() noexcept { +/*extern*/ const msrn::ReactModuleProvider &GetFileReaderModuleProvider() noexcept { return s_moduleProvider; } diff --git a/vnext/Shared/Modules/HttpModule.cpp b/vnext/Shared/Modules/HttpModule.cpp index ecfe12fd74a..f3941b31e40 100644 --- a/vnext/Shared/Modules/HttpModule.cpp +++ b/vnext/Shared/Modules/HttpModule.cpp @@ -5,8 +5,8 @@ #include "HttpModule.h" -#include #include +#include #include // React Native @@ -331,11 +331,11 @@ std::vector HttpModule::getMethods() return s_moduleName; } -/*extern*/ const wchar_t* GetHttpTurboModuleName() noexcept { +/*extern*/ const wchar_t *GetHttpTurboModuleName() noexcept { return s_moduleNameW; } -/*extern*/ const msrn::ReactModuleProvider& GetHttpModuleProvider() noexcept { +/*extern*/ const msrn::ReactModuleProvider &GetHttpModuleProvider() noexcept { return s_moduleProvider; } diff --git a/vnext/Shared/Modules/WebSocketModule.cpp b/vnext/Shared/Modules/WebSocketModule.cpp index 2b5724a5fb3..5d572d84e46 100644 --- a/vnext/Shared/Modules/WebSocketModule.cpp +++ b/vnext/Shared/Modules/WebSocketModule.cpp @@ -499,11 +499,11 @@ void WebSocketTurboModule::RemoveListeners(double /*count*/) noexcept {} return nullptr; } -/*extern*/ const wchar_t* GetWebSocketTurboModuleName() noexcept { +/*extern*/ const wchar_t *GetWebSocketTurboModuleName() noexcept { return s_moduleNameW; } -/*extern*/ const msrn::ReactModuleProvider& GetWebSocketModuleProvider() noexcept { +/*extern*/ const msrn::ReactModuleProvider &GetWebSocketModuleProvider() noexcept { return s_moduleProvider; } From 7447e5eed7622f44b26c75083d70534a4e41a41c Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 22:31:42 -0700 Subject: [PATCH 09/12] Uncomment MSRN forward declarations --- vnext/Shared/CreateModules.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index 91aef79ed46..df52c74c479 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -15,16 +15,15 @@ // Forward declarations. Desktop projects can not access namespace winrt::Microsoft::ReactNative { -// struct ReactContext; -// struct ReactModuleProvider; + struct ReactContext; + struct ReactModuleProvider; } namespace Mso::React { struct IReactContext; } -namespace facebook { -namespace react { +namespace facebook::react { class MessageQueueThread; @@ -34,8 +33,7 @@ class MessageQueueThread; extern std::unique_ptr CreateTimingModule( const std::shared_ptr &nativeThread) noexcept; -} // namespace react -} // namespace facebook +} // namespace facebook::react namespace Microsoft::React { From 6c40591b850f095fae03cdaf7babb815799105b1 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 10 Jul 2023 22:37:21 -0700 Subject: [PATCH 10/12] Remove cntPtr.h include --- vnext/Shared/CreateModules.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/vnext/Shared/CreateModules.h b/vnext/Shared/CreateModules.h index df52c74c479..2bc4ed8abfe 100644 --- a/vnext/Shared/CreateModules.h +++ b/vnext/Shared/CreateModules.h @@ -5,7 +5,6 @@ // React Native #include -#include // Windows API #include @@ -15,9 +14,9 @@ // Forward declarations. Desktop projects can not access namespace winrt::Microsoft::ReactNative { - struct ReactContext; - struct ReactModuleProvider; -} +struct ReactContext; +struct ReactModuleProvider; +} // namespace winrt::Microsoft::ReactNative namespace Mso::React { struct IReactContext; From aee1637ef054b7940470ac93ef1aa8f097165ab3 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 11 Jul 2023 13:37:03 -0700 Subject: [PATCH 11/12] Remove CoreNativeModules --- .../Base/CoreNativeModules.cpp | 45 ------------------- .../Base/CoreNativeModules.h | 30 ------------- .../Microsoft.ReactNative.vcxproj | 4 +- .../Microsoft.ReactNative.vcxproj.filters | 7 --- .../ReactHost/ReactInstanceWin.cpp | 9 ---- 5 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp delete mode 100644 vnext/Microsoft.ReactNative/Base/CoreNativeModules.h diff --git a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp deleted file mode 100644 index 3583572329c..00000000000 --- a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -#include "pch.h" -#include "CoreNativeModules.h" - -// Modules -#include -#include -#include -#include -#include - -// Shared -#include - -namespace Microsoft::ReactNative { - -std::vector GetCoreModules( - const std::shared_ptr &batchingUIMessageQueue, - const std::shared_ptr - &jsMessageQueue, // JS engine thread (what we use for external modules) - Mso::CntPtr &&context) noexcept { - std::vector modules; - - // TODO: Remove - // modules.emplace_back( - // "Networking", - // [props = context->Properties()]() { return Microsoft::React::CreateHttpModule(props); }, - // jsMessageQueue); - - // modules.emplace_back( - // Microsoft::React::GetBlobModuleName(), - // [props = context->Properties()]() { return Microsoft::React::CreateBlobModule(props); }, - // batchingUIMessageQueue); - - // modules.emplace_back( - // Microsoft::React::GetFileReaderModuleName(), - // [props = context->Properties()]() { return Microsoft::React::CreateFileReaderModule(props); }, - // batchingUIMessageQueue); - - return modules; -} - -} // namespace Microsoft::ReactNative diff --git a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.h b/vnext/Microsoft.ReactNative/Base/CoreNativeModules.h deleted file mode 100644 index 19533574515..00000000000 --- a/vnext/Microsoft.ReactNative/Base/CoreNativeModules.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -#pragma once - -#include -#include -#include -#include -#include - -namespace facebook::react { -class AppState; -struct DevSettings; -class IUIManager; -class MessageQueueThread; -} // namespace facebook::react - -namespace Microsoft::ReactNative { - -struct DeviceInfo; -struct IReactInstance; -struct ViewManagerProvider; - -std::vector GetCoreModules( - const std::shared_ptr &batchingUIMessageQueue, - const std::shared_ptr &jsMessageQueue, - Mso::CntPtr &&context) noexcept; - -} // namespace Microsoft::ReactNative diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index f42ba04b5d0..8ed10fc993b 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -185,7 +185,6 @@ - @@ -421,7 +420,6 @@ - CoreAppPage.xaml @@ -679,4 +677,4 @@ - + \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters index 02e9b6b23f3..f6e44c0e498 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters @@ -15,9 +15,6 @@ - - Base - Base @@ -357,9 +354,6 @@ - - Base - Modules @@ -632,7 +626,6 @@ Views - diff --git a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp index 534d22d4615..ab038acd916 100644 --- a/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp +++ b/vnext/Microsoft.ReactNative/ReactHost/ReactInstanceWin.cpp @@ -6,7 +6,6 @@ #include "MsoUtils.h" #include -#include //TODO: Remove #include #include #include @@ -469,15 +468,7 @@ void ReactInstanceWin::Initialize() noexcept { } }; -#ifdef CORE_ABI std::vector cxxModules; -#else - // Acquire default modules and then populate with custom modules. - // Note that some of these have custom thread affinity. - std::vector cxxModules = - Microsoft::ReactNative::GetCoreModules(m_batchingUIThread, m_jsMessageThread.Load(), m_reactContext); -#endif - auto nmp = std::make_shared(); LoadModules(nmp, m_options.TurboModuleProvider); From 183f5b0df29ac421f840f805ddda868a1efc7cb5 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 11 Jul 2023 15:15:36 -0700 Subject: [PATCH 12/12] Revert packages.lock.json --- .../packages.lock.json | 7 ++++--- .../packages.lock.json | 7 ++++--- .../packages.lock.json | 19 ++++++++++--------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json index bdf7eafba25..07a542860f7 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/packages.lock.json @@ -77,7 +77,7 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -92,7 +92,7 @@ "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", - "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -307,7 +307,8 @@ "type": "Project", "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "[6.2.9, )", - "Microsoft.ReactNative": "[1.0.0, )" + "Microsoft.ReactNative": "[1.0.0, )", + "NETStandard.Library": "[2.0.3, )" } }, "reactcommon": { diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json index bdf7eafba25..07a542860f7 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/packages.lock.json @@ -77,7 +77,7 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -92,7 +92,7 @@ "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", - "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -307,7 +307,8 @@ "type": "Project", "dependencies": { "Microsoft.NETCore.UniversalWindowsPlatform": "[6.2.9, )", - "Microsoft.ReactNative": "[1.0.0, )" + "Microsoft.ReactNative": "[1.0.0, )", + "NETStandard.Library": "[2.0.3, )" } }, "reactcommon": { diff --git a/vnext/Microsoft.ReactNative.Managed/packages.lock.json b/vnext/Microsoft.ReactNative.Managed/packages.lock.json index e0306df356f..9dbbec600ce 100644 --- a/vnext/Microsoft.ReactNative.Managed/packages.lock.json +++ b/vnext/Microsoft.ReactNative.Managed/packages.lock.json @@ -24,6 +24,15 @@ "Microsoft.SourceLink.Common": "1.0.0" } }, + "NETStandard.Library": { + "type": "Direct", + "requested": "[2.0.3, )", + "resolved": "2.0.3", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0" + } + }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.0.0", @@ -53,21 +62,13 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", "resolved": "1.0.0", "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg==" }, - "NETStandard.Library": { - "type": "Transitive", - "resolved": "2.0.3", - "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, "runtime.win10-arm.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.7-rel-27913-00",