From b6693886011c66edf667c6c8f974dc9408886a03 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 25 May 2020 20:32:58 -0700 Subject: [PATCH 01/38] Use Microsoft.React root namespace in Desktop lib --- vnext/Desktop.ABITests/ActivationFactory.cpp | 2 +- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 2 +- vnext/Desktop.ABITests/MessageQueueShim.h | 2 +- vnext/Desktop.ABITests/NativeLogEventTests.cpp | 2 +- vnext/Desktop.ABITests/NativeTraceEventTests.cpp | 2 +- vnext/Desktop.ABITests/PerfTests.cpp | 2 +- .../Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj | 4 ++-- vnext/Desktop/ABI/MemoryTracker.idl | 2 +- vnext/Desktop/ABI/MessageQueue.idl | 2 +- vnext/Desktop/ABI/MessageQueueShim.h | 2 +- vnext/Desktop/ABI/NativeLogEventSource.cpp | 2 +- vnext/Desktop/ABI/NativeLogEventSource.h | 2 +- vnext/Desktop/ABI/NativeLogging.idl | 2 +- vnext/Desktop/ABI/NativeTraceEventSource.cpp | 2 +- vnext/Desktop/ABI/NativeTraceEventSource.h | 2 +- vnext/Desktop/ABI/NativeTracing.idl | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 2 +- vnext/Desktop/module.g.cpp | 6 +++--- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/vnext/Desktop.ABITests/ActivationFactory.cpp b/vnext/Desktop.ABITests/ActivationFactory.cpp index 19915c7e683..2ef5dc5bad4 100644 --- a/vnext/Desktop.ABITests/ActivationFactory.cpp +++ b/vnext/Desktop.ABITests/ActivationFactory.cpp @@ -26,7 +26,7 @@ int32_t __stdcall WINRT_RoGetActivationFactory(void *classId, guid const &iid, v std::wstring_view const name{*reinterpret_cast(&classId)}; HMODULE library{nullptr}; - if (starts_with(name, L"facebook.react.") || starts_with(name, L"Microsoft.React")) { + if (starts_with(name, L"Microsoft.React")) { library = LoadLibraryExW(RNDLLPATH, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS); } else { return OS_RoGetActivationFactory(classId, iid, factory); diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index 79ad888716c..40f40688a9f 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include #include "ActivationFactory.h" #include "MessageQueueShim.h" diff --git a/vnext/Desktop.ABITests/MessageQueueShim.h b/vnext/Desktop.ABITests/MessageQueueShim.h index aef71cdf330..4ae89ad7700 100644 --- a/vnext/Desktop.ABITests/MessageQueueShim.h +++ b/vnext/Desktop.ABITests/MessageQueueShim.h @@ -4,7 +4,7 @@ #pragma once #include -#include +#include namespace ABITests { class MessageQueueShim : public winrt::implements { diff --git a/vnext/Desktop.ABITests/NativeLogEventTests.cpp b/vnext/Desktop.ABITests/NativeLogEventTests.cpp index 859b84dca56..8832b06c7fe 100644 --- a/vnext/Desktop.ABITests/NativeLogEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeLogEventTests.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include -#include +#include #include #include "ActivationFactory.h" diff --git a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp index 16348920fa3..2616a8f62e5 100644 --- a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include -#include +#include #include #include #include "ActivationFactory.h" diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index ae832383725..d9356d8b714 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -3,7 +3,7 @@ #include "pch.h" #include -#include +#include #include diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj index 76ea394ffbf..425db1874ad 100644 --- a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj +++ b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj @@ -100,8 +100,8 @@ 'GetTargetFileName' MSBuild task in the 'GetRNDllPath' target below (and potentially share build logic with it). --> - - $(OutputPath)..\React.Windows.Desktop\facebook.react.winmd + + $(OutputPath)..\React.Windows.Desktop\Microsoft.React.winmd $(OutputPath)..\React.Windows.Desktop\Microsoft.ReactNative.winmd diff --git a/vnext/Desktop/ABI/MemoryTracker.idl b/vnext/Desktop/ABI/MemoryTracker.idl index fa986c69fb1..499800bc7b4 100644 --- a/vnext/Desktop/ABI/MemoryTracker.idl +++ b/vnext/Desktop/ABI/MemoryTracker.idl @@ -3,7 +3,7 @@ import "ABI/MessageQueue.idl"; // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different // namespace, e.g. "Microsoft.React"? -namespace facebook.react { +namespace Microsoft.React { // ABI_REVIEW: // using MemoryThresholdCallback = std::function; diff --git a/vnext/Desktop/ABI/MessageQueue.idl b/vnext/Desktop/ABI/MessageQueue.idl index a7e8e806c1c..036b552238f 100644 --- a/vnext/Desktop/ABI/MessageQueue.idl +++ b/vnext/Desktop/ABI/MessageQueue.idl @@ -1,4 +1,4 @@ -namespace facebook.react { +namespace Microsoft.React { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/ABI/MessageQueueShim.h b/vnext/Desktop/ABI/MessageQueueShim.h index afcf7adce65..49c323b107e 100644 --- a/vnext/Desktop/ABI/MessageQueueShim.h +++ b/vnext/Desktop/ABI/MessageQueueShim.h @@ -1,7 +1,7 @@ #pragma once #include -#include +#include namespace facebook::react { class MessageQueueShim : public MessageQueueThread { diff --git a/vnext/Desktop/ABI/NativeLogEventSource.cpp b/vnext/Desktop/ABI/NativeLogEventSource.cpp index 2084168c274..202e531f5d9 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.cpp +++ b/vnext/Desktop/ABI/NativeLogEventSource.cpp @@ -2,7 +2,7 @@ #include "NativeLogEventSource.h" -#include "facebook.react.NativeLogEventSource.g.cpp" +#include "Microsoft.React.NativeLogEventSource.g.cpp" #include #include diff --git a/vnext/Desktop/ABI/NativeLogEventSource.h b/vnext/Desktop/ABI/NativeLogEventSource.h index 83049e09bfc..2f69c990125 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.h +++ b/vnext/Desktop/ABI/NativeLogEventSource.h @@ -1,5 +1,5 @@ #pragma once -#include "facebook.react.NativeLogEventSource.g.h" +#include "Microsoft.React.NativeLogEventSource.g.h" namespace winrt::facebook::react::implementation { struct NativeLogEventSource { diff --git a/vnext/Desktop/ABI/NativeLogging.idl b/vnext/Desktop/ABI/NativeLogging.idl index ff242084612..bc95502efe9 100644 --- a/vnext/Desktop/ABI/NativeLogging.idl +++ b/vnext/Desktop/ABI/NativeLogging.idl @@ -13,7 +13,7 @@ // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different // namespace, e.g. "Microsoft.React"? -namespace facebook.react { +namespace Microsoft.React { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.cpp b/vnext/Desktop/ABI/NativeTraceEventSource.cpp index 7f42876fc29..cd61061909f 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.cpp +++ b/vnext/Desktop/ABI/NativeTraceEventSource.cpp @@ -2,7 +2,7 @@ #include "NativeTraceEventSource.h" -#include "facebook.react.NativeTraceEventSource.g.cpp" +#include "Microsoft.React.NativeTraceEventSource.g.cpp" #include #include diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.h b/vnext/Desktop/ABI/NativeTraceEventSource.h index 9643a82560d..c66af126816 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.h +++ b/vnext/Desktop/ABI/NativeTraceEventSource.h @@ -1,5 +1,5 @@ #pragma once -#include "facebook.react.NativeTraceEventSource.g.h" +#include "Microsoft.React.NativeTraceEventSource.g.h" namespace winrt::facebook::react::implementation { struct NativeTraceEventSource { diff --git a/vnext/Desktop/ABI/NativeTracing.idl b/vnext/Desktop/ABI/NativeTracing.idl index 9c43ef75e7c..3fdba4d3a44 100644 --- a/vnext/Desktop/ABI/NativeTracing.idl +++ b/vnext/Desktop/ABI/NativeTracing.idl @@ -1,4 +1,4 @@ -namespace facebook.react { +namespace Microsoft.React { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 9f001c9422a..edcc9770a2b 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -36,7 +36,7 @@ true {95048601-C3DC-475F-ADF8-7C0C764C10D5} React.Windows.Desktop - facebook.react + Microsoft.React en-US 16.0 C++/WinRT diff --git a/vnext/Desktop/module.g.cpp b/vnext/Desktop/module.g.cpp index a1ed4613ebe..96f813d3b1a 100644 --- a/vnext/Desktop/module.g.cpp +++ b/vnext/Desktop/module.g.cpp @@ -33,17 +33,17 @@ void* __stdcall winrt_get_activation_factory([[maybe_unused]] std::wstring_view return winrt_make_Microsoft_ReactNative_ReactNativeHost(); } - if (requal(name, L"facebook.react.MemoryTracker")) + if (requal(name, L"Microsoft.React.MemoryTracker")) { return winrt_make_facebook_react_MemoryTracker(); } - if (requal(name, L"facebook.react.NativeLogEventSource")) + if (requal(name, L"Microsoft.React.NativeLogEventSource")) { return winrt_make_facebook_react_NativeLogEventSource(); } - if (requal(name, L"facebook.react.NativeTraceEventSource")) + if (requal(name, L"Microsoft.React.NativeTraceEventSource")) { return winrt_make_facebook_react_NativeTraceEventSource(); } From 7e956ea2517f79345667ce4c6e72a01e7b7bd491 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 25 May 2020 23:02:16 -0700 Subject: [PATCH 02/38] Move MessageQueueShim to Microsoft::React --- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 1 + vnext/Desktop/ABI/MemoryTracker.cpp | 4 ++-- vnext/Desktop/ABI/MessageQueueShim.cpp | 6 +++--- vnext/Desktop/ABI/MessageQueueShim.h | 10 +++++----- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index 40f40688a9f..1bf6ead407e 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -13,6 +13,7 @@ using namespace Microsoft::React::Test; using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace winrt::facebook::react; +using namespace winrt::Microsoft::React; namespace ABITests { diff --git a/vnext/Desktop/ABI/MemoryTracker.cpp b/vnext/Desktop/ABI/MemoryTracker.cpp index 075776ae03c..a8a59e0655e 100644 --- a/vnext/Desktop/ABI/MemoryTracker.cpp +++ b/vnext/Desktop/ABI/MemoryTracker.cpp @@ -9,7 +9,7 @@ namespace winrt::facebook::react::implementation { MemoryTracker::MemoryTracker(facebook::react::IMessageQueue const &callbackMessageQueue) { m_internalMemoryTracker = ::facebook::react::CreateMemoryTracker( - std::make_shared<::facebook::react::MessageQueueShim>(callbackMessageQueue)); + std::make_shared<::Microsoft::React::MessageQueueShim>(callbackMessageQueue)); } uint64_t MemoryTracker::CurrentMemoryUsage() { @@ -25,7 +25,7 @@ facebook::react::IMessageQueue MemoryTracker::CallbackMessageQueue() { } void MemoryTracker::CallbackMessageQueue(facebook::react::IMessageQueue value) { - m_internalMemoryTracker->SetCallbackMessageQueueThread(std::make_shared<::facebook::react::MessageQueueShim>(value)); + m_internalMemoryTracker->SetCallbackMessageQueueThread(std::make_shared<::Microsoft::React::MessageQueueShim>(value)); } uint32_t MemoryTracker::AddThresholdHandler( diff --git a/vnext/Desktop/ABI/MessageQueueShim.cpp b/vnext/Desktop/ABI/MessageQueueShim.cpp index 02230e05db8..1d50524daf5 100644 --- a/vnext/Desktop/ABI/MessageQueueShim.cpp +++ b/vnext/Desktop/ABI/MessageQueueShim.cpp @@ -2,9 +2,9 @@ #include "MessageQueueShim.h" -namespace facebook::react { +namespace Microsoft::React { -MessageQueueShim::MessageQueueShim(const ::winrt::facebook::react::IMessageQueue &abiMessageQueue) +MessageQueueShim::MessageQueueShim(const ::winrt::Microsoft::React::IMessageQueue &abiMessageQueue) : m_abiMessageQueue{abiMessageQueue} {} void MessageQueueShim::runOnQueue(std::function &&item) { @@ -19,4 +19,4 @@ void MessageQueueShim::quitSynchronous() { m_abiMessageQueue.QuitSync(); } -} // namespace facebook::react +} // namespace Microsoft::React diff --git a/vnext/Desktop/ABI/MessageQueueShim.h b/vnext/Desktop/ABI/MessageQueueShim.h index 49c323b107e..65acbd0e0df 100644 --- a/vnext/Desktop/ABI/MessageQueueShim.h +++ b/vnext/Desktop/ABI/MessageQueueShim.h @@ -3,15 +3,15 @@ #include #include -namespace facebook::react { -class MessageQueueShim : public MessageQueueThread { +namespace Microsoft::React { +class MessageQueueShim : public facebook::react::MessageQueueThread { public: - MessageQueueShim(const ::winrt::facebook::react::IMessageQueue &abiMessageQueue); + MessageQueueShim(const ::winrt::Microsoft::React::IMessageQueue &abiMessageQueue); virtual void runOnQueue(std::function &&item) override; virtual void runOnQueueSync(std::function &&item) override; virtual void quitSynchronous() override; private: - ::winrt::facebook::react::IMessageQueue m_abiMessageQueue; + ::winrt::Microsoft::React::IMessageQueue m_abiMessageQueue; }; -} // namespace facebook::react +} // namespace Microsoft::React From d4040c2d120c31c04be5bcb3aae2421f2d6a6b8e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 25 May 2020 23:24:05 -0700 Subject: [PATCH 03/38] Moved NativeLogEventSource into Microsoft::React --- vnext/Desktop.ABITests/NativeLogEventTests.cpp | 1 + vnext/Desktop.ABITests/PerfTests.cpp | 1 + vnext/Desktop/ABI/NativeLogEventSource.cpp | 6 +++--- vnext/Desktop/ABI/NativeLogEventSource.h | 10 +++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/vnext/Desktop.ABITests/NativeLogEventTests.cpp b/vnext/Desktop.ABITests/NativeLogEventTests.cpp index 8832b06c7fe..519c24cbd78 100644 --- a/vnext/Desktop.ABITests/NativeLogEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeLogEventTests.cpp @@ -9,6 +9,7 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace winrt::facebook::react; +using namespace winrt::Microsoft::React; using namespace winrt; namespace ABITests { diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index d9356d8b714..904c9b4c33d 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -9,6 +9,7 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace winrt::facebook::react; +using namespace winrt::Microsoft::React; using namespace winrt; namespace ABITests { diff --git a/vnext/Desktop/ABI/NativeLogEventSource.cpp b/vnext/Desktop/ABI/NativeLogEventSource.cpp index 202e531f5d9..aa243fb5737 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.cpp +++ b/vnext/Desktop/ABI/NativeLogEventSource.cpp @@ -9,13 +9,13 @@ using namespace Microsoft::Common::Unicode; -namespace winrt::facebook::react::implementation { +namespace winrt::Microsoft::React::implementation { namespace { -::winrt::facebook::react::NativeLogHandler g_abiHandler; +::winrt::Microsoft::React::NativeLogHandler g_abiHandler; std::atomic g_abiHandlerRegistrationCookie = 0; } // namespace -uint32_t NativeLogEventSource::InitializeLogging(::winrt::facebook::react::NativeLogHandler const &handler) { +uint32_t NativeLogEventSource::InitializeLogging(::winrt::Microsoft::React::NativeLogHandler const &handler) { g_abiHandler = handler; std::function internalHandler = diff --git a/vnext/Desktop/ABI/NativeLogEventSource.h b/vnext/Desktop/ABI/NativeLogEventSource.h index 2f69c990125..e13bde622e5 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.h +++ b/vnext/Desktop/ABI/NativeLogEventSource.h @@ -1,14 +1,14 @@ #pragma once #include "Microsoft.React.NativeLogEventSource.g.h" -namespace winrt::facebook::react::implementation { +namespace winrt::Microsoft::React::implementation { struct NativeLogEventSource { NativeLogEventSource() = default; - static uint32_t InitializeLogging(facebook::react::NativeLogHandler const &handler); + static uint32_t InitializeLogging(Microsoft::React::NativeLogHandler const &handler); static void UninitializeLogging(uint32_t cookie); }; -} // namespace winrt::facebook::react::implementation -namespace winrt::facebook::react::factory_implementation { +} // namespace winrt::Microsoft::React::implementation +namespace winrt::Microsoft::React::factory_implementation { struct NativeLogEventSource : NativeLogEventSourceT {}; -} // namespace winrt::facebook::react::factory_implementation +} // namespace winrt::Microsoft::React::factory_implementation From 0e0cb8bbc7b7f3702faa64042f53eb3e9eb6f125 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 25 May 2020 23:29:53 -0700 Subject: [PATCH 04/38] Moved NativeTraceEventSource into Microsoft::React --- vnext/Desktop.ABITests/NativeTraceEventTests.cpp | 7 ++++--- vnext/Desktop/ABI/NativeTraceEventSource.cpp | 8 ++++---- vnext/Desktop/ABI/NativeTraceEventSource.h | 10 +++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp index 2616a8f62e5..e56672ba935 100644 --- a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp @@ -10,12 +10,13 @@ using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace winrt::facebook::react; +using namespace winrt::Microsoft::React; using namespace winrt; namespace ABITests { TEST_CLASS (NativeTraceEventTests) { - struct TestTraceHandler : public winrt::implements { + struct TestTraceHandler : public winrt::implements { void JSBeginSection(param::hstring const &profileName, param::hstring const &args) const { if (this->OnJSBeginSection) { this->OnJSBeginSection(((hstring)profileName).c_str(), ((hstring)args).c_str()); @@ -70,7 +71,7 @@ TEST_CLASS (NativeTraceEventTests) { // RAII helper to ensure trace handlers get unregistered struct NativeTraceInitializationGuard { - NativeTraceInitializationGuard(const ::winrt::facebook::react::INativeTraceHandler &handler) noexcept { + NativeTraceInitializationGuard(const ::winrt::Microsoft::React::INativeTraceHandler &handler) noexcept { m_registrationCookie = NativeTraceEventSource::InitializeTracing(handler); } @@ -90,7 +91,7 @@ TEST_CLASS (NativeTraceEventTests) { TEST_METHOD(NativeTraceEventHandler_Registered) { init_apartment(winrt::apartment_type::single_threaded); - ::winrt::facebook::react::INativeTraceHandler handler = winrt::make(); + ::winrt::Microsoft::React::INativeTraceHandler handler = winrt::make(); // anticipatory, see TODO below std::stack> jsSections; diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.cpp b/vnext/Desktop/ABI/NativeTraceEventSource.cpp index cd61061909f..5aeb248544e 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.cpp +++ b/vnext/Desktop/ABI/NativeTraceEventSource.cpp @@ -9,9 +9,9 @@ using namespace ::Microsoft::Common::Unicode; -namespace winrt::facebook::react::implementation { +namespace winrt::Microsoft::React::implementation { namespace { -::winrt::facebook::react::INativeTraceHandler g_abiHandler; +::winrt::Microsoft::React::INativeTraceHandler g_abiHandler; std::atomic g_abiHandlerRegistrationCookie = 0; class InternalHandler : public ::facebook::react::INativeTraceHandler{ @@ -45,11 +45,11 @@ NativeEndSection(const char *profileName, const char *args, std::chrono::nanosec } private: -} // namespace winrt::facebook::react::implementation +} // namespace winrt::Microsoft::React::implementation g_internalHandler; } -uint32_t NativeTraceEventSource::InitializeTracing(::winrt::facebook::react::INativeTraceHandler const &handler) { +uint32_t NativeTraceEventSource::InitializeTracing(::winrt::Microsoft::React::INativeTraceHandler const &handler) { g_abiHandler = handler; ::facebook::react::InitializeTracing(&g_internalHandler); return ++g_abiHandlerRegistrationCookie; diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.h b/vnext/Desktop/ABI/NativeTraceEventSource.h index c66af126816..aafa724c9a5 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.h +++ b/vnext/Desktop/ABI/NativeTraceEventSource.h @@ -1,15 +1,15 @@ #pragma once #include "Microsoft.React.NativeTraceEventSource.g.h" -namespace winrt::facebook::react::implementation { +namespace winrt::Microsoft::React::implementation { struct NativeTraceEventSource { NativeTraceEventSource() = default; - static uint32_t InitializeTracing(facebook::react::INativeTraceHandler const &handler); + static uint32_t InitializeTracing(Microsoft::React::INativeTraceHandler const &handler); static void UninitializeTracing(uint32_t cookie); }; -} // namespace winrt::facebook::react::implementation -namespace winrt::facebook::react::factory_implementation { +} // namespace winrt::Microsoft::React::implementation +namespace winrt::Microsoft::React::factory_implementation { struct NativeTraceEventSource : NativeTraceEventSourceT {}; -} // namespace winrt::facebook::react::factory_implementation +} // namespace winrt::Microsoft::React::factory_implementation From d9477e9dc3dff270f6706ad56fd593612ff8c0cd Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Mon, 25 May 2020 23:51:30 -0700 Subject: [PATCH 05/38] Drop facebook::react usages for Microsoft::React --- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 1 - vnext/Desktop.ABITests/MessageQueueShim.cpp | 4 ++-- vnext/Desktop.ABITests/MessageQueueShim.h | 6 +++--- .../Desktop.ABITests/NativeLogEventTests.cpp | 7 +++---- .../NativeTraceEventTests.cpp | 1 - vnext/Desktop.ABITests/PerfTests.cpp | 3 +-- vnext/Desktop/ABI/MemoryTracker.cpp | 14 ++++++------- vnext/Desktop/ABI/MemoryTracker.h | 20 +++++++++---------- vnext/Desktop/module.g.cpp | 12 +++++------ 9 files changed, 32 insertions(+), 36 deletions(-) diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index 1bf6ead407e..85aaa0fd802 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -12,7 +12,6 @@ using namespace Microsoft::React::Test; using namespace Microsoft::VisualStudio::CppUnitTestFramework; -using namespace winrt::facebook::react; using namespace winrt::Microsoft::React; namespace ABITests { diff --git a/vnext/Desktop.ABITests/MessageQueueShim.cpp b/vnext/Desktop.ABITests/MessageQueueShim.cpp index cd48accdbfc..bb8b22b244b 100644 --- a/vnext/Desktop.ABITests/MessageQueueShim.cpp +++ b/vnext/Desktop.ABITests/MessageQueueShim.cpp @@ -13,11 +13,11 @@ MessageQueueShim::MessageQueueShim() MessageQueueShim::MessageQueueShim(std::shared_ptr<::facebook::react::MessageQueueThread> messageQueueThread) : m_messageQueueThread{std::move(messageQueueThread)} {} -void MessageQueueShim::Run(::winrt::facebook::react::QueueItem const &item) const { +void MessageQueueShim::Run(::winrt::Microsoft::React::QueueItem const &item) const { m_messageQueueThread->runOnQueue(item); } -void MessageQueueShim::RunSync(::winrt::facebook::react::QueueItem const &item) const { +void MessageQueueShim::RunSync(::winrt::Microsoft::React::QueueItem const &item) const { m_messageQueueThread->runOnQueueSync(item); } diff --git a/vnext/Desktop.ABITests/MessageQueueShim.h b/vnext/Desktop.ABITests/MessageQueueShim.h index 4ae89ad7700..fa5fbc9e197 100644 --- a/vnext/Desktop.ABITests/MessageQueueShim.h +++ b/vnext/Desktop.ABITests/MessageQueueShim.h @@ -7,12 +7,12 @@ #include namespace ABITests { -class MessageQueueShim : public winrt::implements { +class MessageQueueShim : public winrt::implements { public: MessageQueueShim(); MessageQueueShim(std::shared_ptr<::facebook::react::MessageQueueThread> messageQueueThread); - void Run(::winrt::facebook::react::QueueItem const &item) const; - void RunSync(::winrt::facebook::react::QueueItem const &item) const; + void Run(::winrt::Microsoft::React::QueueItem const &item) const; + void RunSync(::winrt::Microsoft::React::QueueItem const &item) const; void QuitSync() const; private: diff --git a/vnext/Desktop.ABITests/NativeLogEventTests.cpp b/vnext/Desktop.ABITests/NativeLogEventTests.cpp index 519c24cbd78..bb9f81a0a3d 100644 --- a/vnext/Desktop.ABITests/NativeLogEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeLogEventTests.cpp @@ -8,7 +8,6 @@ #include "ActivationFactory.h" using namespace Microsoft::VisualStudio::CppUnitTestFramework; -using namespace winrt::facebook::react; using namespace winrt::Microsoft::React; using namespace winrt; @@ -17,7 +16,7 @@ namespace ABITests { TEST_CLASS (NativeLogEventTests) { // RAII helper to ensure log handlers get unregistered struct NativeLogInitializationGuard { - NativeLogInitializationGuard(::winrt::facebook::react::NativeLogHandler const &handler) noexcept { + NativeLogInitializationGuard(::winrt::Microsoft::React::NativeLogHandler const &handler) noexcept { m_registrationCookie = NativeLogEventSource::InitializeLogging(handler); } @@ -38,9 +37,9 @@ TEST_CLASS (NativeLogEventTests) { init_apartment(winrt::apartment_type::single_threaded); // anticipatory, see TODO below - std::vector> logMessages; + std::vector> logMessages; - NativeLogHandler handler{[&logMessages](::winrt::facebook::react::LogLevel l, hstring const &m) { + NativeLogHandler handler{[&logMessages](::winrt::Microsoft::React::LogLevel l, hstring const &m) { logMessages.emplace_back(l, m.c_str()); }}; diff --git a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp index e56672ba935..3b491092844 100644 --- a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp @@ -9,7 +9,6 @@ #include "ActivationFactory.h" using namespace Microsoft::VisualStudio::CppUnitTestFramework; -using namespace winrt::facebook::react; using namespace winrt::Microsoft::React; using namespace winrt; diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index 904c9b4c33d..9215c330eb3 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -8,7 +8,6 @@ #include using namespace Microsoft::VisualStudio::CppUnitTestFramework; -using namespace winrt::facebook::react; using namespace winrt::Microsoft::React; using namespace winrt; @@ -19,7 +18,7 @@ namespace ABITests { TEST_CLASS (PerfTests) { static const uint32_t iterations = 100000000; - static void HandleLogEvents(::winrt::facebook::react::LogLevel l, hstring const &m) {} + static void HandleLogEvents(::winrt::Microsoft::React::LogLevel l, hstring const &m) {} TEST_METHOD(TimeNewAbiInitializeLogging) { // ensure the DLL has been loaded before starting perf measurements diff --git a/vnext/Desktop/ABI/MemoryTracker.cpp b/vnext/Desktop/ABI/MemoryTracker.cpp index a8a59e0655e..69ebb83ee5c 100644 --- a/vnext/Desktop/ABI/MemoryTracker.cpp +++ b/vnext/Desktop/ABI/MemoryTracker.cpp @@ -2,12 +2,12 @@ #include "MemoryTracker.h" -#include "facebook.react.MemoryTracker.g.cpp" +#include "Microsoft.React.MemoryTracker.g.cpp" #include "MessageQueueShim.h" -namespace winrt::facebook::react::implementation { -MemoryTracker::MemoryTracker(facebook::react::IMessageQueue const &callbackMessageQueue) { +namespace winrt::Microsoft::React::implementation { +MemoryTracker::MemoryTracker(Microsoft::React::IMessageQueue const &callbackMessageQueue) { m_internalMemoryTracker = ::facebook::react::CreateMemoryTracker( std::make_shared<::Microsoft::React::MessageQueueShim>(callbackMessageQueue)); } @@ -20,18 +20,18 @@ uint64_t MemoryTracker::PeakMemoryUsage() { return m_internalMemoryTracker->GetPeakMemoryUsage(); } -facebook::react::IMessageQueue MemoryTracker::CallbackMessageQueue() { +Microsoft::React::IMessageQueue MemoryTracker::CallbackMessageQueue() { return m_abiCallbackMessageQueue; } -void MemoryTracker::CallbackMessageQueue(facebook::react::IMessageQueue value) { +void MemoryTracker::CallbackMessageQueue(Microsoft::React::IMessageQueue value) { m_internalMemoryTracker->SetCallbackMessageQueueThread(std::make_shared<::Microsoft::React::MessageQueueShim>(value)); } uint32_t MemoryTracker::AddThresholdHandler( uint64_t threshold, uint32_t minCallbackIntervalInMilliseconds, - facebook::react::MemoryThresholdHandler const &handler) { + Microsoft::React::MemoryThresholdHandler const &handler) { return static_cast(m_internalMemoryTracker->AddThresholdCallback( static_cast(threshold), std::chrono::milliseconds(minCallbackIntervalInMilliseconds), handler)); } @@ -55,4 +55,4 @@ void MemoryTracker::OnDeallocation(uint64_t size) { } #pragma endregion IMemoryTrackerTester -} // namespace winrt::facebook::react::implementation +} // namespace winrt::Microsoft::React::implementation diff --git a/vnext/Desktop/ABI/MemoryTracker.h b/vnext/Desktop/ABI/MemoryTracker.h index 099b386a775..1f09b8bae1f 100644 --- a/vnext/Desktop/ABI/MemoryTracker.h +++ b/vnext/Desktop/ABI/MemoryTracker.h @@ -1,21 +1,21 @@ #pragma once -#include "facebook.react.MemoryTracker.g.h" +#include "Microsoft.React.MemoryTracker.g.h" #include -namespace winrt::facebook::react::implementation { +namespace winrt::Microsoft::React::implementation { struct MemoryTracker : MemoryTrackerT { MemoryTracker() = default; - MemoryTracker(facebook::react::IMessageQueue const &callbackMessageQueue); + MemoryTracker(Microsoft::React::IMessageQueue const &callbackMessageQueue); uint64_t CurrentMemoryUsage(); uint64_t PeakMemoryUsage(); - facebook::react::IMessageQueue CallbackMessageQueue(); - void CallbackMessageQueue(facebook::react::IMessageQueue value); + Microsoft::React::IMessageQueue CallbackMessageQueue(); + void CallbackMessageQueue(Microsoft::React::IMessageQueue value); uint32_t AddThresholdHandler( uint64_t threshold, uint32_t minCallbackIntervalInMilliseconds, - facebook::react::MemoryThresholdHandler const &handler); + Microsoft::React::MemoryThresholdHandler const &handler); bool RemoveThresholdHandler(uint32_t token); #pragma region IMemoryTrackerTester @@ -28,9 +28,9 @@ struct MemoryTracker : MemoryTrackerT { private: std::shared_ptr<::facebook::react::MemoryTracker> m_internalMemoryTracker; - ::winrt::facebook::react::IMessageQueue m_abiCallbackMessageQueue; + ::winrt::Microsoft::React::IMessageQueue m_abiCallbackMessageQueue; }; -} // namespace winrt::facebook::react::implementation -namespace winrt::facebook::react::factory_implementation { +} // namespace winrt::Microsoft::React::implementation +namespace winrt::Microsoft::React::factory_implementation { struct MemoryTracker : MemoryTrackerT {}; -} // namespace winrt::facebook::react::factory_implementation +} // namespace winrt::Microsoft::React::factory_implementation diff --git a/vnext/Desktop/module.g.cpp b/vnext/Desktop/module.g.cpp index 96f813d3b1a..9e3d166d31b 100644 --- a/vnext/Desktop/module.g.cpp +++ b/vnext/Desktop/module.g.cpp @@ -6,9 +6,9 @@ #include "pch.h" #include "winrt/base.h" void* winrt_make_Microsoft_ReactNative_ReactNativeHost(); -void* winrt_make_facebook_react_MemoryTracker(); -void* winrt_make_facebook_react_NativeLogEventSource(); -void* winrt_make_facebook_react_NativeTraceEventSource(); +void* winrt_make_Microsoft_React_MemoryTracker(); +void* winrt_make_Microsoft_React_NativeLogEventSource(); +void* winrt_make_Microsoft_React_NativeTraceEventSource(); bool __stdcall winrt_can_unload_now() noexcept { @@ -35,17 +35,17 @@ void* __stdcall winrt_get_activation_factory([[maybe_unused]] std::wstring_view if (requal(name, L"Microsoft.React.MemoryTracker")) { - return winrt_make_facebook_react_MemoryTracker(); + return winrt_make_Microsoft_React_MemoryTracker(); } if (requal(name, L"Microsoft.React.NativeLogEventSource")) { - return winrt_make_facebook_react_NativeLogEventSource(); + return winrt_make_Microsoft_React_NativeLogEventSource(); } if (requal(name, L"Microsoft.React.NativeTraceEventSource")) { - return winrt_make_facebook_react_NativeTraceEventSource(); + return winrt_make_Microsoft_React_NativeTraceEventSource(); } return nullptr; From 293c4396601480e5be74a6c07d62b27987ad1883 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 00:02:57 -0700 Subject: [PATCH 06/38] Set shared items name to Microsoft.React.Shared --- vnext/Shared/Shared.vcxitems | 1 + 1 file changed, 1 insertion(+) diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index 4d31e11fc82..4cbea1955c9 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -4,6 +4,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true {2049dbe9-8d13-42c9-ae4b-413ae38fffd0} + Microsoft.React.Shared From 3ee9d84fede0efbccc380afd131d5665dca3a6e7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 00:30:28 -0700 Subject: [PATCH 07/38] Added Microsoft.React.Core --- vnext/ReactWindows-Desktop.sln | 61 +++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 6e3ddae5d0a..6a4be7dc7cb 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -81,7 +81,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLi PropertySheets\DynamicLibrary\x86.props = PropertySheets\DynamicLibrary\x86.props EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.React.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop", "Desktop\React.Windows.Desktop.vcxproj", "{95048601-C3DC-475F-ADF8-7C0C764C10D5}" EndProject @@ -119,6 +119,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mso", "Mso", "{4DE630AE-EC5 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.React.Core", "ReactWindowsCore\Microsoft.React.Core.vcxproj", "{3A1BE021-6877-481A-9C03-7C5A1224E897}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -127,6 +129,7 @@ Global JSI\Shared\JSI.Shared.vcxitems*{17dd1b17-3094-40dd-9373-ac2497932eca}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 + Mso\Mso.vcxitems*{3a1be021-6877-481a-9c03-7c5a1224e897}*SharedItemsImports = 4 Chakra\Chakra.vcxitems*{6f354505-fe3a-4bd2-a9a6-d12bbf37a85c}*SharedItemsImports = 4 Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{95048601-c3dc-475f-adf8-7c0c764c10d5}*SharedItemsImports = 4 @@ -138,136 +141,192 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 + Debug|ARM = Debug|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM = Release|ARM EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM + {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM + {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.Build.0 = Debug|Win32 + {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.ActiveCfg = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.Build.0 = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.Build.0 = Release|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.ActiveCfg = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.Build.0 = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.Build.0 = Debug|Win32 + {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.ActiveCfg = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.Build.0 = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.Build.0 = Release|Win32 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.ActiveCfg = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.Build.0 = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.Build.0 = Debug|Win32 + {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.ActiveCfg = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.Build.0 = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.Build.0 = Release|Win32 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.ActiveCfg = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.Build.0 = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.Build.0 = Debug|Win32 + {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.ActiveCfg = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.Build.0 = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.Build.0 = Release|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.ActiveCfg = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.Build.0 = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.Build.0 = Debug|Win32 + {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.ActiveCfg = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.Build.0 = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.Build.0 = Release|Win32 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.Build.0 = Debug|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.Build.0 = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.Build.0 = Debug|Win32 + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.ActiveCfg = Release|ARM + {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.Build.0 = Release|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.ActiveCfg = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.Build.0 = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 + {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|ARM.ActiveCfg = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.ActiveCfg = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.Build.0 = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.ActiveCfg = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.Build.0 = Debug|Win32 + {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|ARM.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.ActiveCfg = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.Build.0 = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.Build.0 = Release|Win32 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.Build.0 = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x86.ActiveCfg = Debug|x64 + {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.Build.0 = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x86.ActiveCfg = Release|x64 + {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM.ActiveCfg = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.ActiveCfg = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.Build.0 = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.ActiveCfg = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.Build.0 = Debug|Win32 + {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM.ActiveCfg = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.ActiveCfg = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.Build.0 = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.ActiveCfg = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.Build.0 = Release|Win32 + {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM.ActiveCfg = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.ActiveCfg = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.Build.0 = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.ActiveCfg = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.Build.0 = Debug|Win32 + {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.ActiveCfg = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.Build.0 = Release|Win32 + {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|ARM.ActiveCfg = Debug|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x64.ActiveCfg = Debug|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x64.Build.0 = Debug|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x86.ActiveCfg = Debug|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x86.Build.0 = Debug|Win32 + {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|ARM.ActiveCfg = Release|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x64.ActiveCfg = Release|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x64.Build.0 = Release|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x86.ActiveCfg = Release|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x86.Build.0 = Release|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM + {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.ActiveCfg = Debug|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.Build.0 = Debug|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.ActiveCfg = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.Build.0 = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.ActiveCfg = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.Build.0 = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.ActiveCfg = Release|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.Build.0 = Release|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.ActiveCfg = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.Build.0 = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.ActiveCfg = Release|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From c7ece7714e2bb30827c575cb8ac788db516859b5 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 00:30:39 -0700 Subject: [PATCH 08/38] Added Microsoft.React.Core --- .../Microsoft.React.Core.vcxproj | 166 ++++++++++++++++++ .../Microsoft.React.Core.vcxproj.filters | 22 +++ 2 files changed, 188 insertions(+) create mode 100644 vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj create mode 100644 vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj new file mode 100644 index 00000000000..830df35df6e --- /dev/null +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj @@ -0,0 +1,166 @@ + + + + + + Debug + ARM + + + Release + ARM + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + true + {3A1BE021-6877-481A-9C03-7C5A1224E897} + Microsoft.React.Core + + + + + + + + StaticLibrary + + + + + + + + + + + + + + + + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) + true + + + + + + + + Use + pch.h + pch.h + + + + + + + + + + + + + Designer + + + + + {fca38f3c-7c73-4c47-be4e-32f77fa8538d} + + + {A990658C-CE31-4BCC-976F-0FC6B1AF693D} + + + {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} + + + + + + + + + + + + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + + + + + \ No newline at end of file diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters new file mode 100644 index 00000000000..9950b449e52 --- /dev/null +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + + + + {43517427-5ece-43e3-9dda-865bdb40bcc1} + + + {d7ad5f7c-2bcc-4454-86ff-b92813a229df} + + + {3c118f1c-a23a-4cb1-9104-de7cfaa4a98e} + + + + + Source Files\Pch + + + \ No newline at end of file From d42adbf6daaeb6b931efc549fb63e473c5e8b32e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 00:36:42 -0700 Subject: [PATCH 09/38] Added ReactWindowsCore files --- .../Microsoft.React.Core.vcxproj | 32 +++++ .../Microsoft.React.Core.vcxproj.filters | 119 ++++++++++++++++++ 2 files changed, 151 insertions(+) diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj index 830df35df6e..a8be262115c 100644 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj @@ -112,6 +112,10 @@ + + + + Designer @@ -128,7 +132,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters index 9950b449e52..fb0f63f4511 100644 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters @@ -2,6 +2,18 @@ + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + @@ -13,10 +25,117 @@ {3c118f1c-a23a-4cb1-9104-de7cfaa4a98e} + + {ff877a08-95e8-4169-b795-2f94171268d8} + + + {d290d606-a201-43a4-b495-05c6b71976f2} + + + {5b5ff9db-d99c-46b2-843e-1ce3cb0d84b5} + + + {70ddd865-a745-4c99-9fd5-9b52b824710b} + + + {4c7cb432-9569-4af6-9da8-b1630db496fd} + + + {f530aebd-19f2-4400-be7d-140a0abb136f} + + + {2e1cdfdf-f099-4e05-b0af-ac71f61f63ca} + + + {20798c96-77ba-460d-be48-5bb2d9337371} + + + {3fd9e345-176f-4508-bed4-28c4014bb6dd} + Source Files\Pch + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\tracing + + + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\etw + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\tracing + + + Header Files\Pch + \ No newline at end of file From 7b664ada21b9ea611ba253dbb928c68a878ce476 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 00:39:06 -0700 Subject: [PATCH 10/38] Added ReactWindowsCore files --- .../Microsoft.React.Core.vcxproj | 50 ++++++ .../Microsoft.React.Core.vcxproj.filters | 150 ++++++++++++++++++ 2 files changed, 200 insertions(+) diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj index a8be262115c..f7a96d8f4ae 100644 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj @@ -135,6 +135,14 @@ + + + + + + + + @@ -144,13 +152,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -159,8 +197,20 @@ + + + + + + + + + + + + diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters index fb0f63f4511..9d5eaa786fd 100644 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters +++ b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters @@ -93,6 +93,51 @@ Source Files\tracing + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -137,5 +182,110 @@ Header Files\Pch + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + \ No newline at end of file From fa5fed8157415e240e07762bb93bb5085a25f23d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 17:35:51 -0700 Subject: [PATCH 11/38] Migrated sources from ReactWindowsCore to Shared --- vnext/Desktop.ABITests/PerfTests.cpp | 2 +- ...t.Windows.Desktop.IntegrationTests.vcxproj | 2 +- vnext/Desktop/ABI/MemoryTracker.h | 2 +- vnext/Desktop/Modules/WebSocketModule.cpp | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 10 +- .../React.Windows.IntegrationTests.vcxproj | 2 +- .../JSI.Desktop.UnitTests.vcxproj | 2 +- vnext/JSI/Desktop/JSI.Desktop.vcxproj | 2 +- .../Microsoft.ReactNative.vcxproj | 5 +- .../Microsoft.ReactNative.vcxproj.filters | 17 +- .../Modules/AsyncStorageModuleWin32.cpp | 0 .../Modules/AsyncStorageModuleWin32.h | 0 vnext/ReactCommon/ReactCommon.vcxproj | 4 +- vnext/ReactWindows-Desktop.sln | 39 --- vnext/{ReactWindowsCore => Shared}/AbiSafe.h | 0 .../AsyncStorage/AsyncStorageManager.cpp | 0 .../AsyncStorage/AsyncStorageManager.h | 0 .../AsyncStorage/FollyDynamicConverter.cpp | 0 .../AsyncStorage/FollyDynamicConverter.h | 0 .../AsyncStorage/KeyValueStorage.cpp | 0 .../AsyncStorage/KeyValueStorage.h | 0 .../AsyncStorageModule.h | 0 .../BaseScriptStoreImpl.cpp | 0 .../BaseScriptStoreImpl.h | 0 .../BatchingMessageQueueThread.h | 0 .../ChakraRuntimeHolder.cpp | 0 .../ChakraRuntimeHolder.h | 0 .../CreateModules.h | 0 .../CxxMessageQueue.cpp | 0 .../CxxMessageQueue.h | 0 .../DevServerHelper.h | 0 .../DevSettings.h | 0 .../HermesRuntimeHolder.cpp | 0 .../HermesRuntimeHolder.h | 0 .../IDevSupportManager.h | 0 .../IHttpResource.h | 0 .../INativeUIManager.h | 0 .../IReactRootView.h | 0 .../IRedBoxHandler.h | 0 .../{ReactWindowsCore => Shared}/IUIManager.h | 0 .../IWebSocketResource.h | 0 .../InstanceManager.h | 0 .../JSBigAbiString.cpp | 0 .../JSBigAbiString.h | 0 .../LayoutAnimation.cpp | 0 .../LayoutAnimation.h | 0 vnext/{ReactWindowsCore => Shared}/Logging.h | 0 .../MemoryMappedBuffer.h | 0 .../MemoryTracker.cpp | 0 .../MemoryTracker.h | 0 .../Modules/AsyncStorageModule.cpp | 0 .../Modules/ExceptionsManagerModule.cpp | 0 .../Modules/ExceptionsManagerModule.h | 0 .../Modules/I18nModule.cpp | 0 .../Modules/I18nModule.h | 0 .../Modules/PlatformConstantsModule.cpp | 0 .../Modules/PlatformConstantsModule.h | 0 .../Modules/SourceCodeModule.cpp | 0 .../Modules/SourceCodeModule.h | 0 .../Modules/StatusBarManagerModule.cpp | 0 .../Modules/StatusBarManagerModule.h | 0 .../Modules/UIManagerModule.cpp | 0 .../Modules/UIManagerModule.h | 0 .../Modules/WebSocketModule.h | 0 .../NativeModuleProvider.h | 0 .../{ReactWindowsCore => Shared}/OInstance.h | 0 .../{ReactWindowsCore => Shared}/Pch/pch.cpp | 0 vnext/{ReactWindowsCore => Shared}/Pch/pch.h | 0 .../ShadowNode.cpp | 0 .../{ReactWindowsCore => Shared}/ShadowNode.h | 0 .../ShadowNodeRegistry.cpp | 0 .../ShadowNodeRegistry.h | 0 vnext/Shared/Shared.vcxitems | 84 ++++++ vnext/Shared/Shared.vcxitems.filters | 274 +++++++++++++++++- vnext/{ReactWindowsCore => Shared}/Tracing.h | 0 .../TurboModuleManager.cpp | 0 .../TurboModuleManager.h | 0 .../TurboModuleRegistry.h | 0 vnext/{ReactWindowsCore => Shared}/Utils.cpp | 0 vnext/{ReactWindowsCore => Shared}/Utils.h | 0 .../V8JSIRuntimeHolder.cpp | 0 .../V8JSIRuntimeHolder.h | 0 .../ViewManager.cpp | 0 .../WebSocketJSExecutorFactory.h | 0 .../WinRTWebSocketResource.cpp | 1 + .../WinRTWebSocketResource.h | 0 vnext/{ReactWindowsCore => Shared}/cdebug.cpp | 0 .../etw/build.bat | 0 .../etw/react_native_windows.h | 0 .../etw/react_native_windows.man | 0 .../etw/react_native_windows_etw_res.dll | Bin .../etw/register.bat | 0 .../{ReactWindowsCore => Shared}/targetver.h | 0 .../tracing/fbsystrace.h | 0 .../tracing/tracing.cpp | 0 vnext/Test/React.Windows.Test.vcxproj | 2 +- 96 files changed, 380 insertions(+), 70 deletions(-) rename vnext/{ReactWindowsCore => Microsoft.ReactNative}/Modules/AsyncStorageModuleWin32.cpp (100%) rename vnext/{ReactWindowsCore => Microsoft.ReactNative}/Modules/AsyncStorageModuleWin32.h (100%) rename vnext/{ReactWindowsCore => Shared}/AbiSafe.h (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/AsyncStorageManager.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/AsyncStorageManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/FollyDynamicConverter.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/FollyDynamicConverter.h (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/KeyValueStorage.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorage/KeyValueStorage.h (100%) rename vnext/{ReactWindowsCore => Shared}/AsyncStorageModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/BaseScriptStoreImpl.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/BaseScriptStoreImpl.h (100%) rename vnext/{ReactWindowsCore => Shared}/BatchingMessageQueueThread.h (100%) rename vnext/{ReactWindowsCore => Shared}/ChakraRuntimeHolder.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/ChakraRuntimeHolder.h (100%) rename vnext/{ReactWindowsCore => Shared}/CreateModules.h (100%) rename vnext/{ReactWindowsCore => Shared}/CxxMessageQueue.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/CxxMessageQueue.h (100%) rename vnext/{ReactWindowsCore => Shared}/DevServerHelper.h (100%) rename vnext/{ReactWindowsCore => Shared}/DevSettings.h (100%) rename vnext/{ReactWindowsCore => Shared}/HermesRuntimeHolder.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/HermesRuntimeHolder.h (100%) rename vnext/{ReactWindowsCore => Shared}/IDevSupportManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/IHttpResource.h (100%) rename vnext/{ReactWindowsCore => Shared}/INativeUIManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/IReactRootView.h (100%) rename vnext/{ReactWindowsCore => Shared}/IRedBoxHandler.h (100%) rename vnext/{ReactWindowsCore => Shared}/IUIManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/IWebSocketResource.h (100%) rename vnext/{ReactWindowsCore => Shared}/InstanceManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/JSBigAbiString.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/JSBigAbiString.h (100%) rename vnext/{ReactWindowsCore => Shared}/LayoutAnimation.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/LayoutAnimation.h (100%) rename vnext/{ReactWindowsCore => Shared}/Logging.h (100%) rename vnext/{ReactWindowsCore => Shared}/MemoryMappedBuffer.h (100%) rename vnext/{ReactWindowsCore => Shared}/MemoryTracker.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/MemoryTracker.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/AsyncStorageModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/ExceptionsManagerModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/ExceptionsManagerModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/I18nModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/I18nModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/PlatformConstantsModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/PlatformConstantsModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/SourceCodeModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/SourceCodeModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/StatusBarManagerModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/StatusBarManagerModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/UIManagerModule.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/UIManagerModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/Modules/WebSocketModule.h (100%) rename vnext/{ReactWindowsCore => Shared}/NativeModuleProvider.h (100%) rename vnext/{ReactWindowsCore => Shared}/OInstance.h (100%) rename vnext/{ReactWindowsCore => Shared}/Pch/pch.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Pch/pch.h (100%) rename vnext/{ReactWindowsCore => Shared}/ShadowNode.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/ShadowNode.h (100%) rename vnext/{ReactWindowsCore => Shared}/ShadowNodeRegistry.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/ShadowNodeRegistry.h (100%) rename vnext/{ReactWindowsCore => Shared}/Tracing.h (100%) rename vnext/{ReactWindowsCore => Shared}/TurboModuleManager.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/TurboModuleManager.h (100%) rename vnext/{ReactWindowsCore => Shared}/TurboModuleRegistry.h (100%) rename vnext/{ReactWindowsCore => Shared}/Utils.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/Utils.h (100%) rename vnext/{ReactWindowsCore => Shared}/V8JSIRuntimeHolder.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/V8JSIRuntimeHolder.h (100%) rename vnext/{ReactWindowsCore => Shared}/ViewManager.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/WebSocketJSExecutorFactory.h (100%) rename vnext/{ReactWindowsCore => Shared}/WinRTWebSocketResource.cpp (99%) rename vnext/{ReactWindowsCore => Shared}/WinRTWebSocketResource.h (100%) rename vnext/{ReactWindowsCore => Shared}/cdebug.cpp (100%) rename vnext/{ReactWindowsCore => Shared}/etw/build.bat (100%) rename vnext/{ReactWindowsCore => Shared}/etw/react_native_windows.h (100%) rename vnext/{ReactWindowsCore => Shared}/etw/react_native_windows.man (100%) rename vnext/{ReactWindowsCore => Shared}/etw/react_native_windows_etw_res.dll (100%) rename vnext/{ReactWindowsCore => Shared}/etw/register.bat (100%) rename vnext/{ReactWindowsCore => Shared}/targetver.h (100%) rename vnext/{ReactWindowsCore => Shared}/tracing/fbsystrace.h (100%) rename vnext/{ReactWindowsCore => Shared}/tracing/tracing.cpp (100%) diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index 9215c330eb3..08a9e632644 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace winrt::Microsoft::React; diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index a44671c4fd1..68d60d3b46f 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -43,7 +43,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(IncludePath) true diff --git a/vnext/Desktop/ABI/MemoryTracker.h b/vnext/Desktop/ABI/MemoryTracker.h index 1f09b8bae1f..527505341d2 100644 --- a/vnext/Desktop/ABI/MemoryTracker.h +++ b/vnext/Desktop/ABI/MemoryTracker.h @@ -1,7 +1,7 @@ #pragma once #include "Microsoft.React.MemoryTracker.g.h" -#include +#include namespace winrt::Microsoft::React::implementation { struct MemoryTracker : MemoryTrackerT { diff --git a/vnext/Desktop/Modules/WebSocketModule.cpp b/vnext/Desktop/Modules/WebSocketModule.cpp index 6ac369f22f0..f313ac37ddd 100644 --- a/vnext/Desktop/Modules/WebSocketModule.cpp +++ b/vnext/Desktop/Modules/WebSocketModule.cpp @@ -7,7 +7,7 @@ #include #include -#include "../ReactWindowsCore/Utils.h" +#include #include "Unicode.h" using namespace facebook::xplat; diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index edcc9770a2b..44703808edc 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -43,6 +43,7 @@ 2 true true + false true @@ -67,7 +68,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\Shared\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) true @@ -92,13 +93,13 @@ %(PreprocessorDefinitions) %(AdditionalIncludeDirectories);"$(ReactNativeWindowsDir)Microsoft.ReactNative";"$(ReactNativeWindowsDir)build\$(Platform)\$(Configuration)\Microsoft.ReactNative\Generated Files" - %(AdditionalOptions) /Zc:strictStrings /bigobj + %(AdditionalOptions) /Zc:strictStrings /bigobj /await Use pch.h pch.h - Shlwapi.lib;%(AdditionalDependencies) + %(AdditionalDependencies);Shlwapi.lib;winsqlite3.lib -minpdbpathlen:256 @@ -218,9 +219,6 @@ {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - {11C084A3-A57C-4296-A679-CAC17B603144} - diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index 1023d7466b2..0761d87f56a 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -47,7 +47,7 @@ - $(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(IncludePath);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(FollyDir) + $(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(IncludePath);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(FollyDir) diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index c51a6f46a48..8da01bd81d1 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -30,7 +30,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)\Shared\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) true diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj index 58788a35444..d31a2791d41 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -43,7 +43,7 @@ - $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Chakra;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)ReactWindowsCore;$(IncludePath) + $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Chakra;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Shared;$(IncludePath) true diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 04afef68f9e..99ffc9c8630 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -313,6 +313,7 @@ + @@ -487,6 +488,7 @@ Code + @@ -635,9 +637,6 @@ {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - - {11c084a3-a57c-4296-a679-cac17b603144} - diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters index 792a2978e44..9c713f93a30 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters @@ -92,9 +92,6 @@ Modules - - Modules - Modules @@ -273,9 +270,6 @@ Modules - - Modules - Modules @@ -323,6 +317,10 @@ Views + + + Modules + @@ -616,9 +614,6 @@ Modules - - Modules - Modules @@ -681,6 +676,10 @@ Views + + + Modules + diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp b/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp rename to vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h b/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h rename to vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index a0e57180bbd..e5c0c535eb8 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -90,7 +90,7 @@ $(ReactNativeDir)\ReactCommon\callinvoker; $(ReactNativeDir)\ReactCommon\jsiexecutor; $(FollyDir);$(ReactNativeWindowsDir)stubs; - $(ReactNativeWindowsDir)\ReactWindowsCore\tracing; + $(ReactNativeWindowsDir)\Shared\tracing; %(AdditionalIncludeDirectories); _WIN32;_CRT_SECURE_NO_WARNINGS;FOLLY_NO_CONFIG;NOMINMAX;RN_EXPORT=;JSI_EXPORT=;WIN32;_WINDLL;%(PreprocessorDefinitions) @@ -189,6 +189,8 @@ + + diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 6a4be7dc7cb..915c1e49c2f 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -9,13 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore-Desktop", "ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", "Desktop.DLL\React.Windows.Desktop.DLL.vcxproj", "{88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}" ProjectSection(ProjectDependencies) = postProject {74085F13-2DDE-45E5-A0CA-927AC9D0B953} = {74085F13-2DDE-45E5-A0CA-927AC9D0B953} @@ -24,9 +17,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.UnitTests", "Desktop.UnitTests\React.Windows.Desktop.UnitTests.vcxproj", "{96CD24DC-91C2-480A-BC26-EE2250DA80D7}" - ProjectSection(ProjectDependencies) = postProject - {11C084A3-A57C-4296-A679-CAC17B603144} = {11C084A3-A57C-4296-A679-CAC17B603144} - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EEE39425-10FD-4DB3-924E-D31CDA3DCC73}" ProjectSection(SolutionItems) = preProject @@ -119,17 +109,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mso", "Mso", "{4DE630AE-EC5 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.React.Core", "ReactWindowsCore\Microsoft.React.Core.vcxproj", "{3A1BE021-6877-481A-9C03-7C5A1224E897}" -EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 JSI\Shared\JSI.Shared.vcxitems*{17dd1b17-3094-40dd-9373-ac2497932eca}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 - Mso\Mso.vcxitems*{3a1be021-6877-481a-9c03-7c5a1224e897}*SharedItemsImports = 4 Chakra\Chakra.vcxitems*{6f354505-fe3a-4bd2-a9a6-d12bbf37a85c}*SharedItemsImports = 4 Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{95048601-c3dc-475f-adf8-7c0c764c10d5}*SharedItemsImports = 4 @@ -171,18 +156,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 @@ -315,18 +288,6 @@ Global {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.ActiveCfg = Debug|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.Build.0 = Debug|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.ActiveCfg = Debug|x64 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.Build.0 = Debug|x64 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.ActiveCfg = Debug|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.Build.0 = Debug|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.ActiveCfg = Release|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.Build.0 = Release|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.ActiveCfg = Release|x64 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.Build.0 = Release|x64 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.ActiveCfg = Release|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/ReactWindowsCore/AbiSafe.h b/vnext/Shared/AbiSafe.h similarity index 100% rename from vnext/ReactWindowsCore/AbiSafe.h rename to vnext/Shared/AbiSafe.h diff --git a/vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.cpp b/vnext/Shared/AsyncStorage/AsyncStorageManager.cpp similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.cpp rename to vnext/Shared/AsyncStorage/AsyncStorageManager.cpp diff --git a/vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.h b/vnext/Shared/AsyncStorage/AsyncStorageManager.h similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.h rename to vnext/Shared/AsyncStorage/AsyncStorageManager.h diff --git a/vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.cpp b/vnext/Shared/AsyncStorage/FollyDynamicConverter.cpp similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.cpp rename to vnext/Shared/AsyncStorage/FollyDynamicConverter.cpp diff --git a/vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.h b/vnext/Shared/AsyncStorage/FollyDynamicConverter.h similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.h rename to vnext/Shared/AsyncStorage/FollyDynamicConverter.h diff --git a/vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.cpp b/vnext/Shared/AsyncStorage/KeyValueStorage.cpp similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.cpp rename to vnext/Shared/AsyncStorage/KeyValueStorage.cpp diff --git a/vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.h b/vnext/Shared/AsyncStorage/KeyValueStorage.h similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.h rename to vnext/Shared/AsyncStorage/KeyValueStorage.h diff --git a/vnext/ReactWindowsCore/AsyncStorageModule.h b/vnext/Shared/AsyncStorageModule.h similarity index 100% rename from vnext/ReactWindowsCore/AsyncStorageModule.h rename to vnext/Shared/AsyncStorageModule.h diff --git a/vnext/ReactWindowsCore/BaseScriptStoreImpl.cpp b/vnext/Shared/BaseScriptStoreImpl.cpp similarity index 100% rename from vnext/ReactWindowsCore/BaseScriptStoreImpl.cpp rename to vnext/Shared/BaseScriptStoreImpl.cpp diff --git a/vnext/ReactWindowsCore/BaseScriptStoreImpl.h b/vnext/Shared/BaseScriptStoreImpl.h similarity index 100% rename from vnext/ReactWindowsCore/BaseScriptStoreImpl.h rename to vnext/Shared/BaseScriptStoreImpl.h diff --git a/vnext/ReactWindowsCore/BatchingMessageQueueThread.h b/vnext/Shared/BatchingMessageQueueThread.h similarity index 100% rename from vnext/ReactWindowsCore/BatchingMessageQueueThread.h rename to vnext/Shared/BatchingMessageQueueThread.h diff --git a/vnext/ReactWindowsCore/ChakraRuntimeHolder.cpp b/vnext/Shared/ChakraRuntimeHolder.cpp similarity index 100% rename from vnext/ReactWindowsCore/ChakraRuntimeHolder.cpp rename to vnext/Shared/ChakraRuntimeHolder.cpp diff --git a/vnext/ReactWindowsCore/ChakraRuntimeHolder.h b/vnext/Shared/ChakraRuntimeHolder.h similarity index 100% rename from vnext/ReactWindowsCore/ChakraRuntimeHolder.h rename to vnext/Shared/ChakraRuntimeHolder.h diff --git a/vnext/ReactWindowsCore/CreateModules.h b/vnext/Shared/CreateModules.h similarity index 100% rename from vnext/ReactWindowsCore/CreateModules.h rename to vnext/Shared/CreateModules.h diff --git a/vnext/ReactWindowsCore/CxxMessageQueue.cpp b/vnext/Shared/CxxMessageQueue.cpp similarity index 100% rename from vnext/ReactWindowsCore/CxxMessageQueue.cpp rename to vnext/Shared/CxxMessageQueue.cpp diff --git a/vnext/ReactWindowsCore/CxxMessageQueue.h b/vnext/Shared/CxxMessageQueue.h similarity index 100% rename from vnext/ReactWindowsCore/CxxMessageQueue.h rename to vnext/Shared/CxxMessageQueue.h diff --git a/vnext/ReactWindowsCore/DevServerHelper.h b/vnext/Shared/DevServerHelper.h similarity index 100% rename from vnext/ReactWindowsCore/DevServerHelper.h rename to vnext/Shared/DevServerHelper.h diff --git a/vnext/ReactWindowsCore/DevSettings.h b/vnext/Shared/DevSettings.h similarity index 100% rename from vnext/ReactWindowsCore/DevSettings.h rename to vnext/Shared/DevSettings.h diff --git a/vnext/ReactWindowsCore/HermesRuntimeHolder.cpp b/vnext/Shared/HermesRuntimeHolder.cpp similarity index 100% rename from vnext/ReactWindowsCore/HermesRuntimeHolder.cpp rename to vnext/Shared/HermesRuntimeHolder.cpp diff --git a/vnext/ReactWindowsCore/HermesRuntimeHolder.h b/vnext/Shared/HermesRuntimeHolder.h similarity index 100% rename from vnext/ReactWindowsCore/HermesRuntimeHolder.h rename to vnext/Shared/HermesRuntimeHolder.h diff --git a/vnext/ReactWindowsCore/IDevSupportManager.h b/vnext/Shared/IDevSupportManager.h similarity index 100% rename from vnext/ReactWindowsCore/IDevSupportManager.h rename to vnext/Shared/IDevSupportManager.h diff --git a/vnext/ReactWindowsCore/IHttpResource.h b/vnext/Shared/IHttpResource.h similarity index 100% rename from vnext/ReactWindowsCore/IHttpResource.h rename to vnext/Shared/IHttpResource.h diff --git a/vnext/ReactWindowsCore/INativeUIManager.h b/vnext/Shared/INativeUIManager.h similarity index 100% rename from vnext/ReactWindowsCore/INativeUIManager.h rename to vnext/Shared/INativeUIManager.h diff --git a/vnext/ReactWindowsCore/IReactRootView.h b/vnext/Shared/IReactRootView.h similarity index 100% rename from vnext/ReactWindowsCore/IReactRootView.h rename to vnext/Shared/IReactRootView.h diff --git a/vnext/ReactWindowsCore/IRedBoxHandler.h b/vnext/Shared/IRedBoxHandler.h similarity index 100% rename from vnext/ReactWindowsCore/IRedBoxHandler.h rename to vnext/Shared/IRedBoxHandler.h diff --git a/vnext/ReactWindowsCore/IUIManager.h b/vnext/Shared/IUIManager.h similarity index 100% rename from vnext/ReactWindowsCore/IUIManager.h rename to vnext/Shared/IUIManager.h diff --git a/vnext/ReactWindowsCore/IWebSocketResource.h b/vnext/Shared/IWebSocketResource.h similarity index 100% rename from vnext/ReactWindowsCore/IWebSocketResource.h rename to vnext/Shared/IWebSocketResource.h diff --git a/vnext/ReactWindowsCore/InstanceManager.h b/vnext/Shared/InstanceManager.h similarity index 100% rename from vnext/ReactWindowsCore/InstanceManager.h rename to vnext/Shared/InstanceManager.h diff --git a/vnext/ReactWindowsCore/JSBigAbiString.cpp b/vnext/Shared/JSBigAbiString.cpp similarity index 100% rename from vnext/ReactWindowsCore/JSBigAbiString.cpp rename to vnext/Shared/JSBigAbiString.cpp diff --git a/vnext/ReactWindowsCore/JSBigAbiString.h b/vnext/Shared/JSBigAbiString.h similarity index 100% rename from vnext/ReactWindowsCore/JSBigAbiString.h rename to vnext/Shared/JSBigAbiString.h diff --git a/vnext/ReactWindowsCore/LayoutAnimation.cpp b/vnext/Shared/LayoutAnimation.cpp similarity index 100% rename from vnext/ReactWindowsCore/LayoutAnimation.cpp rename to vnext/Shared/LayoutAnimation.cpp diff --git a/vnext/ReactWindowsCore/LayoutAnimation.h b/vnext/Shared/LayoutAnimation.h similarity index 100% rename from vnext/ReactWindowsCore/LayoutAnimation.h rename to vnext/Shared/LayoutAnimation.h diff --git a/vnext/ReactWindowsCore/Logging.h b/vnext/Shared/Logging.h similarity index 100% rename from vnext/ReactWindowsCore/Logging.h rename to vnext/Shared/Logging.h diff --git a/vnext/ReactWindowsCore/MemoryMappedBuffer.h b/vnext/Shared/MemoryMappedBuffer.h similarity index 100% rename from vnext/ReactWindowsCore/MemoryMappedBuffer.h rename to vnext/Shared/MemoryMappedBuffer.h diff --git a/vnext/ReactWindowsCore/MemoryTracker.cpp b/vnext/Shared/MemoryTracker.cpp similarity index 100% rename from vnext/ReactWindowsCore/MemoryTracker.cpp rename to vnext/Shared/MemoryTracker.cpp diff --git a/vnext/ReactWindowsCore/MemoryTracker.h b/vnext/Shared/MemoryTracker.h similarity index 100% rename from vnext/ReactWindowsCore/MemoryTracker.h rename to vnext/Shared/MemoryTracker.h diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModule.cpp b/vnext/Shared/Modules/AsyncStorageModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/AsyncStorageModule.cpp rename to vnext/Shared/Modules/AsyncStorageModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.cpp b/vnext/Shared/Modules/ExceptionsManagerModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.cpp rename to vnext/Shared/Modules/ExceptionsManagerModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.h b/vnext/Shared/Modules/ExceptionsManagerModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.h rename to vnext/Shared/Modules/ExceptionsManagerModule.h diff --git a/vnext/ReactWindowsCore/Modules/I18nModule.cpp b/vnext/Shared/Modules/I18nModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/I18nModule.cpp rename to vnext/Shared/Modules/I18nModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/I18nModule.h b/vnext/Shared/Modules/I18nModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/I18nModule.h rename to vnext/Shared/Modules/I18nModule.h diff --git a/vnext/ReactWindowsCore/Modules/PlatformConstantsModule.cpp b/vnext/Shared/Modules/PlatformConstantsModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/PlatformConstantsModule.cpp rename to vnext/Shared/Modules/PlatformConstantsModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/PlatformConstantsModule.h b/vnext/Shared/Modules/PlatformConstantsModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/PlatformConstantsModule.h rename to vnext/Shared/Modules/PlatformConstantsModule.h diff --git a/vnext/ReactWindowsCore/Modules/SourceCodeModule.cpp b/vnext/Shared/Modules/SourceCodeModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/SourceCodeModule.cpp rename to vnext/Shared/Modules/SourceCodeModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/SourceCodeModule.h b/vnext/Shared/Modules/SourceCodeModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/SourceCodeModule.h rename to vnext/Shared/Modules/SourceCodeModule.h diff --git a/vnext/ReactWindowsCore/Modules/StatusBarManagerModule.cpp b/vnext/Shared/Modules/StatusBarManagerModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/StatusBarManagerModule.cpp rename to vnext/Shared/Modules/StatusBarManagerModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/StatusBarManagerModule.h b/vnext/Shared/Modules/StatusBarManagerModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/StatusBarManagerModule.h rename to vnext/Shared/Modules/StatusBarManagerModule.h diff --git a/vnext/ReactWindowsCore/Modules/UIManagerModule.cpp b/vnext/Shared/Modules/UIManagerModule.cpp similarity index 100% rename from vnext/ReactWindowsCore/Modules/UIManagerModule.cpp rename to vnext/Shared/Modules/UIManagerModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/UIManagerModule.h b/vnext/Shared/Modules/UIManagerModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/UIManagerModule.h rename to vnext/Shared/Modules/UIManagerModule.h diff --git a/vnext/ReactWindowsCore/Modules/WebSocketModule.h b/vnext/Shared/Modules/WebSocketModule.h similarity index 100% rename from vnext/ReactWindowsCore/Modules/WebSocketModule.h rename to vnext/Shared/Modules/WebSocketModule.h diff --git a/vnext/ReactWindowsCore/NativeModuleProvider.h b/vnext/Shared/NativeModuleProvider.h similarity index 100% rename from vnext/ReactWindowsCore/NativeModuleProvider.h rename to vnext/Shared/NativeModuleProvider.h diff --git a/vnext/ReactWindowsCore/OInstance.h b/vnext/Shared/OInstance.h similarity index 100% rename from vnext/ReactWindowsCore/OInstance.h rename to vnext/Shared/OInstance.h diff --git a/vnext/ReactWindowsCore/Pch/pch.cpp b/vnext/Shared/Pch/pch.cpp similarity index 100% rename from vnext/ReactWindowsCore/Pch/pch.cpp rename to vnext/Shared/Pch/pch.cpp diff --git a/vnext/ReactWindowsCore/Pch/pch.h b/vnext/Shared/Pch/pch.h similarity index 100% rename from vnext/ReactWindowsCore/Pch/pch.h rename to vnext/Shared/Pch/pch.h diff --git a/vnext/ReactWindowsCore/ShadowNode.cpp b/vnext/Shared/ShadowNode.cpp similarity index 100% rename from vnext/ReactWindowsCore/ShadowNode.cpp rename to vnext/Shared/ShadowNode.cpp diff --git a/vnext/ReactWindowsCore/ShadowNode.h b/vnext/Shared/ShadowNode.h similarity index 100% rename from vnext/ReactWindowsCore/ShadowNode.h rename to vnext/Shared/ShadowNode.h diff --git a/vnext/ReactWindowsCore/ShadowNodeRegistry.cpp b/vnext/Shared/ShadowNodeRegistry.cpp similarity index 100% rename from vnext/ReactWindowsCore/ShadowNodeRegistry.cpp rename to vnext/Shared/ShadowNodeRegistry.cpp diff --git a/vnext/ReactWindowsCore/ShadowNodeRegistry.h b/vnext/Shared/ShadowNodeRegistry.h similarity index 100% rename from vnext/ReactWindowsCore/ShadowNodeRegistry.h rename to vnext/Shared/ShadowNodeRegistry.h diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index 4cbea1955c9..e8dd6ae7db0 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -15,13 +15,97 @@ + + + + + + + + + true + + + + + + + + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index b740492c183..5998e7d3696 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -4,19 +4,285 @@ + - AsyncStorage + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\AsyncStorage + + + Source Files\tracing + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files\Modules + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files - - + + {87359046-466f-4c83-856e-1755bcb1c066} + + + {d297c8b2-b89e-46e9-8d7c-ee4766384cb5} + + {83a6224b-fdbc-49fa-83d4-c9010f17bffa} + + {ee633764-9967-4233-8848-81edf1488790} + + + {5862fbd1-2e67-4c90-9e58-24a66d71aec4} + + + {37d57028-146d-45f3-a56d-2ce7625a3449} + + + {da7f5a49-e3fb-46c3-906d-be42b8b651f7} + + + {87b365df-267b-4c00-860a-53d129a65a4e} + + + {6008bddc-9f23-4190-9eea-662fb1ab2467} + + + {6d6b7412-d407-4ee3-be2a-addd9dba140a} + + + {5e38b06d-5bcb-437b-9a9b-e787e37ef3ee} + - AsyncStorage + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\AsyncStorage + + + Header Files\etw + + + Header Files\Modules + + + Header Files\Modules + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\Modules + + + Header Files\tracing + + + Header Files\Pch + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + + + Source Files\etw + \ No newline at end of file diff --git a/vnext/ReactWindowsCore/Tracing.h b/vnext/Shared/Tracing.h similarity index 100% rename from vnext/ReactWindowsCore/Tracing.h rename to vnext/Shared/Tracing.h diff --git a/vnext/ReactWindowsCore/TurboModuleManager.cpp b/vnext/Shared/TurboModuleManager.cpp similarity index 100% rename from vnext/ReactWindowsCore/TurboModuleManager.cpp rename to vnext/Shared/TurboModuleManager.cpp diff --git a/vnext/ReactWindowsCore/TurboModuleManager.h b/vnext/Shared/TurboModuleManager.h similarity index 100% rename from vnext/ReactWindowsCore/TurboModuleManager.h rename to vnext/Shared/TurboModuleManager.h diff --git a/vnext/ReactWindowsCore/TurboModuleRegistry.h b/vnext/Shared/TurboModuleRegistry.h similarity index 100% rename from vnext/ReactWindowsCore/TurboModuleRegistry.h rename to vnext/Shared/TurboModuleRegistry.h diff --git a/vnext/ReactWindowsCore/Utils.cpp b/vnext/Shared/Utils.cpp similarity index 100% rename from vnext/ReactWindowsCore/Utils.cpp rename to vnext/Shared/Utils.cpp diff --git a/vnext/ReactWindowsCore/Utils.h b/vnext/Shared/Utils.h similarity index 100% rename from vnext/ReactWindowsCore/Utils.h rename to vnext/Shared/Utils.h diff --git a/vnext/ReactWindowsCore/V8JSIRuntimeHolder.cpp b/vnext/Shared/V8JSIRuntimeHolder.cpp similarity index 100% rename from vnext/ReactWindowsCore/V8JSIRuntimeHolder.cpp rename to vnext/Shared/V8JSIRuntimeHolder.cpp diff --git a/vnext/ReactWindowsCore/V8JSIRuntimeHolder.h b/vnext/Shared/V8JSIRuntimeHolder.h similarity index 100% rename from vnext/ReactWindowsCore/V8JSIRuntimeHolder.h rename to vnext/Shared/V8JSIRuntimeHolder.h diff --git a/vnext/ReactWindowsCore/ViewManager.cpp b/vnext/Shared/ViewManager.cpp similarity index 100% rename from vnext/ReactWindowsCore/ViewManager.cpp rename to vnext/Shared/ViewManager.cpp diff --git a/vnext/ReactWindowsCore/WebSocketJSExecutorFactory.h b/vnext/Shared/WebSocketJSExecutorFactory.h similarity index 100% rename from vnext/ReactWindowsCore/WebSocketJSExecutorFactory.h rename to vnext/Shared/WebSocketJSExecutorFactory.h diff --git a/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp b/vnext/Shared/WinRTWebSocketResource.cpp similarity index 99% rename from vnext/ReactWindowsCore/WinRTWebSocketResource.cpp rename to vnext/Shared/WinRTWebSocketResource.cpp index b54dfd69eaa..361f706fdb1 100644 --- a/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp +++ b/vnext/Shared/WinRTWebSocketResource.cpp @@ -8,6 +8,7 @@ #include // Windows API +#include #include #include diff --git a/vnext/ReactWindowsCore/WinRTWebSocketResource.h b/vnext/Shared/WinRTWebSocketResource.h similarity index 100% rename from vnext/ReactWindowsCore/WinRTWebSocketResource.h rename to vnext/Shared/WinRTWebSocketResource.h diff --git a/vnext/ReactWindowsCore/cdebug.cpp b/vnext/Shared/cdebug.cpp similarity index 100% rename from vnext/ReactWindowsCore/cdebug.cpp rename to vnext/Shared/cdebug.cpp diff --git a/vnext/ReactWindowsCore/etw/build.bat b/vnext/Shared/etw/build.bat similarity index 100% rename from vnext/ReactWindowsCore/etw/build.bat rename to vnext/Shared/etw/build.bat diff --git a/vnext/ReactWindowsCore/etw/react_native_windows.h b/vnext/Shared/etw/react_native_windows.h similarity index 100% rename from vnext/ReactWindowsCore/etw/react_native_windows.h rename to vnext/Shared/etw/react_native_windows.h diff --git a/vnext/ReactWindowsCore/etw/react_native_windows.man b/vnext/Shared/etw/react_native_windows.man similarity index 100% rename from vnext/ReactWindowsCore/etw/react_native_windows.man rename to vnext/Shared/etw/react_native_windows.man diff --git a/vnext/ReactWindowsCore/etw/react_native_windows_etw_res.dll b/vnext/Shared/etw/react_native_windows_etw_res.dll similarity index 100% rename from vnext/ReactWindowsCore/etw/react_native_windows_etw_res.dll rename to vnext/Shared/etw/react_native_windows_etw_res.dll diff --git a/vnext/ReactWindowsCore/etw/register.bat b/vnext/Shared/etw/register.bat similarity index 100% rename from vnext/ReactWindowsCore/etw/register.bat rename to vnext/Shared/etw/register.bat diff --git a/vnext/ReactWindowsCore/targetver.h b/vnext/Shared/targetver.h similarity index 100% rename from vnext/ReactWindowsCore/targetver.h rename to vnext/Shared/targetver.h diff --git a/vnext/ReactWindowsCore/tracing/fbsystrace.h b/vnext/Shared/tracing/fbsystrace.h similarity index 100% rename from vnext/ReactWindowsCore/tracing/fbsystrace.h rename to vnext/Shared/tracing/fbsystrace.h diff --git a/vnext/ReactWindowsCore/tracing/tracing.cpp b/vnext/Shared/tracing/tracing.cpp similarity index 100% rename from vnext/ReactWindowsCore/tracing/tracing.cpp rename to vnext/Shared/tracing/tracing.cpp diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index 16787e7827c..4ec21c09c5e 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -38,7 +38,7 @@ - $(IncludePath) + $(ReactNativeWindowsDir)Shared;$(IncludePath) From 474e9029a3a97c75bc0e07c370cb5cd2fe3e7509 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 17:42:01 -0700 Subject: [PATCH 12/38] Removed /ReactWindowsCore/Microsoft.React.Core --- .../Microsoft.React.Core.vcxproj | 248 --------------- .../Microsoft.React.Core.vcxproj.filters | 291 ------------------ 2 files changed, 539 deletions(-) delete mode 100644 vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj delete mode 100644 vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj deleted file mode 100644 index f7a96d8f4ae..00000000000 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - Debug - ARM - - - Release - ARM - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - true - {3A1BE021-6877-481A-9C03-7C5A1224E897} - Microsoft.React.Core - - - - - - - - StaticLibrary - - - - - - - - - - - - - - - - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) - true - - - - - - - - Use - pch.h - pch.h - - - - - - - - - - - - - - - - - Designer - - - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters b/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters deleted file mode 100644 index 9d5eaa786fd..00000000000 --- a/vnext/ReactWindowsCore/Microsoft.React.Core.vcxproj.filters +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - Source Files\etw - - - Source Files\etw - - - Source Files\etw - - - Source Files\etw - - - - - {43517427-5ece-43e3-9dda-865bdb40bcc1} - - - {d7ad5f7c-2bcc-4454-86ff-b92813a229df} - - - {3c118f1c-a23a-4cb1-9104-de7cfaa4a98e} - - - {ff877a08-95e8-4169-b795-2f94171268d8} - - - {d290d606-a201-43a4-b495-05c6b71976f2} - - - {5b5ff9db-d99c-46b2-843e-1ce3cb0d84b5} - - - {70ddd865-a745-4c99-9fd5-9b52b824710b} - - - {4c7cb432-9569-4af6-9da8-b1630db496fd} - - - {f530aebd-19f2-4400-be7d-140a0abb136f} - - - {2e1cdfdf-f099-4e05-b0af-ac71f61f63ca} - - - {20798c96-77ba-460d-be48-5bb2d9337371} - - - {3fd9e345-176f-4508-bed4-28c4014bb6dd} - - - - - Source Files\Pch - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\tracing - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files\etw - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\tracing - - - Header Files\Pch - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file From 495260d29ee718553ee7c2d6ebac208f01d8e271 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 18:51:34 -0700 Subject: [PATCH 13/38] Updated paths in ReactUWP imports --- .../React.Windows.Desktop.DLL.vcxproj | 2 +- .../React.Windows.Desktop.UnitTests.vcxproj | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 2 +- vnext/JSI/Universal/JSI.Universal.vcxproj | 2 +- vnext/Microsoft.ReactNative.sln | 33 +++---------------- .../Microsoft.ReactNative.vcxproj | 5 ++- .../Microsoft.ReactNative.vcxproj.filters | 6 ++-- .../Modules/AsyncStorageModuleWin32.cpp | 2 +- .../Threading/BatchingQueueThread.h | 2 +- .../Threading/MessageQueueThreadFactory.h | 2 +- vnext/PropertySheets/ReactCommunity.cpp.props | 2 +- vnext/ReactUWP/Base/CoreNativeModules.h | 2 +- vnext/ReactUWP/Base/CoreUIManagers.cpp | 2 +- .../ReactUWP/Modules/DevSupportManagerUwp.cpp | 4 +-- .../{I18nModule.cpp => I18nModuleUwp.cpp} | 0 15 files changed, 22 insertions(+), 46 deletions(-) rename vnext/ReactUWP/Modules/{I18nModule.cpp => I18nModuleUwp.cpp} (100%) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 5376bcd160f..d22504c5f79 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -41,7 +41,7 @@ - $(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(IncludePath) + $(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon;$(IncludePath) true - - - - - - - x86-windows - x64-windows - arm-windows - arm64-windows - - - false - {11C084A3-A57C-4296-A679-CAC17B603145} - - - - Use - pch.h - false - true - - - REACTWINDOWS_BUILD; - NOMINMAX; - FOLLY_NO_CONFIG; - WIN32=0; - RN_EXPORT=; - CHAKRACORE; - %(PreprocessorDefinitions) - - - $(ReactNativeWindowsDir); - $(ReactNativeWindowsDir)Common; - $(ReactNativeWindowsDir)Shared; - $(ReactNativeWindowsDir)include\ReactWindowsCore; - $(ReactNativeDir)\ReactCommon; - $(ReactNativeDir)\ReactCommon\callinvoker; - $(JSI_Source); - $(ReactNativeWindowsDir)JSI\Shared; - $(ReactNativeWindowsDir)stubs; - $(FollyDir); - $(ReactNativeWindowsDir)\ReactWindowsCore\pch; - $(ReactNativeWindowsDir)\ReactWindowsCore\tracing; - $(ReactNativeWindowsDir)\Mso; - %(AdditionalIncludeDirectories) - - $(HERMES_Package)\installed\$(VcpkgTriplet)\include\;%(AdditionalIncludeDirectories) - /await %(AdditionalOptions) - false - - - false - false - - - $(HERMES_Package)\installed\$(VcpkgTriplet)\lib;%(AdditionalLibraryDirectories) - hermes.lib;%(AdditionalDependencies) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj deleted file mode 100644 index 5c753af0f91..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - {11C084A3-A57C-4296-A679-CAC17B603144} - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters deleted file mode 100644 index 580e25fe2cb..00000000000 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters +++ /dev/null @@ -1,285 +0,0 @@ - - - - - {06a27269-2c1f-418a-9e70-82d17deb7de2} - - - {32892a40-82db-4c1b-9390-5893f9ddbb0b} - - - {afc5d1fe-6d70-4040-a72b-036ffa74a2eb} - - - {81319f88-192e-40cf-bc1c-76a84bf37ccd} - - - {6e20d3aa-721b-4f62-a1aa-ec6af1a114fb} - - - {b8d1b3de-1573-4d49-a26f-99892413a797} - - - {efe7ad3d-598a-4633-a2b7-2de458833b88} - - - {2b4f6cca-9c7e-4bf1-9711-829006f0be1e} - - - {43770517-0df1-4cff-bd30-563b9d0f56e7} - - - {eae44522-b665-4bd2-85f2-8ca26f4ce15f} - - - {8b1364fc-cc9f-4ca9-834b-894849d8b487} - - - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files\AsyncStorage - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Modules - - - Source Files\Pch - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files\Tracing - - - Source Files\Modules - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files\AsyncStorage - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - etw - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files\Modules - - - Header Files - - - Header Files - - - Header Files\Pch - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\Tracing - - - Header Files\Modules - - - Header Files\Modules - - - - - etw - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config b/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config deleted file mode 100644 index 9d410408cf0..00000000000 --- a/vnext/ReactWindowsCore/packages.ReactWindowsCore-Desktop.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/vnext/ReactWindowsCore/packages.config b/vnext/ReactWindowsCore/packages.config deleted file mode 100644 index cdb7bb377d4..00000000000 --- a/vnext/ReactWindowsCore/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file From 79b8fca2b61c93b59413db4b1a4cdd198c5c3ace Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 18:53:06 -0700 Subject: [PATCH 15/38] clang format --- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 2 +- vnext/Desktop/ABI/NativeLogEventSource.cpp | 2 +- vnext/Desktop/Modules/WebSocketModule.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index 85aaa0fd802..67541edd32c 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -4,8 +4,8 @@ #include "pch.h" #include #include -#include #include +#include #include "ActivationFactory.h" #include "MessageQueueShim.h" diff --git a/vnext/Desktop/ABI/NativeLogEventSource.cpp b/vnext/Desktop/ABI/NativeLogEventSource.cpp index aa243fb5737..9c3f99c663e 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.cpp +++ b/vnext/Desktop/ABI/NativeLogEventSource.cpp @@ -33,4 +33,4 @@ void NativeLogEventSource::UninitializeLogging(uint32_t cookie) { assert(cookie == g_abiHandlerRegistrationCookie); g_abiHandler = nullptr; } -} // namespace winrt::facebook::react::implementation +} // namespace winrt::Microsoft::React::implementation diff --git a/vnext/Desktop/Modules/WebSocketModule.cpp b/vnext/Desktop/Modules/WebSocketModule.cpp index f313ac37ddd..e8dacdce206 100644 --- a/vnext/Desktop/Modules/WebSocketModule.cpp +++ b/vnext/Desktop/Modules/WebSocketModule.cpp @@ -5,9 +5,9 @@ #include +#include #include #include -#include #include "Unicode.h" using namespace facebook::xplat; From 2a05854b65e9b0062bcca87984c789f6cb32c575 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 19:02:21 -0700 Subject: [PATCH 16/38] Remove references to ReactWindowsCore projects --- packages/E2ETest/windows/ReactUWPTestApp.sln | 23 -------------- .../windows/SampleApps.sln | 23 -------------- .../playground/windows/playground-win32.sln | 19 ------------ packages/playground/windows/playground.sln | 31 ------------------- vnext/ReactWindows-Universal.sln | 25 --------------- vnext/layoutFilesForNuget.bat | 1 - vnext/package.json | 3 +- 7 files changed, 1 insertion(+), 124 deletions(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp.sln b/packages/E2ETest/windows/ReactUWPTestApp.sln index d9a745fa941..ce0f75e8a03 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp.sln +++ b/packages/E2ETest/windows/ReactUWPTestApp.sln @@ -10,11 +10,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" ProjectSection(SolutionItems) = preProject PropertySheets\ARM.props = PropertySheets\ARM.props @@ -41,7 +36,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Manag EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 ..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 @@ -92,22 +86,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.ActiveCfg = Debug|ARM {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.Build.0 = Debug|ARM {ABBB0407-0E82-486F-94CE-710900FCAADC}.Debug|ARM.Deploy.0 = Debug|ARM @@ -203,7 +181,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} - {11C084A3-A57C-4296-A679-CAC17B603144} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {AB7DB37D-898C-4BBC-9F2A-E043EC90C8F3} diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln index fa268b1004d..120f05548bf 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln @@ -16,11 +16,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\..\..\vnext\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" @@ -50,7 +45,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{47eec7f3-40d3-49ba-82c1-eaf103b54215}*SharedItemsImports = 4 ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 @@ -156,22 +150,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -275,7 +253,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} diff --git a/packages/playground/windows/playground-win32.sln b/packages/playground/windows/playground-win32.sln index 969d4742d16..fbec06c55dd 100644 --- a/packages/playground/windows/playground-win32.sln +++ b/packages/playground/windows/playground-win32.sln @@ -12,11 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\..\..\vnext\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" @@ -38,7 +33,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{8b88ffae-4dbc-49a2-afa5-d2477d4ad189}*SharedItemsImports = 4 @@ -102,18 +96,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 @@ -157,7 +139,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} diff --git a/packages/playground/windows/playground.sln b/packages/playground/windows/playground.sln index 62a9c082eae..f50430efee0 100644 --- a/packages/playground/windows/playground.sln +++ b/packages/playground/windows/playground.sln @@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\..\..\vne {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\..\..\vnext\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\..\..\vnext\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" @@ -43,7 +38,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6b6aa847-b32f-41ac-9d3b-48a8cdfa8ade}*SharedItemsImports = 4 @@ -156,30 +150,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x64.Build.0 = WinUI3|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x86.ActiveCfg = WinUI3|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.WinUI3|x86.Build.0 = WinUI3|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM.ActiveCfg = WinUI3|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM.Build.0 = WinUI3|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM64.ActiveCfg = WinUI3|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|ARM64.Build.0 = WinUI3|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x64.ActiveCfg = WinUI3|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x64.Build.0 = WinUI3|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x86.ActiveCfg = WinUI3|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.WinUI3|x86.Build.0 = WinUI3|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -259,7 +229,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 54461ce713d..c9c174eb78e 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -9,13 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore-UWP", "ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" ProjectSection(SolutionItems) = preProject PropertySheets\ARM.props = PropertySheets\ARM.props @@ -103,8 +96,6 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 @@ -166,22 +157,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM64.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/vnext/layoutFilesForNuget.bat b/vnext/layoutFilesForNuget.bat index 31792b5de33..9b0750b6114 100644 --- a/vnext/layoutFilesForNuget.bat +++ b/vnext/layoutFilesForNuget.bat @@ -56,7 +56,6 @@ mkdir %DESTROOT%\inc\ReactUWP >nul 2>&1 %COPYCMD% %RNROOT%\ReactCommon\jsi %DESTROOT%\inc\jsi %COPYCMD% %SRCROOT%\stubs %DESTROOT%\inc\stubs %COPYCMD% %SRCROOT%\Desktop\*.h %DESTROOT%\inc\ReactWin32 -%COPYCMD% %SRCROOT%\ReactWindowsCore\*.h %DESTROOT%\inc\ReactWindowsCore %COPYCMD% %SRCROOT%\ReactUWP\*.h %DESTROOT%\inc\ReactUWP %COPYCMD% %SRCROOT%\include %DESTROOT%\inc\include %COPYCMD% %SRCROOT%\Test\*.h %DESTROOT%\inc\Test diff --git a/vnext/package.json b/vnext/package.json index 2cd6498f1f3..dcfe40ddfae 100644 --- a/vnext/package.json +++ b/vnext/package.json @@ -91,7 +91,6 @@ "/PropertySheets", "/ReactCommon", "/ReactUWP", - "/ReactWindowsCore", "/Scripts", "/Shared", "/stubs", @@ -115,4 +114,4 @@ "/typings-index.js.map", "/rn-get-polyfills.js" ] -} +} \ No newline at end of file From 432daf055c6f6f09b479d7b0686b940019ffeda1 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 19:03:03 -0700 Subject: [PATCH 17/38] Change files --- ...eact-native-windows-2020-05-26-19-03-03-fixcommon.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-05-26-19-03-03-fixcommon.json diff --git a/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json b/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json new file mode 100644 index 00000000000..1d09f47fc32 --- /dev/null +++ b/change/react-native-windows-2020-05-26-19-03-03-fixcommon.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Remove references to ReactWindowsCore projects", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-27T02:03:03.319Z" +} From c3ac611ec49adc47ad0237dbbf06c5dbb8ed5007 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 19:21:59 -0700 Subject: [PATCH 18/38] Updated stale namespace --- vnext/Desktop.ABITests/SimpleMessageQueue.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vnext/Desktop.ABITests/SimpleMessageQueue.cpp b/vnext/Desktop.ABITests/SimpleMessageQueue.cpp index 8446a868cf4..ff4a3ad844f 100644 --- a/vnext/Desktop.ABITests/SimpleMessageQueue.cpp +++ b/vnext/Desktop.ABITests/SimpleMessageQueue.cpp @@ -6,11 +6,11 @@ namespace ABITests { -void SimpleMessageQueue::Run(::winrt::facebook::react::QueueItem const &item) const { +void SimpleMessageQueue::Run(::winrt::Microsoft::React::QueueItem const &item) const { m_items.push(item); } -void SimpleMessageQueue::RunSync(::winrt::facebook::react::QueueItem const &item) const { +void SimpleMessageQueue::RunSync(::winrt::Microsoft::React::QueueItem const &item) const { item(); } From 420ce3cc37b80526b9b7be3f3fbfed8baf4b2e0a Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 20:29:53 -0700 Subject: [PATCH 19/38] Drop RNWCore from Layout-Headers.ps1 --- vnext/Scripts/Tfs/Layout-Headers.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vnext/Scripts/Tfs/Layout-Headers.ps1 b/vnext/Scripts/Tfs/Layout-Headers.ps1 index 85a671d4f22..5a8bdc9921b 100644 --- a/vnext/Scripts/Tfs/Layout-Headers.ps1 +++ b/vnext/Scripts/Tfs/Layout-Headers.ps1 @@ -57,9 +57,9 @@ Get-ChildItem -Path $ReactWindowsRoot\stubs -Name -Recurse -Include $patterns | } # React.Windows.Core headers -Get-ChildItem -Path $ReactWindowsRoot\ReactWindowsCore -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` - -Path $ReactWindowsRoot\ReactWindowsCore\$_ ` - -Destination (New-Item -ItemType Directory $TargetRoot\inc\ReactWindowsCore\$(Split-Path $_) -Force) ` +Get-ChildItem -Path $ReactWindowsRoot\Shared -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` + -Path $ReactWindowsRoot\Shared\$_ ` + -Destination (New-Item -ItemType Directory $TargetRoot\inc\Shared\$(Split-Path $_) -Force) ` -Force } From 3b0547bcb257ea806f25541f8de24d194854b98b Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 20:35:39 -0700 Subject: [PATCH 20/38] Remove remaining RNWCore VCXPROJ references --- docs/project-structure.md | 13 ++++------- .../templates/cpp/proj/MyApp.sln | 22 ------------------- .../templates/cs/proj/MyApp.sln | 18 --------------- 3 files changed, 4 insertions(+), 49 deletions(-) diff --git a/docs/project-structure.md b/docs/project-structure.md index cf1c30fc369..71499f50f0b 100644 --- a/docs/project-structure.md +++ b/docs/project-structure.md @@ -23,7 +23,6 @@ Sample applications are not covered. - [Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.csproj](#Microsoft.ReactNative.Managed) - [Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems](#Microsoft.ReactNative.SharedManaged) - [ReactCommon\ReactCommon.vcxproj](#ReactCommon) -- [ReactWindowsCore\ReactWindowsCore.vcxproj](#ReactWindowsCore) - [Shared\Shared.vcxitems](#Shared) ## Common Projects @@ -32,10 +31,6 @@ Sample applications are not covered. *Static Library*
Functionality shared between React and JSI projects that do not depend on React or JSI functionality. -### ReactWindowsCore -*Static Library*
-Contains common functionality for both Desktop and Universal Windows variants. - ### Shared *Shared Items (no build artifact)*
Holds sources common to both Windows variants, that require different build configuration @@ -45,7 +40,7 @@ Holds sources common to both Windows variants, that require different build conf *Static Library*
React Native core, cross-platform C++ types and interfaces.
Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.59.9/ReactCommon. +See https://github.com/facebook/react-native/tree/v0.60.0/ReactCommon. ### Folly *Static Library*
@@ -79,9 +74,9 @@ Common framework for running out of process and/or full React instance testing. ### IntegrationTests (Node Project) *MSBuild Node project. For reading/editing purposes only (no build artifact)*
-Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.59.9/RNTester). +Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.60.0/RNTester). Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.59.9/IntegrationTests. +See https://github.com/facebook/react-native/tree/v0.60.0/IntegrationTests. ## Windows Desktop Projects @@ -126,4 +121,4 @@ The primary Windows Universal entry point and public API surface for React Nativ ### JSI.Universal *Static Library*
-Chakra based JSI::Runtime implementation. \ No newline at end of file +Chakra based JSI::Runtime implementation. diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln index 7cb1e156625..b3fa7ba9c78 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.sln @@ -15,11 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modu {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\node_modules\react-native-windows\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" - ProjectSection(ProjectDependencies) = postProject - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "..\node_modules\react-native-windows\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "..\node_modules\react-native-windows\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" @@ -123,22 +118,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -194,7 +173,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln index e5afcd89a31..c621b140192 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.sln @@ -12,7 +12,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "..\node_modu {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "..\node_modules\react-native-windows\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" ProjectSection(ProjectDependencies) = postProject {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection @@ -115,22 +114,6 @@ Global {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 @@ -202,7 +185,6 @@ Global GlobalSection(NestedProjects) = preSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {11C084A3-A57C-4296-A679-CAC17B603144} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {0CC28589-39E4-4288-B162-97B959F8B843} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} From f3d23db7334b203dc5f78f82759322e8f977c321 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 20:42:20 -0700 Subject: [PATCH 21/38] Update NUSPEC paths --- vnext/ReactUWP/Base/CoreNativeModules.cpp | 1 - vnext/Scripts/ReactWin32.nuspec | 36 +++++++++++------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/vnext/ReactUWP/Base/CoreNativeModules.cpp b/vnext/ReactUWP/Base/CoreNativeModules.cpp index e5edecb3e17..5d752e4ba85 100644 --- a/vnext/ReactUWP/Base/CoreNativeModules.cpp +++ b/vnext/ReactUWP/Base/CoreNativeModules.cpp @@ -21,7 +21,6 @@ #include #include -// ReactWindowsCore #include namespace react::uwp { diff --git a/vnext/Scripts/ReactWin32.nuspec b/vnext/Scripts/ReactWin32.nuspec index c54093c805e..df4c4a82bdc 100644 --- a/vnext/Scripts/ReactWin32.nuspec +++ b/vnext/Scripts/ReactWin32.nuspec @@ -29,23 +29,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -54,7 +54,7 @@ - + From ca9c1dcbe231358a5a84033c93eef321af52c0fe Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 21:17:13 -0700 Subject: [PATCH 22/38] Update directory properties --- vnext/Directory.Build.targets | 3 +++ vnext/PropertySheets/ReactDirectories.props | 15 +++++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 50daf51be20..1fd3b277357 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -11,6 +11,9 @@ + + + diff --git a/vnext/PropertySheets/ReactDirectories.props b/vnext/PropertySheets/ReactDirectories.props index f338975ec22..67e5449c251 100644 --- a/vnext/PropertySheets/ReactDirectories.props +++ b/vnext/PropertySheets/ReactDirectories.props @@ -15,14 +15,17 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native\package.json'))\node_modules\react-native\ + $(ReactNativeWindowsDir) + $([MSBuild]::NormalizeDirectory($(RootDir)\build)) + $([MSBuild]::NormalizeDirectory($(RootDir)\target)) - $(ReactNativeWindowsDir)build\$(Platform)\$(Configuration) - $(ReactNativeWindowsDir)build\x86\$(Configuration) - $(ReactNativeWindowsDir)target\$(Platform)\$(Configuration) - $(ReactNativeWindowsDir)target\x86\$(Configuration) + $(RootIntDir)\$(Platform)\$(Configuration) + $(RootIntDir)\x86\$(Configuration) + $(RootOutDir)\$(Platform)\$(Configuration) + $(RootOutDir)\x86\$(Configuration) - $(BaseIntDir)\$(ProjectName)\ - $(BaseOutDir)\$(ProjectName)\ + $([MSBuild]::NormalizeDirectory($(BaseIntDir)\$(ProjectName)\)) + $([MSBuild]::NormalizeDirectory($(BaseOutDir)\$(ProjectName)\)) $(IntDir)Generated Files\ $(IntDir)\react-native-patched\ From 151486545c3cec0858d5e7ab1f55dcec36f476ce Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 22:53:01 -0700 Subject: [PATCH 23/38] ..\.ado\ --- .ado/windows-vs-pr.yml | 8 ++++---- vnext/Microsoft.ReactNative.sln | 2 +- vnext/ReactWindows-Desktop.sln | 2 +- vnext/Shared/Shared.vcxitems | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 5bdccb68324..ee488b85082 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -160,7 +160,7 @@ jobs: - checkout: self clean: false submodules: false - + - template: templates/prepare-env.yml - task: NuGetCommand@2 @@ -209,7 +209,7 @@ jobs: - checkout: self clean: false submodules: false - + - template: templates/prepare-env.yml - task: NuGetCommand@2 @@ -298,7 +298,7 @@ jobs: - checkout: self clean: false submodules: false - + - template: templates/prepare-env.yml - task: NuGetCommand@2 @@ -364,7 +364,7 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: - testPlatformVersion: 16.3.0 + testPlatformVersion: 16.5.0 - template: templates/build-rnw.yml parameters: diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index 7867ed7d26a..293e811fcea 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -33,7 +33,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.React.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" EndProject diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index c29258348c9..9d2171f3f8a 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -71,7 +71,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLi PropertySheets\DynamicLibrary\x86.props = PropertySheets\DynamicLibrary\x86.props EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.React.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop", "Desktop\React.Windows.Desktop.vcxproj", "{95048601-C3DC-475F-ADF8-7C0C764C10D5}" EndProject diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index e8dd6ae7db0..37d6489d6b2 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -4,7 +4,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true {2049dbe9-8d13-42c9-ae4b-413ae38fffd0} - Microsoft.React.Shared + Microsoft.ReactNative.Shared From 0aa1179523b430f6411571052765c49585aec85b Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 23:28:33 -0700 Subject: [PATCH 24/38] Remove AsyncStorageModuleWin32 --- .../Modules/AsyncStorageModuleWin32.cpp | 492 ------------------ .../Modules/AsyncStorageModuleWin32.h | 75 --- vnext/ReactUWP/Base/CoreNativeModules.cpp | 3 +- 3 files changed, 1 insertion(+), 569 deletions(-) delete mode 100644 vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp delete mode 100644 vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h diff --git a/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp b/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp deleted file mode 100644 index f08358fdadb..00000000000 --- a/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.cpp +++ /dev/null @@ -1,492 +0,0 @@ -#include "pch.h" - -#include "AsyncStorageModuleWin32.h" -#include "AsyncStorageModuleWin32Config.h" - -#include - -/// Implements AsyncStorageModule using winsqlite3.dll (requires Windows version 10.0.10586) - -using facebook::react::AsyncStorageModuleWin32; -using facebook::xplat::module::CxxModule; - -namespace { - -std::string &AsyncStorageDBPath() { - static std::string asyncStorageDBPath; - return asyncStorageDBPath; -} - -void InvokeError(const CxxModule::Callback &callback, const char *message) { - callback({folly::dynamic::object("message", message)}); -} - -using ExecCallback = int(SQLITE_CALLBACK *)(void *, int, char **, char **); - -// Execute the provided SQLite statement (and optional execCallback & user data -// in pv). On error, throw a runtime_error with the SQLite error message -void Exec(sqlite3 *db, const char *statement, ExecCallback execCallback = nullptr, void *pv = nullptr) { - char *errMsg = nullptr; - int rc = sqlite3_exec(db, statement, execCallback, pv, &errMsg); - if (errMsg) { - std::runtime_error exception(errMsg); - sqlite3_free(errMsg); - sqlite3_close(db); - throw exception; - } - if (rc != SQLITE_OK) { - std::runtime_error exception(sqlite3_errmsg(db)); - sqlite3_free(errMsg); - sqlite3_close(db); - throw exception; - } -} - -// Execute the provided SQLite statement (and optional execCallback & user data -// in pv). On error, reports it to the callback and returns false. -bool Exec( - sqlite3 *db, - const CxxModule::Callback &callback, - const char *statement, - ExecCallback execCallback = nullptr, - void *pv = nullptr) { - char *errMsg = nullptr; - int rc = sqlite3_exec(db, statement, execCallback, pv, &errMsg); - if (errMsg) { - InvokeError(callback, errMsg); - sqlite3_free(errMsg); - return false; - } - if (rc != SQLITE_OK) { - InvokeError(callback, sqlite3_errmsg(db)); - return false; - } - return true; -} - -// Convenience wrapper for using Exec with lambda expressions -template -bool Exec(sqlite3 *db, const CxxModule::Callback &callback, const char *statement, Fn &fn) { - return Exec( - db, - callback, - statement, - [](void *pv, int i, char **x, char **y) { return (*static_cast(pv))(i, x, y); }, - &fn); -} - -// Checks that the args parameter is an array, that args.size() is less than -// SQLITE_LIMIT_VARIABLE_NUMBER, and that every member of args is a string. -// Invokes callback to report an error and returns false. -bool CheckArgs(sqlite3 *db, folly::dynamic &args, const CxxModule::Callback &callback) { - if (!args.isArray()) { - InvokeError(callback, "Invalid keys type. Expected an array"); - return false; - } - int varLimit = sqlite3_limit(db, SQLITE_LIMIT_VARIABLE_NUMBER, -1); - auto argCount = args.size(); - if (argCount > INT_MAX || static_cast(argCount) > varLimit) { - char errorMsg[60]; - sprintf_s(errorMsg, "Too many keys. Maximum supported keys :%d", varLimit); - InvokeError(callback, errorMsg); - return false; - } - for (int i = 0; i < static_cast(argCount); i++) { - if (!args[i].isString()) { - InvokeError(callback, "Invalid key type. Expected a string"); - } - } - return true; -} - -// RAII object to manage SQLite transaction. On destruction, if -// Commit() has not been called, rolls back the transactions -// The provided sqlite connection handle & Callback must outlive -// the Sqlite3Transaction object -class Sqlite3Transaction { - sqlite3 *m_db{nullptr}; - const CxxModule::Callback *m_callback{nullptr}; - - public: - Sqlite3Transaction() = default; - Sqlite3Transaction(sqlite3 *db, const CxxModule::Callback &callback) : m_db(db), m_callback(&callback) { - if (!Exec(m_db, *m_callback, u8"BEGIN TRANSACTION")) { - m_db = nullptr; - m_callback = nullptr; - } - } - Sqlite3Transaction(const Sqlite3Transaction &) = delete; - Sqlite3Transaction(Sqlite3Transaction &&other) : m_db(other.m_db), m_callback(other.m_callback) { - other.m_db = nullptr; - other.m_callback = nullptr; - } - Sqlite3Transaction &operator=(const Sqlite3Transaction &) = delete; - Sqlite3Transaction &operator=(Sqlite3Transaction &&rhs) { - if (this != &rhs) { - Commit(); - std::swap(m_db, rhs.m_db); - std::swap(m_callback, rhs.m_callback); - } - } - - explicit operator bool() const { - return m_db != nullptr; - } - - void Rollback() { - if (m_db) { - Exec(m_db, *m_callback, u8"ROLLBACK"); - m_db = nullptr; - m_callback = nullptr; - } - } - - bool Commit() { - if (!m_db) { - return false; - } - auto result = Exec(m_db, *m_callback, u8"COMMIT"); - m_db = nullptr; - m_callback = nullptr; - return result; - } - - ~Sqlite3Transaction() { - Rollback(); - } -}; - -// Appends argcount variables to prefix in a comma-separated list. -std::string MakeSQLiteParameterizedStatement(const char *prefix, int argCount) { - assert(argCount != 0); - std::string result(prefix); - result.reserve(result.size() + (argCount * 2) + 1); - result += '('; - for (int x = 0; x < argCount - 1; x++) { - result += "?,"; - } - result += "?)"; - return result; -} - -// Checks if sqliteResult is SQLITE_OK. If not, reports the error via -// callback & returns false. -bool CheckSQLiteResult(sqlite3 *db, const CxxModule::Callback &callback, int sqliteResult) { - if (sqliteResult == SQLITE_OK) { - return true; - } else { - InvokeError(callback, sqlite3_errmsg(db)); - return false; - } -} - -using Statement = std::unique_ptr; - -// Creates a prepared SQLite statement. On error, returns nullptr -Statement PrepareStatement(sqlite3 *db, const CxxModule::Callback &callback, const char *stmt) { - sqlite3_stmt *pStmt{nullptr}; - if (!CheckSQLiteResult(db, callback, sqlite3_prepare_v2(db, stmt, -1, &pStmt, nullptr))) { - return {nullptr, sqlite3_finalize}; - } - return {pStmt, &sqlite3_finalize}; -} - -// Binds the index-th variable in this prepared statement to str. -bool BindString( - sqlite3 *db, - const CxxModule::Callback &callback, - const Statement &stmt, - int index, - const std::string &str) { - return CheckSQLiteResult(db, callback, sqlite3_bind_text(stmt.get(), index, str.c_str(), -1, SQLITE_TRANSIENT)); -} - -} // namespace - -namespace facebook { -namespace react { - -AsyncStorageModuleWin32::AsyncStorageModuleWin32() { - if (sqlite3_open_v2( - AsyncStorageDBPath().c_str(), - &m_db, - SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, - nullptr) != SQLITE_OK) { - auto exception = std::runtime_error(sqlite3_errmsg(m_db)); - sqlite3_close(m_db); - throw exception; - } - - int userVersion = 0; - auto getUserVersionCallback = [](void *pv, int cCol, char **rgszColText, char **rgszColName) { - if (cCol < 1) { - return 1; - } - *static_cast(pv) = atoi(rgszColText[0]); - return SQLITE_OK; - }; - - Exec(m_db, u8"PRAGMA user_version", getUserVersionCallback, &userVersion); - - if (userVersion == 0) { - Exec( - m_db, - u8"CREATE TABLE IF NOT EXISTS AsyncLocalStorage(key TEXT PRIMARY KEY, value TEXT NOT NULL); PRAGMA user_version=1"); - } -} - -AsyncStorageModuleWin32::~AsyncStorageModuleWin32() { - decltype(m_tasks) tasks; - { - // If there is an in-progress async task, cancel it and wait on the - // condition_variable for the async task to acknowledge cancellation by - // nulling out m_action. Once m_action is null, it is safe to proceed - // wth closing the DB connection - winrt::slim_lock_guard guard{m_lock}; - swap(tasks, m_tasks); - if (m_action) { - m_action.Cancel(); - m_cv.wait(m_lock, [this]() { return m_action == nullptr; }); - } - } - sqlite3_close(m_db); -} - -std::string AsyncStorageModuleWin32::getName() { - return "AsyncLocalStorage"; -} - -std::map AsyncStorageModuleWin32::getConstants() { - return {}; -} - -std::vector AsyncStorageModuleWin32::getMethods() { - return {Method("multiGet", this, &AsyncStorageModuleWin32::multiGet), - Method("multiSet", this, &AsyncStorageModuleWin32::multiSet), - Method("multiRemove", this, &AsyncStorageModuleWin32::multiRemove), - Method("clear", this, &AsyncStorageModuleWin32::clear), - Method("getAllKeys", this, &AsyncStorageModuleWin32::getAllKeys)}; -} - -void AsyncStorageModuleWin32::multiGet(folly::dynamic args, Callback jsCallback) { - auto &keys = args[0]; - if (keys.size() == 0) { - jsCallback({{}, {}}); - return; - } - AddTask(DBTask::Type::multiGet, std::move(keys), std::move(jsCallback)); -} -void AsyncStorageModuleWin32::multiSet(folly::dynamic args, Callback jsCallback) { - auto &kvps = args[0]; - if (kvps.size() == 0) { - jsCallback({}); - return; - } - AddTask(DBTask::Type::multiSet, std::move(kvps), std::move(jsCallback)); -} -void AsyncStorageModuleWin32::multiRemove(folly::dynamic args, Callback jsCallback) { - auto &keys = args[0]; - if (keys.size() == 0) { - jsCallback({{}, {}}); - return; - } - AddTask(DBTask::Type::multiRemove, std::move(keys), std::move(jsCallback)); -} -void AsyncStorageModuleWin32::clear(folly::dynamic, Callback jsCallback) { - AddTask(DBTask::Type::clear, std::move(jsCallback)); -} -void AsyncStorageModuleWin32::getAllKeys(folly::dynamic, Callback jsCallback) { - AddTask(DBTask::Type::getAllKeys, std::move(jsCallback)); -} - -// Under the lock, add a task to m_tasks and, if no async task is in progress, -// schedule it -void AsyncStorageModuleWin32::AddTask( - AsyncStorageModuleWin32::DBTask::Type type, - folly::dynamic &&args, - Callback &&jsCallback) { - winrt::slim_lock_guard guard(m_lock); - m_tasks.emplace_back(type, std::move(args), std::move(jsCallback)); - if (!m_action) - m_action = RunTasks(); -} - -// On a background thread, while the async task has not been cancelled and -// there are more tasks to do, run the tasks. When there are either no more -// tasks or cancellation has been requested, set m_action to null to report -// that and complete the coroutine. N.B., it is important that detecting that -// m_tasks is empty and acknowledging completion is done atomically; otherwise -// there would be a race between the background task detecting m_tasks.empty() -// and AddTask checking the coroutine is running. -winrt::Windows::Foundation::IAsyncAction AsyncStorageModuleWin32::RunTasks() { - auto cancellationToken = co_await winrt::get_cancellation_token(); - co_await winrt::resume_background(); - while (!cancellationToken()) { - decltype(m_tasks) tasks; - sqlite3 *db{nullptr}; - { - winrt::slim_lock_guard guard(m_lock); - if (m_tasks.empty()) { - m_action = nullptr; - m_cv.notify_all(); - co_return; - } - std::swap(tasks, m_tasks); - db = m_db; - } - - for (auto &task : tasks) { - task(db); - if (cancellationToken()) - break; - } - } - winrt::slim_lock_guard guard(m_lock); - m_action = nullptr; - m_cv.notify_all(); -} - -void AsyncStorageModuleWin32::DBTask::operator()(sqlite3 *db) { - switch (m_type) { - case Type::multiGet: - multiGet(db); - break; - case Type::multiSet: - multiSet(db); - break; - case Type::multiRemove: - multiRemove(db); - break; - case Type::clear: - clear(db); - break; - case Type::getAllKeys: - getAllKeys(db); - break; - } -} - -void AsyncStorageModuleWin32::DBTask::multiGet(sqlite3 *db) { - folly::dynamic result = folly::dynamic::array; - if (!CheckArgs(db, m_args, m_callback)) { - return; - } - - auto argCount = static_cast(m_args.size()); - auto sql = MakeSQLiteParameterizedStatement(u8"SELECT key, value FROM AsyncLocalStorage WHERE key IN ", argCount); - auto pStmt = PrepareStatement(db, m_callback, sql.data()); - if (!pStmt) { - return; - } - for (int i = 0; i < argCount; i++) { - if (!BindString(db, m_callback, pStmt, i + 1, m_args[i].getString())) - return; - } - for (auto stepResult = sqlite3_step(pStmt.get()); stepResult != SQLITE_DONE; stepResult = sqlite3_step(pStmt.get())) { - if (stepResult != SQLITE_ROW) { - InvokeError(m_callback, sqlite3_errmsg(db)); - return; - } - - auto key = reinterpret_cast(sqlite3_column_text(pStmt.get(), 0)); - if (!key) { - InvokeError(m_callback, sqlite3_errmsg(db)); - return; - } - auto value = reinterpret_cast(sqlite3_column_text(pStmt.get(), 1)); - if (!value) { - InvokeError(m_callback, sqlite3_errmsg(db)); - return; - } - result.push_back(folly::dynamic::array(key, value)); - } - m_callback({{}, result}); -} - -void AsyncStorageModuleWin32::DBTask::multiSet(sqlite3 *db) { - Sqlite3Transaction transaction(db, m_callback); - if (!transaction) { - return; - } - auto pStmt = PrepareStatement(db, m_callback, u8"INSERT OR REPLACE INTO AsyncLocalStorage VALUES(?, ?)"); - if (!pStmt) { - return; - } - for (auto &&arg : m_args) { - if (!BindString(db, m_callback, pStmt, 1, arg[0].getString()) || - !BindString(db, m_callback, pStmt, 2, arg[1].getString())) { - return; - } - auto rc = sqlite3_step(pStmt.get()); - if (rc != SQLITE_DONE && !CheckSQLiteResult(db, m_callback, rc)) { - return; - } - if (!CheckSQLiteResult(db, m_callback, sqlite3_reset(pStmt.get()))) { - return; - } - } - if (!transaction.Commit()) { - return; - } - m_callback({}); -} - -void AsyncStorageModuleWin32::DBTask::multiRemove(sqlite3 *db) { - if (!CheckArgs(db, m_args, m_callback)) { - return; - } - - auto argCount = static_cast(m_args.size()); - auto sql = MakeSQLiteParameterizedStatement(u8"DELETE FROM AsyncLocalStorage WHERE key IN ", argCount); - auto pStmt = PrepareStatement(db, m_callback, sql.data()); - if (!pStmt) { - return; - } - for (int i = 0; i < argCount; i++) { - if (!BindString(db, m_callback, pStmt, i + 1, m_args[i].getString())) - return; - } - for (auto stepResult = sqlite3_step(pStmt.get()); stepResult != SQLITE_DONE; stepResult = sqlite3_step(pStmt.get())) { - if (stepResult != SQLITE_ROW) { - InvokeError(m_callback, sqlite3_errmsg(db)); - return; - } - } - m_callback({}); -} - -void AsyncStorageModuleWin32::DBTask::clear(sqlite3 *db) { - if (Exec(db, m_callback, u8"DELETE FROM AsyncLocalStorage")) { - m_callback({}); - } -} - -void AsyncStorageModuleWin32::DBTask::getAllKeys(sqlite3 *db) { - folly::dynamic result = folly::dynamic::array; - auto getAllKeysCallback = [&](int cCol, char **rgszColText, char **) { - if (cCol >= 1) { - result.push_back(rgszColText[0]); - } - return SQLITE_OK; - }; - - if (Exec(db, m_callback, u8"SELECT key FROM AsyncLocalStorage", getAllKeysCallback)) { - m_callback({{}, result}); - } -} - -} // namespace react -} // namespace facebook - -namespace react { -namespace windows { - -REACTWINDOWS_API_(void) SetAsyncStorageDBPath(std::string &&dbPath) { - if (!AsyncStorageDBPath().empty()) - throw std::logic_error("AsyncStorageDBPath already set"); - - AsyncStorageDBPath() = std::move(dbPath); -} - -} // namespace windows -} // namespace react diff --git a/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h b/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h deleted file mode 100644 index a57e17ad475..00000000000 --- a/vnext/Microsoft.ReactNative/Modules/AsyncStorageModuleWin32.h +++ /dev/null @@ -1,75 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -#include -#include -#include -#include - -#include -#include -#include - -namespace facebook { -namespace react { - -class AsyncStorageModuleWin32 : public facebook::xplat::module::CxxModule { - public: - AsyncStorageModuleWin32(); - ~AsyncStorageModuleWin32(); - std::string getName() override; - std::map getConstants() override; - std::vector getMethods() override; - - private: - class DBTask { - public: - enum class Type { multiGet, multiSet, multiRemove, clear, getAllKeys }; - DBTask(Type type, folly::dynamic &&args, Callback &&callback) - : m_type{type}, m_args{std::move(args)}, m_callback{std::move(callback)} {} - DBTask(const DBTask &) = delete; - DBTask(DBTask &&) = default; - DBTask &operator=(const DBTask &) = delete; - DBTask &operator=(DBTask &&) = default; - void operator()(sqlite3 *db); - - private: - Type m_type; - folly::dynamic m_args; - Callback m_callback; - - void multiGet(sqlite3 *db); - void multiSet(sqlite3 *db); - void multiRemove(sqlite3 *db); - void clear(sqlite3 *db); - void getAllKeys(sqlite3 *db); - }; - winrt::slim_mutex m_lock; - winrt::slim_condition_variable m_cv; - winrt::Windows::Foundation::IAsyncAction m_action{nullptr}; - std::vector m_tasks; - sqlite3 *m_db; - - // params - array Keys , Callback(error, returnValue) - void multiGet(folly::dynamic args, Callback jsCallback); - // params - array> KeyValuePairs , Callback(error) - void multiSet(folly::dynamic args, Callback jsCallback); - // params - array Keys , Callback(error) - void multiRemove(folly::dynamic args, Callback jsCallback); - // params - args is unused, Callback(error) - void clear(folly::dynamic, Callback jsCallback); - // params - args is unused, Callback(error, returnValue) - void getAllKeys(folly::dynamic, Callback jsCallback); - - void AddTask(DBTask::Type type, folly::dynamic &&args, Callback &&jsCallback); - void AddTask(DBTask::Type type, Callback &&jsCallback) { - AddTask(type, folly::dynamic{}, std::move(jsCallback)); - } - winrt::Windows::Foundation::IAsyncAction RunTasks(); - - static std::string m_dbPath; -}; -} // namespace react -} // namespace facebook diff --git a/vnext/ReactUWP/Base/CoreNativeModules.cpp b/vnext/ReactUWP/Base/CoreNativeModules.cpp index 5d752e4ba85..7c02df11bc8 100644 --- a/vnext/ReactUWP/Base/CoreNativeModules.cpp +++ b/vnext/ReactUWP/Base/CoreNativeModules.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include #include @@ -116,7 +115,7 @@ std::vector GetCoreModules( if (HasPackageIdentity()) { return std::make_unique(L"asyncStorage"); } else { - return std::make_unique(); + return nullptr; } }, MakeSerialQueueThread()); From 93a9a711d981280c62c6696f48a86aaa27756787 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 23:29:11 -0700 Subject: [PATCH 25/38] Add ReactNative.Hermes.Windows to Desktop. --- vnext/Desktop/React.Windows.Desktop.vcxproj | 2 ++ vnext/Desktop/packages.config | 1 + vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj | 2 -- .../Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters | 2 -- vnext/ReactUWP/Base/CoreUIManagers.cpp | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index 3ab6c2932db..add55ade714 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -230,6 +230,7 @@ + @@ -257,5 +258,6 @@ + \ No newline at end of file diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index 3e4342ebdf5..bea5b07f285 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -4,6 +4,7 @@ + \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index dfc1830cbaa..3c0553895c8 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -313,7 +313,6 @@ - @@ -488,7 +487,6 @@ Code - diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters index ca2dff9ff47..30615093c38 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters @@ -314,7 +314,6 @@ Views - Modules @@ -675,7 +674,6 @@ Views - Modules diff --git a/vnext/ReactUWP/Base/CoreUIManagers.cpp b/vnext/ReactUWP/Base/CoreUIManagers.cpp index 98d049b5791..13957264eba 100644 --- a/vnext/ReactUWP/Base/CoreUIManagers.cpp +++ b/vnext/ReactUWP/Base/CoreUIManagers.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include // Standard View Managers #include From b4aaf5271ef59dba0a00e312d73ba629da2e125f Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 26 May 2020 23:36:49 -0700 Subject: [PATCH 26/38] clang format --- vnext/ReactUWP/Base/CoreUIManagers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/ReactUWP/Base/CoreUIManagers.cpp b/vnext/ReactUWP/Base/CoreUIManagers.cpp index 13957264eba..517f27ccc87 100644 --- a/vnext/ReactUWP/Base/CoreUIManagers.cpp +++ b/vnext/ReactUWP/Base/CoreUIManagers.cpp @@ -3,10 +3,10 @@ #include "pch.h" +#include #include #include #include -#include // Standard View Managers #include From b16236d5f492ea0bd0829791dff68c988df5b03d Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 00:20:36 -0700 Subject: [PATCH 27/38] Use latest stable test platform --- .ado/windows-vs-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index ee488b85082..65c5b8fa5e2 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -364,7 +364,7 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: - testPlatformVersion: 16.5.0 + versionSelector: latestStable - template: templates/build-rnw.yml parameters: From 490817e7b62de83ddac0922a88b749d619d203aa Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 15:15:46 -0700 Subject: [PATCH 28/38] Revert "Migrated sources from ReactWindowsCore to Shared" This reverts commit fa5fed8157415e240e07762bb93bb5085a25f23d. --- vnext/Desktop.ABITests/PerfTests.cpp | 2 +- ...t.Windows.Desktop.IntegrationTests.vcxproj | 2 +- .../React.Windows.Desktop.UnitTests.vcxproj | 2 +- vnext/Desktop/ABI/MemoryTracker.h | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 9 +- .../React.Windows.IntegrationTests.vcxproj | 2 +- .../JSI.Desktop.UnitTests.vcxproj | 2 +- vnext/JSI/Desktop/JSI.Desktop.vcxproj | 2 +- vnext/JSI/Universal/JSI.Universal.vcxproj | 2 +- .../Microsoft.ReactNative.vcxproj | 3 +- .../Microsoft.ReactNative.vcxproj.filters | 9 +- .../Threading/BatchingQueueThread.h | 2 +- .../Threading/MessageQueueThreadFactory.h | 2 +- vnext/ReactCommon/ReactCommon.vcxproj | 2 +- vnext/ReactUWP/Base/CoreNativeModules.h | 2 +- .../ReactUWP/Modules/DevSupportManagerUwp.cpp | 4 +- vnext/ReactWindows-Desktop.sln | 14 + vnext/{Shared => ReactWindowsCore}/AbiSafe.h | 0 .../AsyncStorage/AsyncStorageManager.cpp | 0 .../AsyncStorage/AsyncStorageManager.h | 0 .../AsyncStorage/FollyDynamicConverter.cpp | 0 .../AsyncStorage/FollyDynamicConverter.h | 0 .../AsyncStorage/KeyValueStorage.cpp | 0 .../AsyncStorage/KeyValueStorage.h | 0 .../AsyncStorageModule.h | 0 .../BaseScriptStoreImpl.cpp | 0 .../BaseScriptStoreImpl.h | 0 .../BatchingMessageQueueThread.h | 0 .../ChakraRuntimeHolder.cpp | 0 .../ChakraRuntimeHolder.h | 0 .../CreateModules.h | 0 .../CxxMessageQueue.cpp | 0 .../CxxMessageQueue.h | 0 .../DevServerHelper.h | 0 .../DevSettings.h | 0 .../HermesRuntimeHolder.cpp | 0 .../HermesRuntimeHolder.h | 0 .../IDevSupportManager.h | 0 .../IHttpResource.h | 0 .../INativeUIManager.h | 0 .../IReactRootView.h | 0 .../IRedBoxHandler.h | 0 .../{Shared => ReactWindowsCore}/IUIManager.h | 0 .../IWebSocketResource.h | 0 .../InstanceManager.h | 0 .../JSBigAbiString.cpp | 0 .../JSBigAbiString.h | 0 .../LayoutAnimation.cpp | 0 .../LayoutAnimation.h | 0 vnext/{Shared => ReactWindowsCore}/Logging.h | 0 .../MemoryMappedBuffer.h | 0 .../MemoryTracker.cpp | 0 .../MemoryTracker.h | 0 .../Modules/AsyncStorageModule.cpp | 0 .../Modules/AsyncStorageModuleWin32.cpp | 492 ++++++++++++++++++ .../Modules/AsyncStorageModuleWin32.h | 75 +++ .../Modules/ExceptionsManagerModule.cpp | 0 .../Modules/ExceptionsManagerModule.h | 0 .../Modules/I18nModule.cpp | 0 .../Modules/I18nModule.h | 0 .../Modules/PlatformConstantsModule.cpp | 0 .../Modules/PlatformConstantsModule.h | 0 .../Modules/SourceCodeModule.cpp | 0 .../Modules/SourceCodeModule.h | 0 .../Modules/StatusBarManagerModule.cpp | 0 .../Modules/StatusBarManagerModule.h | 0 .../Modules/UIManagerModule.cpp | 0 .../Modules/UIManagerModule.h | 0 .../Modules/WebSocketModule.h | 0 .../NativeModuleProvider.h | 0 .../{Shared => ReactWindowsCore}/OInstance.h | 0 .../{Shared => ReactWindowsCore}/Pch/pch.cpp | 0 vnext/{Shared => ReactWindowsCore}/Pch/pch.h | 0 .../ShadowNode.cpp | 0 .../{Shared => ReactWindowsCore}/ShadowNode.h | 0 .../ShadowNodeRegistry.cpp | 0 .../ShadowNodeRegistry.h | 0 vnext/{Shared => ReactWindowsCore}/Tracing.h | 0 .../TurboModuleManager.cpp | 0 .../TurboModuleManager.h | 0 .../TurboModuleRegistry.h | 0 vnext/{Shared => ReactWindowsCore}/Utils.cpp | 0 vnext/{Shared => ReactWindowsCore}/Utils.h | 0 .../V8JSIRuntimeHolder.cpp | 0 .../V8JSIRuntimeHolder.h | 0 .../ViewManager.cpp | 0 .../WebSocketJSExecutorFactory.h | 0 .../WinRTWebSocketResource.cpp | 0 .../WinRTWebSocketResource.h | 0 vnext/{Shared => ReactWindowsCore}/cdebug.cpp | 0 .../etw/build.bat | 0 .../etw/react_native_windows.h | 0 .../etw/react_native_windows.man | 0 .../etw/react_native_windows_etw_res.dll | Bin .../etw/register.bat | 0 .../{Shared => ReactWindowsCore}/targetver.h | 0 .../tracing/fbsystrace.h | 0 .../tracing/tracing.cpp | 0 vnext/Shared/Shared.vcxitems | 156 +++--- vnext/Shared/Shared.vcxitems.filters | 160 +++--- vnext/Test/React.Windows.Test.vcxproj | 2 +- 101 files changed, 768 insertions(+), 180 deletions(-) rename vnext/{Shared => ReactWindowsCore}/AbiSafe.h (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/AsyncStorageManager.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/AsyncStorageManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/FollyDynamicConverter.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/FollyDynamicConverter.h (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/KeyValueStorage.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorage/KeyValueStorage.h (100%) rename vnext/{Shared => ReactWindowsCore}/AsyncStorageModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/BaseScriptStoreImpl.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/BaseScriptStoreImpl.h (100%) rename vnext/{Shared => ReactWindowsCore}/BatchingMessageQueueThread.h (100%) rename vnext/{Shared => ReactWindowsCore}/ChakraRuntimeHolder.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/ChakraRuntimeHolder.h (100%) rename vnext/{Shared => ReactWindowsCore}/CreateModules.h (100%) rename vnext/{Shared => ReactWindowsCore}/CxxMessageQueue.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/CxxMessageQueue.h (100%) rename vnext/{Shared => ReactWindowsCore}/DevServerHelper.h (100%) rename vnext/{Shared => ReactWindowsCore}/DevSettings.h (100%) rename vnext/{Shared => ReactWindowsCore}/HermesRuntimeHolder.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/HermesRuntimeHolder.h (100%) rename vnext/{Shared => ReactWindowsCore}/IDevSupportManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/IHttpResource.h (100%) rename vnext/{Shared => ReactWindowsCore}/INativeUIManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/IReactRootView.h (100%) rename vnext/{Shared => ReactWindowsCore}/IRedBoxHandler.h (100%) rename vnext/{Shared => ReactWindowsCore}/IUIManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/IWebSocketResource.h (100%) rename vnext/{Shared => ReactWindowsCore}/InstanceManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/JSBigAbiString.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/JSBigAbiString.h (100%) rename vnext/{Shared => ReactWindowsCore}/LayoutAnimation.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/LayoutAnimation.h (100%) rename vnext/{Shared => ReactWindowsCore}/Logging.h (100%) rename vnext/{Shared => ReactWindowsCore}/MemoryMappedBuffer.h (100%) rename vnext/{Shared => ReactWindowsCore}/MemoryTracker.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/MemoryTracker.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/AsyncStorageModule.cpp (100%) create mode 100644 vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp create mode 100644 vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h rename vnext/{Shared => ReactWindowsCore}/Modules/ExceptionsManagerModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/ExceptionsManagerModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/I18nModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/I18nModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/PlatformConstantsModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/PlatformConstantsModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/SourceCodeModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/SourceCodeModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/StatusBarManagerModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/StatusBarManagerModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/UIManagerModule.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/UIManagerModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/Modules/WebSocketModule.h (100%) rename vnext/{Shared => ReactWindowsCore}/NativeModuleProvider.h (100%) rename vnext/{Shared => ReactWindowsCore}/OInstance.h (100%) rename vnext/{Shared => ReactWindowsCore}/Pch/pch.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Pch/pch.h (100%) rename vnext/{Shared => ReactWindowsCore}/ShadowNode.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/ShadowNode.h (100%) rename vnext/{Shared => ReactWindowsCore}/ShadowNodeRegistry.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/ShadowNodeRegistry.h (100%) rename vnext/{Shared => ReactWindowsCore}/Tracing.h (100%) rename vnext/{Shared => ReactWindowsCore}/TurboModuleManager.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/TurboModuleManager.h (100%) rename vnext/{Shared => ReactWindowsCore}/TurboModuleRegistry.h (100%) rename vnext/{Shared => ReactWindowsCore}/Utils.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/Utils.h (100%) rename vnext/{Shared => ReactWindowsCore}/V8JSIRuntimeHolder.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/V8JSIRuntimeHolder.h (100%) rename vnext/{Shared => ReactWindowsCore}/ViewManager.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/WebSocketJSExecutorFactory.h (100%) rename vnext/{Shared => ReactWindowsCore}/WinRTWebSocketResource.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/WinRTWebSocketResource.h (100%) rename vnext/{Shared => ReactWindowsCore}/cdebug.cpp (100%) rename vnext/{Shared => ReactWindowsCore}/etw/build.bat (100%) rename vnext/{Shared => ReactWindowsCore}/etw/react_native_windows.h (100%) rename vnext/{Shared => ReactWindowsCore}/etw/react_native_windows.man (100%) rename vnext/{Shared => ReactWindowsCore}/etw/react_native_windows_etw_res.dll (100%) rename vnext/{Shared => ReactWindowsCore}/etw/register.bat (100%) rename vnext/{Shared => ReactWindowsCore}/targetver.h (100%) rename vnext/{Shared => ReactWindowsCore}/tracing/fbsystrace.h (100%) rename vnext/{Shared => ReactWindowsCore}/tracing/tracing.cpp (100%) diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index 6df6bd3c5d1..e5454da0de0 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -4,7 +4,7 @@ #include "pch.h" #include -#include +#include using namespace winrt::Microsoft::React; using namespace winrt; diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 68d60d3b46f..a44671c4fd1 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -43,7 +43,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(IncludePath) true diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index 635a52724d3..de2bf1e09c4 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -40,7 +40,7 @@ - $(ReactNativeWindowsDir)\Mso;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Desktop;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(MSBuildThisFileDirectory);$(IncludePath) + $(ReactNativeWindowsDir)\Mso;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Desktop;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(MSBuildThisFileDirectory);$(IncludePath) true diff --git a/vnext/Desktop/ABI/MemoryTracker.h b/vnext/Desktop/ABI/MemoryTracker.h index 527505341d2..1f09b8bae1f 100644 --- a/vnext/Desktop/ABI/MemoryTracker.h +++ b/vnext/Desktop/ABI/MemoryTracker.h @@ -1,7 +1,7 @@ #pragma once #include "Microsoft.React.MemoryTracker.g.h" -#include +#include namespace winrt::Microsoft::React::implementation { struct MemoryTracker : MemoryTrackerT { diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index add55ade714..b1f4d2a4860 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -68,7 +68,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)\Shared\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(MSBuildProjectDirectory);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(ReactNativeWindowsDir)JSI\Shared;$(JSI_Source);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) true @@ -93,13 +93,13 @@ %(PreprocessorDefinitions) %(AdditionalIncludeDirectories);"$(ReactNativeWindowsDir)Microsoft.ReactNative";"$(ReactNativeWindowsDir)build\$(Platform)\$(Configuration)\Microsoft.ReactNative\Generated Files" - %(AdditionalOptions) /Zc:strictStrings /bigobj /await + %(AdditionalOptions) /Zc:strictStrings /bigobj Use pch.h pch.h - %(AdditionalDependencies);Shlwapi.lib;winsqlite3.lib + Shlwapi.lib;%(AdditionalDependencies) -minpdbpathlen:256 @@ -221,6 +221,9 @@ {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} + + {11C084A3-A57C-4296-A679-CAC17B603144} + diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index 0761d87f56a..1023d7466b2 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -47,7 +47,7 @@ - $(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(IncludePath);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(FollyDir) + $(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(IncludePath);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(FollyDir) diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 8da01bd81d1..c51a6f46a48 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -30,7 +30,7 @@ - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)\Shared\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) true diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj index d31a2791d41..58788a35444 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -43,7 +43,7 @@ - $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Chakra;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Shared;$(IncludePath) + $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Chakra;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)ReactWindowsCore;$(IncludePath) true diff --git a/vnext/JSI/Universal/JSI.Universal.vcxproj b/vnext/JSI/Universal/JSI.Universal.vcxproj index f7d0fe57ce5..c787bc36538 100644 --- a/vnext/JSI/Universal/JSI.Universal.vcxproj +++ b/vnext/JSI/Universal/JSI.Universal.vcxproj @@ -81,7 +81,7 @@ false - $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Shared;$(IncludePath) + $(ReactNativeDir)\ReactCommon;$(JSI_SourcePath);$(JSI_Source);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)ReactWindowsCore;$(IncludePath) true diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index f4d0eee7096..692d96bf2c9 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -136,7 +136,8 @@ $(ReactNativeWindowsDir)Common; $(ReactNativeWindowsDir)stubs; $(ReactNativeWindowsDir)include; - $(ReactNativeWindowsDir)Shared\tracing; + $(ReactNativeWindowsDir)ReactWindowsCore; + $(ReactNativeWindowsDir)ReactWindowsCore\tracing; $(ReactNativeWindowsDir)include\ReactWindowsCore; $(YogaDir); %(AdditionalIncludeDirectories) diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters index 242e1efedc0..618596a0939 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj.filters @@ -92,6 +92,9 @@ Modules + + Modules + Modules @@ -267,6 +270,9 @@ Modules + + Modules + Modules @@ -674,9 +680,6 @@ Views - - Modules - diff --git a/vnext/Microsoft.ReactNative/Threading/BatchingQueueThread.h b/vnext/Microsoft.ReactNative/Threading/BatchingQueueThread.h index 02680e871a4..1b361815de8 100644 --- a/vnext/Microsoft.ReactNative/Threading/BatchingQueueThread.h +++ b/vnext/Microsoft.ReactNative/Threading/BatchingQueueThread.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include namespace react::uwp { diff --git a/vnext/Microsoft.ReactNative/Threading/MessageQueueThreadFactory.h b/vnext/Microsoft.ReactNative/Threading/MessageQueueThreadFactory.h index ef3de316fca..ec1c4020f3f 100644 --- a/vnext/Microsoft.ReactNative/Threading/MessageQueueThreadFactory.h +++ b/vnext/Microsoft.ReactNative/Threading/MessageQueueThreadFactory.h @@ -3,7 +3,7 @@ #pragma once -#include +#include #include namespace react::uwp { diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index e5c0c535eb8..3128f3a6d64 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -90,7 +90,7 @@ $(ReactNativeDir)\ReactCommon\callinvoker; $(ReactNativeDir)\ReactCommon\jsiexecutor; $(FollyDir);$(ReactNativeWindowsDir)stubs; - $(ReactNativeWindowsDir)\Shared\tracing; + $(ReactNativeWindowsDir)\ReactWindowsCore\tracing; %(AdditionalIncludeDirectories); _WIN32;_CRT_SECURE_NO_WARNINGS;FOLLY_NO_CONFIG;NOMINMAX;RN_EXPORT=;JSI_EXPORT=;WIN32;_WINDLL;%(PreprocessorDefinitions) diff --git a/vnext/ReactUWP/Base/CoreNativeModules.h b/vnext/ReactUWP/Base/CoreNativeModules.h index 0da0fac4fb3..f467e2db730 100644 --- a/vnext/ReactUWP/Base/CoreNativeModules.h +++ b/vnext/ReactUWP/Base/CoreNativeModules.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include #include diff --git a/vnext/ReactUWP/Modules/DevSupportManagerUwp.cpp b/vnext/ReactUWP/Modules/DevSupportManagerUwp.cpp index cde48eb9871..84280333503 100644 --- a/vnext/ReactUWP/Modules/DevSupportManagerUwp.cpp +++ b/vnext/ReactUWP/Modules/DevSupportManagerUwp.cpp @@ -7,8 +7,8 @@ #include "DevSupportManagerUwp.h" -#include -#include +#include +#include #include diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 9d2171f3f8a..96aa8d66f03 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -17,6 +17,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.DLL", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.UnitTests", "Desktop.UnitTests\React.Windows.Desktop.UnitTests.vcxproj", "{96CD24DC-91C2-480A-BC26-EE2250DA80D7}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EEE39425-10FD-4DB3-924E-D31CDA3DCC73}" ProjectSection(SolutionItems) = preProject @@ -289,6 +291,18 @@ Global {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.ActiveCfg = Debug|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.Build.0 = Debug|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.ActiveCfg = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.Build.0 = Debug|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.ActiveCfg = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.Build.0 = Debug|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.ActiveCfg = Release|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.Build.0 = Release|ARM + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.ActiveCfg = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.Build.0 = Release|x64 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.ActiveCfg = Release|Win32 + {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vnext/Shared/AbiSafe.h b/vnext/ReactWindowsCore/AbiSafe.h similarity index 100% rename from vnext/Shared/AbiSafe.h rename to vnext/ReactWindowsCore/AbiSafe.h diff --git a/vnext/Shared/AsyncStorage/AsyncStorageManager.cpp b/vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.cpp similarity index 100% rename from vnext/Shared/AsyncStorage/AsyncStorageManager.cpp rename to vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.cpp diff --git a/vnext/Shared/AsyncStorage/AsyncStorageManager.h b/vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.h similarity index 100% rename from vnext/Shared/AsyncStorage/AsyncStorageManager.h rename to vnext/ReactWindowsCore/AsyncStorage/AsyncStorageManager.h diff --git a/vnext/Shared/AsyncStorage/FollyDynamicConverter.cpp b/vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.cpp similarity index 100% rename from vnext/Shared/AsyncStorage/FollyDynamicConverter.cpp rename to vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.cpp diff --git a/vnext/Shared/AsyncStorage/FollyDynamicConverter.h b/vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.h similarity index 100% rename from vnext/Shared/AsyncStorage/FollyDynamicConverter.h rename to vnext/ReactWindowsCore/AsyncStorage/FollyDynamicConverter.h diff --git a/vnext/Shared/AsyncStorage/KeyValueStorage.cpp b/vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.cpp similarity index 100% rename from vnext/Shared/AsyncStorage/KeyValueStorage.cpp rename to vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.cpp diff --git a/vnext/Shared/AsyncStorage/KeyValueStorage.h b/vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.h similarity index 100% rename from vnext/Shared/AsyncStorage/KeyValueStorage.h rename to vnext/ReactWindowsCore/AsyncStorage/KeyValueStorage.h diff --git a/vnext/Shared/AsyncStorageModule.h b/vnext/ReactWindowsCore/AsyncStorageModule.h similarity index 100% rename from vnext/Shared/AsyncStorageModule.h rename to vnext/ReactWindowsCore/AsyncStorageModule.h diff --git a/vnext/Shared/BaseScriptStoreImpl.cpp b/vnext/ReactWindowsCore/BaseScriptStoreImpl.cpp similarity index 100% rename from vnext/Shared/BaseScriptStoreImpl.cpp rename to vnext/ReactWindowsCore/BaseScriptStoreImpl.cpp diff --git a/vnext/Shared/BaseScriptStoreImpl.h b/vnext/ReactWindowsCore/BaseScriptStoreImpl.h similarity index 100% rename from vnext/Shared/BaseScriptStoreImpl.h rename to vnext/ReactWindowsCore/BaseScriptStoreImpl.h diff --git a/vnext/Shared/BatchingMessageQueueThread.h b/vnext/ReactWindowsCore/BatchingMessageQueueThread.h similarity index 100% rename from vnext/Shared/BatchingMessageQueueThread.h rename to vnext/ReactWindowsCore/BatchingMessageQueueThread.h diff --git a/vnext/Shared/ChakraRuntimeHolder.cpp b/vnext/ReactWindowsCore/ChakraRuntimeHolder.cpp similarity index 100% rename from vnext/Shared/ChakraRuntimeHolder.cpp rename to vnext/ReactWindowsCore/ChakraRuntimeHolder.cpp diff --git a/vnext/Shared/ChakraRuntimeHolder.h b/vnext/ReactWindowsCore/ChakraRuntimeHolder.h similarity index 100% rename from vnext/Shared/ChakraRuntimeHolder.h rename to vnext/ReactWindowsCore/ChakraRuntimeHolder.h diff --git a/vnext/Shared/CreateModules.h b/vnext/ReactWindowsCore/CreateModules.h similarity index 100% rename from vnext/Shared/CreateModules.h rename to vnext/ReactWindowsCore/CreateModules.h diff --git a/vnext/Shared/CxxMessageQueue.cpp b/vnext/ReactWindowsCore/CxxMessageQueue.cpp similarity index 100% rename from vnext/Shared/CxxMessageQueue.cpp rename to vnext/ReactWindowsCore/CxxMessageQueue.cpp diff --git a/vnext/Shared/CxxMessageQueue.h b/vnext/ReactWindowsCore/CxxMessageQueue.h similarity index 100% rename from vnext/Shared/CxxMessageQueue.h rename to vnext/ReactWindowsCore/CxxMessageQueue.h diff --git a/vnext/Shared/DevServerHelper.h b/vnext/ReactWindowsCore/DevServerHelper.h similarity index 100% rename from vnext/Shared/DevServerHelper.h rename to vnext/ReactWindowsCore/DevServerHelper.h diff --git a/vnext/Shared/DevSettings.h b/vnext/ReactWindowsCore/DevSettings.h similarity index 100% rename from vnext/Shared/DevSettings.h rename to vnext/ReactWindowsCore/DevSettings.h diff --git a/vnext/Shared/HermesRuntimeHolder.cpp b/vnext/ReactWindowsCore/HermesRuntimeHolder.cpp similarity index 100% rename from vnext/Shared/HermesRuntimeHolder.cpp rename to vnext/ReactWindowsCore/HermesRuntimeHolder.cpp diff --git a/vnext/Shared/HermesRuntimeHolder.h b/vnext/ReactWindowsCore/HermesRuntimeHolder.h similarity index 100% rename from vnext/Shared/HermesRuntimeHolder.h rename to vnext/ReactWindowsCore/HermesRuntimeHolder.h diff --git a/vnext/Shared/IDevSupportManager.h b/vnext/ReactWindowsCore/IDevSupportManager.h similarity index 100% rename from vnext/Shared/IDevSupportManager.h rename to vnext/ReactWindowsCore/IDevSupportManager.h diff --git a/vnext/Shared/IHttpResource.h b/vnext/ReactWindowsCore/IHttpResource.h similarity index 100% rename from vnext/Shared/IHttpResource.h rename to vnext/ReactWindowsCore/IHttpResource.h diff --git a/vnext/Shared/INativeUIManager.h b/vnext/ReactWindowsCore/INativeUIManager.h similarity index 100% rename from vnext/Shared/INativeUIManager.h rename to vnext/ReactWindowsCore/INativeUIManager.h diff --git a/vnext/Shared/IReactRootView.h b/vnext/ReactWindowsCore/IReactRootView.h similarity index 100% rename from vnext/Shared/IReactRootView.h rename to vnext/ReactWindowsCore/IReactRootView.h diff --git a/vnext/Shared/IRedBoxHandler.h b/vnext/ReactWindowsCore/IRedBoxHandler.h similarity index 100% rename from vnext/Shared/IRedBoxHandler.h rename to vnext/ReactWindowsCore/IRedBoxHandler.h diff --git a/vnext/Shared/IUIManager.h b/vnext/ReactWindowsCore/IUIManager.h similarity index 100% rename from vnext/Shared/IUIManager.h rename to vnext/ReactWindowsCore/IUIManager.h diff --git a/vnext/Shared/IWebSocketResource.h b/vnext/ReactWindowsCore/IWebSocketResource.h similarity index 100% rename from vnext/Shared/IWebSocketResource.h rename to vnext/ReactWindowsCore/IWebSocketResource.h diff --git a/vnext/Shared/InstanceManager.h b/vnext/ReactWindowsCore/InstanceManager.h similarity index 100% rename from vnext/Shared/InstanceManager.h rename to vnext/ReactWindowsCore/InstanceManager.h diff --git a/vnext/Shared/JSBigAbiString.cpp b/vnext/ReactWindowsCore/JSBigAbiString.cpp similarity index 100% rename from vnext/Shared/JSBigAbiString.cpp rename to vnext/ReactWindowsCore/JSBigAbiString.cpp diff --git a/vnext/Shared/JSBigAbiString.h b/vnext/ReactWindowsCore/JSBigAbiString.h similarity index 100% rename from vnext/Shared/JSBigAbiString.h rename to vnext/ReactWindowsCore/JSBigAbiString.h diff --git a/vnext/Shared/LayoutAnimation.cpp b/vnext/ReactWindowsCore/LayoutAnimation.cpp similarity index 100% rename from vnext/Shared/LayoutAnimation.cpp rename to vnext/ReactWindowsCore/LayoutAnimation.cpp diff --git a/vnext/Shared/LayoutAnimation.h b/vnext/ReactWindowsCore/LayoutAnimation.h similarity index 100% rename from vnext/Shared/LayoutAnimation.h rename to vnext/ReactWindowsCore/LayoutAnimation.h diff --git a/vnext/Shared/Logging.h b/vnext/ReactWindowsCore/Logging.h similarity index 100% rename from vnext/Shared/Logging.h rename to vnext/ReactWindowsCore/Logging.h diff --git a/vnext/Shared/MemoryMappedBuffer.h b/vnext/ReactWindowsCore/MemoryMappedBuffer.h similarity index 100% rename from vnext/Shared/MemoryMappedBuffer.h rename to vnext/ReactWindowsCore/MemoryMappedBuffer.h diff --git a/vnext/Shared/MemoryTracker.cpp b/vnext/ReactWindowsCore/MemoryTracker.cpp similarity index 100% rename from vnext/Shared/MemoryTracker.cpp rename to vnext/ReactWindowsCore/MemoryTracker.cpp diff --git a/vnext/Shared/MemoryTracker.h b/vnext/ReactWindowsCore/MemoryTracker.h similarity index 100% rename from vnext/Shared/MemoryTracker.h rename to vnext/ReactWindowsCore/MemoryTracker.h diff --git a/vnext/Shared/Modules/AsyncStorageModule.cpp b/vnext/ReactWindowsCore/Modules/AsyncStorageModule.cpp similarity index 100% rename from vnext/Shared/Modules/AsyncStorageModule.cpp rename to vnext/ReactWindowsCore/Modules/AsyncStorageModule.cpp diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp new file mode 100644 index 00000000000..db03d075c63 --- /dev/null +++ b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp @@ -0,0 +1,492 @@ +#include "pch.h" + +#include "AsyncStorageModuleWin32.h" +#include "AsyncStorageModuleWin32Config.h" + +#include + +/// Implements AsyncStorageModule using winsqlite3.dll (requires Windows version 10.0.10586) + +using facebook::react::AsyncStorageModuleWin32; +using facebook::xplat::module::CxxModule; + +namespace { + +std::string &AsyncStorageDBPath() { + static std::string asyncStorageDBPath; + return asyncStorageDBPath; +} + +void InvokeError(const CxxModule::Callback &callback, const char *message) { + callback({folly::dynamic::object("message", message)}); +} + +using ExecCallback = int(SQLITE_CALLBACK *)(void *, int, char **, char **); + +// Execute the provided SQLite statement (and optional execCallback & user data +// in pv). On error, throw a runtime_error with the SQLite error message +void Exec(sqlite3 *db, const char *statement, ExecCallback execCallback = nullptr, void *pv = nullptr) { + char *errMsg = nullptr; + int rc = sqlite3_exec(db, statement, execCallback, pv, &errMsg); + if (errMsg) { + std::runtime_error exception(errMsg); + sqlite3_free(errMsg); + sqlite3_close(db); + throw exception; + } + if (rc != SQLITE_OK) { + std::runtime_error exception(sqlite3_errmsg(db)); + sqlite3_free(errMsg); + sqlite3_close(db); + throw exception; + } +} + +// Execute the provided SQLite statement (and optional execCallback & user data +// in pv). On error, reports it to the callback and returns false. +bool Exec( + sqlite3 *db, + const CxxModule::Callback &callback, + const char *statement, + ExecCallback execCallback = nullptr, + void *pv = nullptr) { + char *errMsg = nullptr; + int rc = sqlite3_exec(db, statement, execCallback, pv, &errMsg); + if (errMsg) { + InvokeError(callback, errMsg); + sqlite3_free(errMsg); + return false; + } + if (rc != SQLITE_OK) { + InvokeError(callback, sqlite3_errmsg(db)); + return false; + } + return true; +} + +// Convenience wrapper for using Exec with lambda expressions +template +bool Exec(sqlite3 *db, const CxxModule::Callback &callback, const char *statement, Fn &fn) { + return Exec( + db, + callback, + statement, + [](void *pv, int i, char **x, char **y) { return (*static_cast(pv))(i, x, y); }, + &fn); +} + +// Checks that the args parameter is an array, that args.size() is less than +// SQLITE_LIMIT_VARIABLE_NUMBER, and that every member of args is a string. +// Invokes callback to report an error and returns false. +bool CheckArgs(sqlite3 *db, folly::dynamic &args, const CxxModule::Callback &callback) { + if (!args.isArray()) { + InvokeError(callback, "Invalid keys type. Expected an array"); + return false; + } + int varLimit = sqlite3_limit(db, SQLITE_LIMIT_VARIABLE_NUMBER, -1); + auto argCount = args.size(); + if (argCount > INT_MAX || static_cast(argCount) > varLimit) { + char errorMsg[60]; + sprintf_s(errorMsg, "Too many keys. Maximum supported keys :%d", varLimit); + InvokeError(callback, errorMsg); + return false; + } + for (int i = 0; i < static_cast(argCount); i++) { + if (!args[i].isString()) { + InvokeError(callback, "Invalid key type. Expected a string"); + } + } + return true; +} + +// RAII object to manage SQLite transaction. On destruction, if +// Commit() has not been called, rolls back the transactions +// The provided sqlite connection handle & Callback must outlive +// the Sqlite3Transaction object +class Sqlite3Transaction { + sqlite3 *m_db{nullptr}; + const CxxModule::Callback *m_callback{nullptr}; + + public: + Sqlite3Transaction() = default; + Sqlite3Transaction(sqlite3 *db, const CxxModule::Callback &callback) : m_db(db), m_callback(&callback) { + if (!Exec(m_db, *m_callback, u8"BEGIN TRANSACTION")) { + m_db = nullptr; + m_callback = nullptr; + } + } + Sqlite3Transaction(const Sqlite3Transaction &) = delete; + Sqlite3Transaction(Sqlite3Transaction &&other) : m_db(other.m_db), m_callback(other.m_callback) { + other.m_db = nullptr; + other.m_callback = nullptr; + } + Sqlite3Transaction &operator=(const Sqlite3Transaction &) = delete; + Sqlite3Transaction &operator=(Sqlite3Transaction &&rhs) { + if (this != &rhs) { + Commit(); + std::swap(m_db, rhs.m_db); + std::swap(m_callback, rhs.m_callback); + } + } + + explicit operator bool() const { + return m_db != nullptr; + } + + void Rollback() { + if (m_db) { + Exec(m_db, *m_callback, u8"ROLLBACK"); + m_db = nullptr; + m_callback = nullptr; + } + } + + bool Commit() { + if (!m_db) { + return false; + } + auto result = Exec(m_db, *m_callback, u8"COMMIT"); + m_db = nullptr; + m_callback = nullptr; + return result; + } + + ~Sqlite3Transaction() { + Rollback(); + } +}; + +// Appends argcount variables to prefix in a comma-separated list. +std::string MakeSQLiteParameterizedStatement(const char *prefix, int argCount) { + assert(argCount != 0); + std::string result(prefix); + result.reserve(result.size() + (argCount * 2) + 1); + result += '('; + for (int x = 0; x < argCount - 1; x++) { + result += "?,"; + } + result += "?)"; + return result; +} + +// Checks if sqliteResult is SQLITE_OK. If not, reports the error via +// callback & returns false. +bool CheckSQLiteResult(sqlite3 *db, const CxxModule::Callback &callback, int sqliteResult) { + if (sqliteResult == SQLITE_OK) { + return true; + } else { + InvokeError(callback, sqlite3_errmsg(db)); + return false; + } +} + +using Statement = std::unique_ptr; + +// Creates a prepared SQLite statement. On error, returns nullptr +Statement PrepareStatement(sqlite3 *db, const CxxModule::Callback &callback, const char *stmt) { + sqlite3_stmt *pStmt{nullptr}; + if (!CheckSQLiteResult(db, callback, sqlite3_prepare_v2(db, stmt, -1, &pStmt, nullptr))) { + return {nullptr, sqlite3_finalize}; + } + return {pStmt, &sqlite3_finalize}; +} + +// Binds the index-th variable in this prepared statement to str. +bool BindString( + sqlite3 *db, + const CxxModule::Callback &callback, + const Statement &stmt, + int index, + const std::string &str) { + return CheckSQLiteResult(db, callback, sqlite3_bind_text(stmt.get(), index, str.c_str(), -1, SQLITE_TRANSIENT)); +} + +} // namespace + +namespace facebook { +namespace react { + +AsyncStorageModuleWin32::AsyncStorageModuleWin32() { + if (sqlite3_open_v2( + AsyncStorageDBPath().c_str(), + &m_db, + SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, + nullptr) != SQLITE_OK) { + auto exception = std::runtime_error(sqlite3_errmsg(m_db)); + sqlite3_close(m_db); + throw exception; + } + + int userVersion = 0; + auto getUserVersionCallback = [](void *pv, int cCol, char **rgszColText, char **rgszColName) { + if (cCol < 1) { + return 1; + } + *static_cast(pv) = atoi(rgszColText[0]); + return SQLITE_OK; + }; + + Exec(m_db, u8"PRAGMA user_version", getUserVersionCallback, &userVersion); + + if (userVersion == 0) { + Exec( + m_db, + u8"CREATE TABLE IF NOT EXISTS AsyncLocalStorage(key TEXT PRIMARY KEY, value TEXT NOT NULL); PRAGMA user_version=1"); + } +} + +AsyncStorageModuleWin32::~AsyncStorageModuleWin32() { + decltype(m_tasks) tasks; + { + // If there is an in-progress async task, cancel it and wait on the + // condition_variable for the async task to acknowledge cancellation by + // nulling out m_action. Once m_action is null, it is safe to proceed + // wth closing the DB connection + winrt::slim_shared_lock_guard guard{m_lock}; + swap(tasks, m_tasks); + if (m_action) { + m_action.Cancel(); + m_cv.wait(m_lock, [this]() { return m_action == nullptr; }); + } + } + sqlite3_close(m_db); +} + +std::string AsyncStorageModuleWin32::getName() { + return "AsyncLocalStorage"; +} + +std::map AsyncStorageModuleWin32::getConstants() { + return {}; +} + +std::vector AsyncStorageModuleWin32::getMethods() { + return {Method("multiGet", this, &AsyncStorageModuleWin32::multiGet), + Method("multiSet", this, &AsyncStorageModuleWin32::multiSet), + Method("multiRemove", this, &AsyncStorageModuleWin32::multiRemove), + Method("clear", this, &AsyncStorageModuleWin32::clear), + Method("getAllKeys", this, &AsyncStorageModuleWin32::getAllKeys)}; +} + +void AsyncStorageModuleWin32::multiGet(folly::dynamic args, Callback jsCallback) { + auto &keys = args[0]; + if (keys.size() == 0) { + jsCallback({{}, {}}); + return; + } + AddTask(DBTask::Type::multiGet, std::move(keys), std::move(jsCallback)); +} +void AsyncStorageModuleWin32::multiSet(folly::dynamic args, Callback jsCallback) { + auto &kvps = args[0]; + if (kvps.size() == 0) { + jsCallback({}); + return; + } + AddTask(DBTask::Type::multiSet, std::move(kvps), std::move(jsCallback)); +} +void AsyncStorageModuleWin32::multiRemove(folly::dynamic args, Callback jsCallback) { + auto &keys = args[0]; + if (keys.size() == 0) { + jsCallback({{}, {}}); + return; + } + AddTask(DBTask::Type::multiRemove, std::move(keys), std::move(jsCallback)); +} +void AsyncStorageModuleWin32::clear(folly::dynamic, Callback jsCallback) { + AddTask(DBTask::Type::clear, std::move(jsCallback)); +} +void AsyncStorageModuleWin32::getAllKeys(folly::dynamic, Callback jsCallback) { + AddTask(DBTask::Type::getAllKeys, std::move(jsCallback)); +} + +// Under the lock, add a task to m_tasks and, if no async task is in progress, +// schedule it +void AsyncStorageModuleWin32::AddTask( + AsyncStorageModuleWin32::DBTask::Type type, + folly::dynamic &&args, + Callback &&jsCallback) { + winrt::slim_lock_guard guard(m_lock); + m_tasks.emplace_back(type, std::move(args), std::move(jsCallback)); + if (!m_action) + m_action = RunTasks(); +} + +// On a background thread, while the async task has not been cancelled and +// there are more tasks to do, run the tasks. When there are either no more +// tasks or cancellation has been requested, set m_action to null to report +// that and complete the coroutine. N.B., it is important that detecting that +// m_tasks is empty and acknowledging completion is done atomically; otherwise +// there would be a race between the background task detecting m_tasks.empty() +// and AddTask checking the coroutine is running. +winrt::Windows::Foundation::IAsyncAction AsyncStorageModuleWin32::RunTasks() { + auto cancellationToken = co_await winrt::get_cancellation_token(); + co_await winrt::resume_background(); + while (!cancellationToken()) { + decltype(m_tasks) tasks; + sqlite3 *db{nullptr}; + { + winrt::slim_lock_guard guard(m_lock); + if (m_tasks.empty()) { + m_action = nullptr; + m_cv.notify_all(); + co_return; + } + std::swap(tasks, m_tasks); + db = m_db; + } + + for (auto &task : tasks) { + task(db); + if (cancellationToken()) + break; + } + } + winrt::slim_lock_guard guard(m_lock); + m_action = nullptr; + m_cv.notify_all(); +} + +void AsyncStorageModuleWin32::DBTask::operator()(sqlite3 *db) { + switch (m_type) { + case Type::multiGet: + multiGet(db); + break; + case Type::multiSet: + multiSet(db); + break; + case Type::multiRemove: + multiRemove(db); + break; + case Type::clear: + clear(db); + break; + case Type::getAllKeys: + getAllKeys(db); + break; + } +} + +void AsyncStorageModuleWin32::DBTask::multiGet(sqlite3 *db) { + folly::dynamic result = folly::dynamic::array; + if (!CheckArgs(db, m_args, m_callback)) { + return; + } + + auto argCount = static_cast(m_args.size()); + auto sql = MakeSQLiteParameterizedStatement(u8"SELECT key, value FROM AsyncLocalStorage WHERE key IN ", argCount); + auto pStmt = PrepareStatement(db, m_callback, sql.data()); + if (!pStmt) { + return; + } + for (int i = 0; i < argCount; i++) { + if (!BindString(db, m_callback, pStmt, i + 1, m_args[i].getString())) + return; + } + for (auto stepResult = sqlite3_step(pStmt.get()); stepResult != SQLITE_DONE; stepResult = sqlite3_step(pStmt.get())) { + if (stepResult != SQLITE_ROW) { + InvokeError(m_callback, sqlite3_errmsg(db)); + return; + } + + auto key = reinterpret_cast(sqlite3_column_text(pStmt.get(), 0)); + if (!key) { + InvokeError(m_callback, sqlite3_errmsg(db)); + return; + } + auto value = reinterpret_cast(sqlite3_column_text(pStmt.get(), 1)); + if (!value) { + InvokeError(m_callback, sqlite3_errmsg(db)); + return; + } + result.push_back(folly::dynamic::array(key, value)); + } + m_callback({{}, result}); +} + +void AsyncStorageModuleWin32::DBTask::multiSet(sqlite3 *db) { + Sqlite3Transaction transaction(db, m_callback); + if (!transaction) { + return; + } + auto pStmt = PrepareStatement(db, m_callback, u8"INSERT OR REPLACE INTO AsyncLocalStorage VALUES(?, ?)"); + if (!pStmt) { + return; + } + for (auto &&arg : m_args) { + if (!BindString(db, m_callback, pStmt, 1, arg[0].getString()) || + !BindString(db, m_callback, pStmt, 2, arg[1].getString())) { + return; + } + auto rc = sqlite3_step(pStmt.get()); + if (rc != SQLITE_DONE && !CheckSQLiteResult(db, m_callback, rc)) { + return; + } + if (!CheckSQLiteResult(db, m_callback, sqlite3_reset(pStmt.get()))) { + return; + } + } + if (!transaction.Commit()) { + return; + } + m_callback({}); +} + +void AsyncStorageModuleWin32::DBTask::multiRemove(sqlite3 *db) { + if (!CheckArgs(db, m_args, m_callback)) { + return; + } + + auto argCount = static_cast(m_args.size()); + auto sql = MakeSQLiteParameterizedStatement(u8"DELETE FROM AsyncLocalStorage WHERE key IN ", argCount); + auto pStmt = PrepareStatement(db, m_callback, sql.data()); + if (!pStmt) { + return; + } + for (int i = 0; i < argCount; i++) { + if (!BindString(db, m_callback, pStmt, i + 1, m_args[i].getString())) + return; + } + for (auto stepResult = sqlite3_step(pStmt.get()); stepResult != SQLITE_DONE; stepResult = sqlite3_step(pStmt.get())) { + if (stepResult != SQLITE_ROW) { + InvokeError(m_callback, sqlite3_errmsg(db)); + return; + } + } + m_callback({}); +} + +void AsyncStorageModuleWin32::DBTask::clear(sqlite3 *db) { + if (Exec(db, m_callback, u8"DELETE FROM AsyncLocalStorage")) { + m_callback({}); + } +} + +void AsyncStorageModuleWin32::DBTask::getAllKeys(sqlite3 *db) { + folly::dynamic result = folly::dynamic::array; + auto getAllKeysCallback = [&](int cCol, char **rgszColText, char **) { + if (cCol >= 1) { + result.push_back(rgszColText[0]); + } + return SQLITE_OK; + }; + + if (Exec(db, m_callback, u8"SELECT key FROM AsyncLocalStorage", getAllKeysCallback)) { + m_callback({{}, result}); + } +} + +} // namespace react +} // namespace facebook + +namespace react { +namespace windows { + +REACTWINDOWS_API_(void) SetAsyncStorageDBPath(std::string &&dbPath) { + if (!AsyncStorageDBPath().empty()) + throw std::logic_error("AsyncStorageDBPath already set"); + + AsyncStorageDBPath() = std::move(dbPath); +} + +} // namespace windows +} // namespace react diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h new file mode 100644 index 00000000000..a57e17ad475 --- /dev/null +++ b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.h @@ -0,0 +1,75 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. + +#pragma once + +#include +#include +#include +#include + +#include +#include +#include + +namespace facebook { +namespace react { + +class AsyncStorageModuleWin32 : public facebook::xplat::module::CxxModule { + public: + AsyncStorageModuleWin32(); + ~AsyncStorageModuleWin32(); + std::string getName() override; + std::map getConstants() override; + std::vector getMethods() override; + + private: + class DBTask { + public: + enum class Type { multiGet, multiSet, multiRemove, clear, getAllKeys }; + DBTask(Type type, folly::dynamic &&args, Callback &&callback) + : m_type{type}, m_args{std::move(args)}, m_callback{std::move(callback)} {} + DBTask(const DBTask &) = delete; + DBTask(DBTask &&) = default; + DBTask &operator=(const DBTask &) = delete; + DBTask &operator=(DBTask &&) = default; + void operator()(sqlite3 *db); + + private: + Type m_type; + folly::dynamic m_args; + Callback m_callback; + + void multiGet(sqlite3 *db); + void multiSet(sqlite3 *db); + void multiRemove(sqlite3 *db); + void clear(sqlite3 *db); + void getAllKeys(sqlite3 *db); + }; + winrt::slim_mutex m_lock; + winrt::slim_condition_variable m_cv; + winrt::Windows::Foundation::IAsyncAction m_action{nullptr}; + std::vector m_tasks; + sqlite3 *m_db; + + // params - array Keys , Callback(error, returnValue) + void multiGet(folly::dynamic args, Callback jsCallback); + // params - array> KeyValuePairs , Callback(error) + void multiSet(folly::dynamic args, Callback jsCallback); + // params - array Keys , Callback(error) + void multiRemove(folly::dynamic args, Callback jsCallback); + // params - args is unused, Callback(error) + void clear(folly::dynamic, Callback jsCallback); + // params - args is unused, Callback(error, returnValue) + void getAllKeys(folly::dynamic, Callback jsCallback); + + void AddTask(DBTask::Type type, folly::dynamic &&args, Callback &&jsCallback); + void AddTask(DBTask::Type type, Callback &&jsCallback) { + AddTask(type, folly::dynamic{}, std::move(jsCallback)); + } + winrt::Windows::Foundation::IAsyncAction RunTasks(); + + static std::string m_dbPath; +}; +} // namespace react +} // namespace facebook diff --git a/vnext/Shared/Modules/ExceptionsManagerModule.cpp b/vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.cpp similarity index 100% rename from vnext/Shared/Modules/ExceptionsManagerModule.cpp rename to vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.cpp diff --git a/vnext/Shared/Modules/ExceptionsManagerModule.h b/vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.h similarity index 100% rename from vnext/Shared/Modules/ExceptionsManagerModule.h rename to vnext/ReactWindowsCore/Modules/ExceptionsManagerModule.h diff --git a/vnext/Shared/Modules/I18nModule.cpp b/vnext/ReactWindowsCore/Modules/I18nModule.cpp similarity index 100% rename from vnext/Shared/Modules/I18nModule.cpp rename to vnext/ReactWindowsCore/Modules/I18nModule.cpp diff --git a/vnext/Shared/Modules/I18nModule.h b/vnext/ReactWindowsCore/Modules/I18nModule.h similarity index 100% rename from vnext/Shared/Modules/I18nModule.h rename to vnext/ReactWindowsCore/Modules/I18nModule.h diff --git a/vnext/Shared/Modules/PlatformConstantsModule.cpp b/vnext/ReactWindowsCore/Modules/PlatformConstantsModule.cpp similarity index 100% rename from vnext/Shared/Modules/PlatformConstantsModule.cpp rename to vnext/ReactWindowsCore/Modules/PlatformConstantsModule.cpp diff --git a/vnext/Shared/Modules/PlatformConstantsModule.h b/vnext/ReactWindowsCore/Modules/PlatformConstantsModule.h similarity index 100% rename from vnext/Shared/Modules/PlatformConstantsModule.h rename to vnext/ReactWindowsCore/Modules/PlatformConstantsModule.h diff --git a/vnext/Shared/Modules/SourceCodeModule.cpp b/vnext/ReactWindowsCore/Modules/SourceCodeModule.cpp similarity index 100% rename from vnext/Shared/Modules/SourceCodeModule.cpp rename to vnext/ReactWindowsCore/Modules/SourceCodeModule.cpp diff --git a/vnext/Shared/Modules/SourceCodeModule.h b/vnext/ReactWindowsCore/Modules/SourceCodeModule.h similarity index 100% rename from vnext/Shared/Modules/SourceCodeModule.h rename to vnext/ReactWindowsCore/Modules/SourceCodeModule.h diff --git a/vnext/Shared/Modules/StatusBarManagerModule.cpp b/vnext/ReactWindowsCore/Modules/StatusBarManagerModule.cpp similarity index 100% rename from vnext/Shared/Modules/StatusBarManagerModule.cpp rename to vnext/ReactWindowsCore/Modules/StatusBarManagerModule.cpp diff --git a/vnext/Shared/Modules/StatusBarManagerModule.h b/vnext/ReactWindowsCore/Modules/StatusBarManagerModule.h similarity index 100% rename from vnext/Shared/Modules/StatusBarManagerModule.h rename to vnext/ReactWindowsCore/Modules/StatusBarManagerModule.h diff --git a/vnext/Shared/Modules/UIManagerModule.cpp b/vnext/ReactWindowsCore/Modules/UIManagerModule.cpp similarity index 100% rename from vnext/Shared/Modules/UIManagerModule.cpp rename to vnext/ReactWindowsCore/Modules/UIManagerModule.cpp diff --git a/vnext/Shared/Modules/UIManagerModule.h b/vnext/ReactWindowsCore/Modules/UIManagerModule.h similarity index 100% rename from vnext/Shared/Modules/UIManagerModule.h rename to vnext/ReactWindowsCore/Modules/UIManagerModule.h diff --git a/vnext/Shared/Modules/WebSocketModule.h b/vnext/ReactWindowsCore/Modules/WebSocketModule.h similarity index 100% rename from vnext/Shared/Modules/WebSocketModule.h rename to vnext/ReactWindowsCore/Modules/WebSocketModule.h diff --git a/vnext/Shared/NativeModuleProvider.h b/vnext/ReactWindowsCore/NativeModuleProvider.h similarity index 100% rename from vnext/Shared/NativeModuleProvider.h rename to vnext/ReactWindowsCore/NativeModuleProvider.h diff --git a/vnext/Shared/OInstance.h b/vnext/ReactWindowsCore/OInstance.h similarity index 100% rename from vnext/Shared/OInstance.h rename to vnext/ReactWindowsCore/OInstance.h diff --git a/vnext/Shared/Pch/pch.cpp b/vnext/ReactWindowsCore/Pch/pch.cpp similarity index 100% rename from vnext/Shared/Pch/pch.cpp rename to vnext/ReactWindowsCore/Pch/pch.cpp diff --git a/vnext/Shared/Pch/pch.h b/vnext/ReactWindowsCore/Pch/pch.h similarity index 100% rename from vnext/Shared/Pch/pch.h rename to vnext/ReactWindowsCore/Pch/pch.h diff --git a/vnext/Shared/ShadowNode.cpp b/vnext/ReactWindowsCore/ShadowNode.cpp similarity index 100% rename from vnext/Shared/ShadowNode.cpp rename to vnext/ReactWindowsCore/ShadowNode.cpp diff --git a/vnext/Shared/ShadowNode.h b/vnext/ReactWindowsCore/ShadowNode.h similarity index 100% rename from vnext/Shared/ShadowNode.h rename to vnext/ReactWindowsCore/ShadowNode.h diff --git a/vnext/Shared/ShadowNodeRegistry.cpp b/vnext/ReactWindowsCore/ShadowNodeRegistry.cpp similarity index 100% rename from vnext/Shared/ShadowNodeRegistry.cpp rename to vnext/ReactWindowsCore/ShadowNodeRegistry.cpp diff --git a/vnext/Shared/ShadowNodeRegistry.h b/vnext/ReactWindowsCore/ShadowNodeRegistry.h similarity index 100% rename from vnext/Shared/ShadowNodeRegistry.h rename to vnext/ReactWindowsCore/ShadowNodeRegistry.h diff --git a/vnext/Shared/Tracing.h b/vnext/ReactWindowsCore/Tracing.h similarity index 100% rename from vnext/Shared/Tracing.h rename to vnext/ReactWindowsCore/Tracing.h diff --git a/vnext/Shared/TurboModuleManager.cpp b/vnext/ReactWindowsCore/TurboModuleManager.cpp similarity index 100% rename from vnext/Shared/TurboModuleManager.cpp rename to vnext/ReactWindowsCore/TurboModuleManager.cpp diff --git a/vnext/Shared/TurboModuleManager.h b/vnext/ReactWindowsCore/TurboModuleManager.h similarity index 100% rename from vnext/Shared/TurboModuleManager.h rename to vnext/ReactWindowsCore/TurboModuleManager.h diff --git a/vnext/Shared/TurboModuleRegistry.h b/vnext/ReactWindowsCore/TurboModuleRegistry.h similarity index 100% rename from vnext/Shared/TurboModuleRegistry.h rename to vnext/ReactWindowsCore/TurboModuleRegistry.h diff --git a/vnext/Shared/Utils.cpp b/vnext/ReactWindowsCore/Utils.cpp similarity index 100% rename from vnext/Shared/Utils.cpp rename to vnext/ReactWindowsCore/Utils.cpp diff --git a/vnext/Shared/Utils.h b/vnext/ReactWindowsCore/Utils.h similarity index 100% rename from vnext/Shared/Utils.h rename to vnext/ReactWindowsCore/Utils.h diff --git a/vnext/Shared/V8JSIRuntimeHolder.cpp b/vnext/ReactWindowsCore/V8JSIRuntimeHolder.cpp similarity index 100% rename from vnext/Shared/V8JSIRuntimeHolder.cpp rename to vnext/ReactWindowsCore/V8JSIRuntimeHolder.cpp diff --git a/vnext/Shared/V8JSIRuntimeHolder.h b/vnext/ReactWindowsCore/V8JSIRuntimeHolder.h similarity index 100% rename from vnext/Shared/V8JSIRuntimeHolder.h rename to vnext/ReactWindowsCore/V8JSIRuntimeHolder.h diff --git a/vnext/Shared/ViewManager.cpp b/vnext/ReactWindowsCore/ViewManager.cpp similarity index 100% rename from vnext/Shared/ViewManager.cpp rename to vnext/ReactWindowsCore/ViewManager.cpp diff --git a/vnext/Shared/WebSocketJSExecutorFactory.h b/vnext/ReactWindowsCore/WebSocketJSExecutorFactory.h similarity index 100% rename from vnext/Shared/WebSocketJSExecutorFactory.h rename to vnext/ReactWindowsCore/WebSocketJSExecutorFactory.h diff --git a/vnext/Shared/WinRTWebSocketResource.cpp b/vnext/ReactWindowsCore/WinRTWebSocketResource.cpp similarity index 100% rename from vnext/Shared/WinRTWebSocketResource.cpp rename to vnext/ReactWindowsCore/WinRTWebSocketResource.cpp diff --git a/vnext/Shared/WinRTWebSocketResource.h b/vnext/ReactWindowsCore/WinRTWebSocketResource.h similarity index 100% rename from vnext/Shared/WinRTWebSocketResource.h rename to vnext/ReactWindowsCore/WinRTWebSocketResource.h diff --git a/vnext/Shared/cdebug.cpp b/vnext/ReactWindowsCore/cdebug.cpp similarity index 100% rename from vnext/Shared/cdebug.cpp rename to vnext/ReactWindowsCore/cdebug.cpp diff --git a/vnext/Shared/etw/build.bat b/vnext/ReactWindowsCore/etw/build.bat similarity index 100% rename from vnext/Shared/etw/build.bat rename to vnext/ReactWindowsCore/etw/build.bat diff --git a/vnext/Shared/etw/react_native_windows.h b/vnext/ReactWindowsCore/etw/react_native_windows.h similarity index 100% rename from vnext/Shared/etw/react_native_windows.h rename to vnext/ReactWindowsCore/etw/react_native_windows.h diff --git a/vnext/Shared/etw/react_native_windows.man b/vnext/ReactWindowsCore/etw/react_native_windows.man similarity index 100% rename from vnext/Shared/etw/react_native_windows.man rename to vnext/ReactWindowsCore/etw/react_native_windows.man diff --git a/vnext/Shared/etw/react_native_windows_etw_res.dll b/vnext/ReactWindowsCore/etw/react_native_windows_etw_res.dll similarity index 100% rename from vnext/Shared/etw/react_native_windows_etw_res.dll rename to vnext/ReactWindowsCore/etw/react_native_windows_etw_res.dll diff --git a/vnext/Shared/etw/register.bat b/vnext/ReactWindowsCore/etw/register.bat similarity index 100% rename from vnext/Shared/etw/register.bat rename to vnext/ReactWindowsCore/etw/register.bat diff --git a/vnext/Shared/targetver.h b/vnext/ReactWindowsCore/targetver.h similarity index 100% rename from vnext/Shared/targetver.h rename to vnext/ReactWindowsCore/targetver.h diff --git a/vnext/Shared/tracing/fbsystrace.h b/vnext/ReactWindowsCore/tracing/fbsystrace.h similarity index 100% rename from vnext/Shared/tracing/fbsystrace.h rename to vnext/ReactWindowsCore/tracing/fbsystrace.h diff --git a/vnext/Shared/tracing/tracing.cpp b/vnext/ReactWindowsCore/tracing/tracing.cpp similarity index 100% rename from vnext/Shared/tracing/tracing.cpp rename to vnext/ReactWindowsCore/tracing/tracing.cpp diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index 37d6489d6b2..d62dc55ed8e 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -15,97 +15,97 @@ - - - + + + - - - - - + + + + + true - - + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + true - - + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + \ No newline at end of file diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index 5998e7d3696..84fef8e10c5 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -4,86 +4,86 @@ - + Source Files\AsyncStorage - + Source Files\AsyncStorage - + Source Files\AsyncStorage - + Source Files\AsyncStorage - + Source Files\tracing - + Source Files\Modules - + Source Files\Modules - + Source Files\Modules - + Source Files\Modules - + Source Files\Modules - + Source Files\Modules - + Source Files\Modules - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files @@ -126,163 +126,163 @@ Header Files\AsyncStorage - + Header Files\AsyncStorage - + Header Files\AsyncStorage - + Header Files\AsyncStorage - + Header Files\etw - + Header Files\Modules - + Header Files\Modules - + Header Files\Modules - + Header Files\Modules - + Header Files\Modules - + Header Files\Modules - + Header Files\Modules - + Header Files\tracing - + Header Files\Pch - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Header Files - + Source Files\etw - + Source Files\etw - + Source Files\etw - + Source Files\etw - \ No newline at end of file + diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index 4ec21c09c5e..6138c659f1e 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -38,7 +38,7 @@ - $(ReactNativeWindowsDir)Shared;$(IncludePath) + $(ReactNativeWindowsDir)ReactWindowsCore;$(IncludePath) From eabf80ab13b44a024d02e9c975dd88f87f2a8dd7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 15:19:07 -0700 Subject: [PATCH 29/38] Removed RNWCore\Pch --- vnext/ReactWindowsCore/Pch/pch.cpp | 4 ---- vnext/ReactWindowsCore/Pch/pch.h | 20 -------------------- vnext/Shared/Shared.vcxitems.filters | 4 ++-- 3 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 vnext/ReactWindowsCore/Pch/pch.cpp delete mode 100644 vnext/ReactWindowsCore/Pch/pch.h diff --git a/vnext/ReactWindowsCore/Pch/pch.cpp b/vnext/ReactWindowsCore/Pch/pch.cpp deleted file mode 100644 index b175e3fd200..00000000000 --- a/vnext/ReactWindowsCore/Pch/pch.cpp +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#include "pch.h" diff --git a/vnext/ReactWindowsCore/Pch/pch.h b/vnext/ReactWindowsCore/Pch/pch.h deleted file mode 100644 index 3d53c320d24..00000000000 --- a/vnext/ReactWindowsCore/Pch/pch.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. - -#pragma once - -#ifdef WINRT -#include "CppWinRTIncludes.h" -#endif - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - -#ifndef WINRT_LEAN_AND_MEAN -#define WINRT_LEAN_AND_MEAN -#endif - -#include - -#include diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index 84fef8e10c5..577e1820c0e 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -4,7 +4,6 @@ - Source Files\AsyncStorage @@ -86,6 +85,7 @@ Source Files + @@ -285,4 +285,4 @@ Source Files\etw - + \ No newline at end of file From b4a1ee5b8314c0bad4a2f378f02423ba3caddbfa Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 16:19:07 -0700 Subject: [PATCH 30/38] Restored AsyncStorageManagerWin32 --- vnext/Directory.Build.targets | 2 ++ vnext/ReactUWP/Base/CoreNativeModules.cpp | 4 +++- vnext/Shared/Shared.vcxitems | 4 ++++ vnext/Shared/Shared.vcxitems.filters | 22 ++++++++++++++++++---- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/vnext/Directory.Build.targets b/vnext/Directory.Build.targets index 1fd3b277357..d94e1d0535d 100644 --- a/vnext/Directory.Build.targets +++ b/vnext/Directory.Build.targets @@ -24,6 +24,7 @@ + @@ -34,6 +35,7 @@ + diff --git a/vnext/ReactUWP/Base/CoreNativeModules.cpp b/vnext/ReactUWP/Base/CoreNativeModules.cpp index 7c02df11bc8..e5edecb3e17 100644 --- a/vnext/ReactUWP/Base/CoreNativeModules.cpp +++ b/vnext/ReactUWP/Base/CoreNativeModules.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -20,6 +21,7 @@ #include #include +// ReactWindowsCore #include namespace react::uwp { @@ -115,7 +117,7 @@ std::vector GetCoreModules( if (HasPackageIdentity()) { return std::make_unique(L"asyncStorage"); } else { - return nullptr; + return std::make_unique(); } }, MakeSerialQueueThread()); diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index d62dc55ed8e..330d7977125 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -33,6 +33,9 @@ + + true + @@ -57,6 +60,7 @@ + diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index 577e1820c0e..44c9f4dcd68 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -1,9 +1,6 @@  - - - Source Files\AsyncStorage @@ -85,7 +82,21 @@ Source Files - + + Source Files\Modules + + + Source Files + + + Source Files + + + Source Files + + + Source Files + @@ -270,6 +281,9 @@ Header Files + + Header Files\Modules + From 472341f6a2467de63a459c2653c8d50cb13668ef Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 16:46:03 -0700 Subject: [PATCH 31/38] Reverted renaming of facebook.react namespace --- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 2 +- .../Desktop.ABITests/NativeLogEventTests.cpp | 10 +++++----- .../NativeTraceEventTests.cpp | 10 +++++----- vnext/Desktop.ABITests/PerfTests.cpp | 6 +++--- .../React.Windows.Desktop.ABITests.vcxproj | 4 ++-- vnext/Desktop.ABITests/SimpleMessageQueue.cpp | 4 ++-- vnext/Desktop.ABITests/SimpleMessageQueue.h | 10 +++++----- vnext/Desktop/ABI/MemoryTracker.cpp | 18 ++++++++--------- vnext/Desktop/ABI/MemoryTracker.h | 20 +++++++++---------- vnext/Desktop/ABI/MemoryTracker.idl | 4 ++-- vnext/Desktop/ABI/MessageQueue.idl | 2 +- vnext/Desktop/ABI/MessageQueueShim.cpp | 6 +++--- vnext/Desktop/ABI/MessageQueueShim.h | 10 +++++----- vnext/Desktop/ABI/NativeLogEventSource.cpp | 10 +++++----- vnext/Desktop/ABI/NativeLogEventSource.h | 12 +++++------ vnext/Desktop/ABI/NativeLogging.idl | 4 ++-- vnext/Desktop/ABI/NativeTraceEventSource.cpp | 10 +++++----- vnext/Desktop/ABI/NativeTraceEventSource.h | 12 +++++------ vnext/Desktop/ABI/NativeTracing.idl | 2 +- vnext/Desktop/React.Windows.Desktop.vcxproj | 2 +- vnext/Desktop/module.g.cpp | 18 ++++++++--------- .../Modules/AsyncStorageModuleWin32.cpp | 2 +- 22 files changed, 89 insertions(+), 89 deletions(-) diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index a8c253d00c4..8513753f8e0 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -6,7 +6,7 @@ #include "SimpleMessageQueue.h" -using namespace winrt::Microsoft::React; +using namespace winrt::facebook::react; namespace ABITests { diff --git a/vnext/Desktop.ABITests/NativeLogEventTests.cpp b/vnext/Desktop.ABITests/NativeLogEventTests.cpp index eb06b77e9b7..5cae95de8be 100644 --- a/vnext/Desktop.ABITests/NativeLogEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeLogEventTests.cpp @@ -2,10 +2,10 @@ // Licensed under the MIT License. #include "pch.h" -#include +#include #include -using namespace winrt::Microsoft::React; +using namespace winrt::facebook::react; using namespace winrt; namespace ABITests { @@ -13,7 +13,7 @@ namespace ABITests { TEST_CLASS (NativeLogEventTests) { // RAII helper to ensure log handlers get unregistered struct NativeLogInitializationGuard { - NativeLogInitializationGuard(::winrt::Microsoft::React::NativeLogHandler const &handler) noexcept { + NativeLogInitializationGuard(::winrt::facebook::react::NativeLogHandler const &handler) noexcept { m_registrationCookie = NativeLogEventSource::InitializeLogging(handler); } @@ -30,9 +30,9 @@ TEST_CLASS (NativeLogEventTests) { init_apartment(winrt::apartment_type::single_threaded); // anticipatory, see TODO below - std::vector> logMessages; + std::vector> logMessages; - NativeLogHandler handler{[&logMessages](::winrt::Microsoft::React::LogLevel l, hstring const &m) { + NativeLogHandler handler{[&logMessages](::winrt::facebook::react::LogLevel l, hstring const &m) { logMessages.emplace_back(l, m.c_str()); }}; diff --git a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp index c14c6b92130..674b6c7f99a 100644 --- a/vnext/Desktop.ABITests/NativeTraceEventTests.cpp +++ b/vnext/Desktop.ABITests/NativeTraceEventTests.cpp @@ -2,17 +2,17 @@ // Licensed under the MIT License. #include "pch.h" -#include +#include #include #include -using namespace winrt::Microsoft::React; +using namespace winrt::facebook::react; using namespace winrt; namespace ABITests { TEST_CLASS (NativeTraceEventTests) { - struct TestTraceHandler : public winrt::implements { + struct TestTraceHandler : public winrt::implements { void JSBeginSection(param::hstring const &profileName, param::hstring const &args) const { if (this->OnJSBeginSection) { this->OnJSBeginSection(((hstring)profileName).c_str(), ((hstring)args).c_str()); @@ -67,7 +67,7 @@ TEST_CLASS (NativeTraceEventTests) { // RAII helper to ensure trace handlers get unregistered struct NativeTraceInitializationGuard { - NativeTraceInitializationGuard(const ::winrt::Microsoft::React::INativeTraceHandler &handler) noexcept { + NativeTraceInitializationGuard(const ::winrt::facebook::react::INativeTraceHandler &handler) noexcept { m_registrationCookie = NativeTraceEventSource::InitializeTracing(handler); } @@ -83,7 +83,7 @@ TEST_CLASS (NativeTraceEventTests) { TEST_METHOD(NativeTraceEventHandler_Registered) { init_apartment(winrt::apartment_type::single_threaded); - ::winrt::Microsoft::React::INativeTraceHandler handler = winrt::make(); + ::winrt::facebook::react::INativeTraceHandler handler = winrt::make(); // anticipatory, see TODO below std::stack> jsSections; diff --git a/vnext/Desktop.ABITests/PerfTests.cpp b/vnext/Desktop.ABITests/PerfTests.cpp index e5454da0de0..486ca895825 100644 --- a/vnext/Desktop.ABITests/PerfTests.cpp +++ b/vnext/Desktop.ABITests/PerfTests.cpp @@ -2,11 +2,11 @@ // Licensed under the MIT License. #include "pch.h" -#include +#include #include -using namespace winrt::Microsoft::React; +using namespace winrt::facebook::react; using namespace winrt; namespace ABITests { @@ -16,7 +16,7 @@ namespace ABITests { TEST_CLASS (PerfTests) { static const uint32_t iterations = 100000000; - static void HandleLogEvents(::winrt::Microsoft::React::LogLevel l, hstring const &m) {} + static void HandleLogEvents(::winrt::facebook::react::LogLevel l, hstring const &m) {} TEST_METHOD(TimeNewAbiInitializeLogging) { // ensure the DLL has been loaded before starting perf measurements diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj index 0a12a1ead96..f2028e8e6e4 100644 --- a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj +++ b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj @@ -103,8 +103,8 @@ 'GetTargetFileName' MSBuild task in the 'GetRNDllPath' target below (and potentially share build logic with it). --> - - $(OutputPath)..\React.Windows.Desktop\Microsoft.React.winmd + + $(OutputPath)..\React.Windows.Desktop\facebook.react.winmd $(OutputPath)..\React.Windows.Desktop\Microsoft.ReactNative.winmd diff --git a/vnext/Desktop.ABITests/SimpleMessageQueue.cpp b/vnext/Desktop.ABITests/SimpleMessageQueue.cpp index ff4a3ad844f..8446a868cf4 100644 --- a/vnext/Desktop.ABITests/SimpleMessageQueue.cpp +++ b/vnext/Desktop.ABITests/SimpleMessageQueue.cpp @@ -6,11 +6,11 @@ namespace ABITests { -void SimpleMessageQueue::Run(::winrt::Microsoft::React::QueueItem const &item) const { +void SimpleMessageQueue::Run(::winrt::facebook::react::QueueItem const &item) const { m_items.push(item); } -void SimpleMessageQueue::RunSync(::winrt::Microsoft::React::QueueItem const &item) const { +void SimpleMessageQueue::RunSync(::winrt::facebook::react::QueueItem const &item) const { item(); } diff --git a/vnext/Desktop.ABITests/SimpleMessageQueue.h b/vnext/Desktop.ABITests/SimpleMessageQueue.h index ae30e7b75de..a37d079f374 100644 --- a/vnext/Desktop.ABITests/SimpleMessageQueue.h +++ b/vnext/Desktop.ABITests/SimpleMessageQueue.h @@ -3,22 +3,22 @@ #pragma once #include -#include +#include #include namespace ABITests { -class SimpleMessageQueue : public winrt::implements { +class SimpleMessageQueue : public winrt::implements { public: - void Run(::winrt::Microsoft::React::QueueItem const &item) const; - void RunSync(::winrt::Microsoft::React::QueueItem const &item) const; + void Run(::winrt::facebook::react::QueueItem const &item) const; + void RunSync(::winrt::facebook::react::QueueItem const &item) const; void QuitSync() const; bool IsEmpty() const noexcept; bool DispatchOne(); private: - mutable std::queue<::winrt::Microsoft::React::QueueItem> m_items; + mutable std::queue<::winrt::facebook::react::QueueItem> m_items; }; } // namespace ABITests diff --git a/vnext/Desktop/ABI/MemoryTracker.cpp b/vnext/Desktop/ABI/MemoryTracker.cpp index 69ebb83ee5c..075776ae03c 100644 --- a/vnext/Desktop/ABI/MemoryTracker.cpp +++ b/vnext/Desktop/ABI/MemoryTracker.cpp @@ -2,14 +2,14 @@ #include "MemoryTracker.h" -#include "Microsoft.React.MemoryTracker.g.cpp" +#include "facebook.react.MemoryTracker.g.cpp" #include "MessageQueueShim.h" -namespace winrt::Microsoft::React::implementation { -MemoryTracker::MemoryTracker(Microsoft::React::IMessageQueue const &callbackMessageQueue) { +namespace winrt::facebook::react::implementation { +MemoryTracker::MemoryTracker(facebook::react::IMessageQueue const &callbackMessageQueue) { m_internalMemoryTracker = ::facebook::react::CreateMemoryTracker( - std::make_shared<::Microsoft::React::MessageQueueShim>(callbackMessageQueue)); + std::make_shared<::facebook::react::MessageQueueShim>(callbackMessageQueue)); } uint64_t MemoryTracker::CurrentMemoryUsage() { @@ -20,18 +20,18 @@ uint64_t MemoryTracker::PeakMemoryUsage() { return m_internalMemoryTracker->GetPeakMemoryUsage(); } -Microsoft::React::IMessageQueue MemoryTracker::CallbackMessageQueue() { +facebook::react::IMessageQueue MemoryTracker::CallbackMessageQueue() { return m_abiCallbackMessageQueue; } -void MemoryTracker::CallbackMessageQueue(Microsoft::React::IMessageQueue value) { - m_internalMemoryTracker->SetCallbackMessageQueueThread(std::make_shared<::Microsoft::React::MessageQueueShim>(value)); +void MemoryTracker::CallbackMessageQueue(facebook::react::IMessageQueue value) { + m_internalMemoryTracker->SetCallbackMessageQueueThread(std::make_shared<::facebook::react::MessageQueueShim>(value)); } uint32_t MemoryTracker::AddThresholdHandler( uint64_t threshold, uint32_t minCallbackIntervalInMilliseconds, - Microsoft::React::MemoryThresholdHandler const &handler) { + facebook::react::MemoryThresholdHandler const &handler) { return static_cast(m_internalMemoryTracker->AddThresholdCallback( static_cast(threshold), std::chrono::milliseconds(minCallbackIntervalInMilliseconds), handler)); } @@ -55,4 +55,4 @@ void MemoryTracker::OnDeallocation(uint64_t size) { } #pragma endregion IMemoryTrackerTester -} // namespace winrt::Microsoft::React::implementation +} // namespace winrt::facebook::react::implementation diff --git a/vnext/Desktop/ABI/MemoryTracker.h b/vnext/Desktop/ABI/MemoryTracker.h index 1f09b8bae1f..099b386a775 100644 --- a/vnext/Desktop/ABI/MemoryTracker.h +++ b/vnext/Desktop/ABI/MemoryTracker.h @@ -1,21 +1,21 @@ #pragma once -#include "Microsoft.React.MemoryTracker.g.h" +#include "facebook.react.MemoryTracker.g.h" #include -namespace winrt::Microsoft::React::implementation { +namespace winrt::facebook::react::implementation { struct MemoryTracker : MemoryTrackerT { MemoryTracker() = default; - MemoryTracker(Microsoft::React::IMessageQueue const &callbackMessageQueue); + MemoryTracker(facebook::react::IMessageQueue const &callbackMessageQueue); uint64_t CurrentMemoryUsage(); uint64_t PeakMemoryUsage(); - Microsoft::React::IMessageQueue CallbackMessageQueue(); - void CallbackMessageQueue(Microsoft::React::IMessageQueue value); + facebook::react::IMessageQueue CallbackMessageQueue(); + void CallbackMessageQueue(facebook::react::IMessageQueue value); uint32_t AddThresholdHandler( uint64_t threshold, uint32_t minCallbackIntervalInMilliseconds, - Microsoft::React::MemoryThresholdHandler const &handler); + facebook::react::MemoryThresholdHandler const &handler); bool RemoveThresholdHandler(uint32_t token); #pragma region IMemoryTrackerTester @@ -28,9 +28,9 @@ struct MemoryTracker : MemoryTrackerT { private: std::shared_ptr<::facebook::react::MemoryTracker> m_internalMemoryTracker; - ::winrt::Microsoft::React::IMessageQueue m_abiCallbackMessageQueue; + ::winrt::facebook::react::IMessageQueue m_abiCallbackMessageQueue; }; -} // namespace winrt::Microsoft::React::implementation -namespace winrt::Microsoft::React::factory_implementation { +} // namespace winrt::facebook::react::implementation +namespace winrt::facebook::react::factory_implementation { struct MemoryTracker : MemoryTrackerT {}; -} // namespace winrt::Microsoft::React::factory_implementation +} // namespace winrt::facebook::react::factory_implementation diff --git a/vnext/Desktop/ABI/MemoryTracker.idl b/vnext/Desktop/ABI/MemoryTracker.idl index 499800bc7b4..316cd680c89 100644 --- a/vnext/Desktop/ABI/MemoryTracker.idl +++ b/vnext/Desktop/ABI/MemoryTracker.idl @@ -2,8 +2,8 @@ import "ABI/MessageQueue.idl"; // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different -// namespace, e.g. "Microsoft.React"? -namespace Microsoft.React { +// namespace, e.g. "facebook.react"? +namespace facebook.react { // ABI_REVIEW: // using MemoryThresholdCallback = std::function; diff --git a/vnext/Desktop/ABI/MessageQueue.idl b/vnext/Desktop/ABI/MessageQueue.idl index 036b552238f..a7e8e806c1c 100644 --- a/vnext/Desktop/ABI/MessageQueue.idl +++ b/vnext/Desktop/ABI/MessageQueue.idl @@ -1,4 +1,4 @@ -namespace Microsoft.React { +namespace facebook.react { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/ABI/MessageQueueShim.cpp b/vnext/Desktop/ABI/MessageQueueShim.cpp index 1d50524daf5..02230e05db8 100644 --- a/vnext/Desktop/ABI/MessageQueueShim.cpp +++ b/vnext/Desktop/ABI/MessageQueueShim.cpp @@ -2,9 +2,9 @@ #include "MessageQueueShim.h" -namespace Microsoft::React { +namespace facebook::react { -MessageQueueShim::MessageQueueShim(const ::winrt::Microsoft::React::IMessageQueue &abiMessageQueue) +MessageQueueShim::MessageQueueShim(const ::winrt::facebook::react::IMessageQueue &abiMessageQueue) : m_abiMessageQueue{abiMessageQueue} {} void MessageQueueShim::runOnQueue(std::function &&item) { @@ -19,4 +19,4 @@ void MessageQueueShim::quitSynchronous() { m_abiMessageQueue.QuitSync(); } -} // namespace Microsoft::React +} // namespace facebook::react diff --git a/vnext/Desktop/ABI/MessageQueueShim.h b/vnext/Desktop/ABI/MessageQueueShim.h index 65acbd0e0df..0f1166f80e9 100644 --- a/vnext/Desktop/ABI/MessageQueueShim.h +++ b/vnext/Desktop/ABI/MessageQueueShim.h @@ -1,17 +1,17 @@ #pragma once #include -#include +#include -namespace Microsoft::React { +namespace facebook::react { class MessageQueueShim : public facebook::react::MessageQueueThread { public: - MessageQueueShim(const ::winrt::Microsoft::React::IMessageQueue &abiMessageQueue); + MessageQueueShim(const ::winrt::facebook::react::IMessageQueue &abiMessageQueue); virtual void runOnQueue(std::function &&item) override; virtual void runOnQueueSync(std::function &&item) override; virtual void quitSynchronous() override; private: - ::winrt::Microsoft::React::IMessageQueue m_abiMessageQueue; + ::winrt::facebook::react::IMessageQueue m_abiMessageQueue; }; -} // namespace Microsoft::React +} // namespace facebook::react diff --git a/vnext/Desktop/ABI/NativeLogEventSource.cpp b/vnext/Desktop/ABI/NativeLogEventSource.cpp index 9c3f99c663e..2084168c274 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.cpp +++ b/vnext/Desktop/ABI/NativeLogEventSource.cpp @@ -2,20 +2,20 @@ #include "NativeLogEventSource.h" -#include "Microsoft.React.NativeLogEventSource.g.cpp" +#include "facebook.react.NativeLogEventSource.g.cpp" #include #include using namespace Microsoft::Common::Unicode; -namespace winrt::Microsoft::React::implementation { +namespace winrt::facebook::react::implementation { namespace { -::winrt::Microsoft::React::NativeLogHandler g_abiHandler; +::winrt::facebook::react::NativeLogHandler g_abiHandler; std::atomic g_abiHandlerRegistrationCookie = 0; } // namespace -uint32_t NativeLogEventSource::InitializeLogging(::winrt::Microsoft::React::NativeLogHandler const &handler) { +uint32_t NativeLogEventSource::InitializeLogging(::winrt::facebook::react::NativeLogHandler const &handler) { g_abiHandler = handler; std::function internalHandler = @@ -33,4 +33,4 @@ void NativeLogEventSource::UninitializeLogging(uint32_t cookie) { assert(cookie == g_abiHandlerRegistrationCookie); g_abiHandler = nullptr; } -} // namespace winrt::Microsoft::React::implementation +} // namespace winrt::facebook::react::implementation diff --git a/vnext/Desktop/ABI/NativeLogEventSource.h b/vnext/Desktop/ABI/NativeLogEventSource.h index e13bde622e5..83049e09bfc 100644 --- a/vnext/Desktop/ABI/NativeLogEventSource.h +++ b/vnext/Desktop/ABI/NativeLogEventSource.h @@ -1,14 +1,14 @@ #pragma once -#include "Microsoft.React.NativeLogEventSource.g.h" +#include "facebook.react.NativeLogEventSource.g.h" -namespace winrt::Microsoft::React::implementation { +namespace winrt::facebook::react::implementation { struct NativeLogEventSource { NativeLogEventSource() = default; - static uint32_t InitializeLogging(Microsoft::React::NativeLogHandler const &handler); + static uint32_t InitializeLogging(facebook::react::NativeLogHandler const &handler); static void UninitializeLogging(uint32_t cookie); }; -} // namespace winrt::Microsoft::React::implementation -namespace winrt::Microsoft::React::factory_implementation { +} // namespace winrt::facebook::react::implementation +namespace winrt::facebook::react::factory_implementation { struct NativeLogEventSource : NativeLogEventSourceT {}; -} // namespace winrt::Microsoft::React::factory_implementation +} // namespace winrt::facebook::react::factory_implementation diff --git a/vnext/Desktop/ABI/NativeLogging.idl b/vnext/Desktop/ABI/NativeLogging.idl index bc95502efe9..49ef87e4ef9 100644 --- a/vnext/Desktop/ABI/NativeLogging.idl +++ b/vnext/Desktop/ABI/NativeLogging.idl @@ -12,8 +12,8 @@ // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different -// namespace, e.g. "Microsoft.React"? -namespace Microsoft.React { +// namespace, e.g. "facebook.react"? +namespace facebook.react { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.cpp b/vnext/Desktop/ABI/NativeTraceEventSource.cpp index 5aeb248544e..7f42876fc29 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.cpp +++ b/vnext/Desktop/ABI/NativeTraceEventSource.cpp @@ -2,16 +2,16 @@ #include "NativeTraceEventSource.h" -#include "Microsoft.React.NativeTraceEventSource.g.cpp" +#include "facebook.react.NativeTraceEventSource.g.cpp" #include #include using namespace ::Microsoft::Common::Unicode; -namespace winrt::Microsoft::React::implementation { +namespace winrt::facebook::react::implementation { namespace { -::winrt::Microsoft::React::INativeTraceHandler g_abiHandler; +::winrt::facebook::react::INativeTraceHandler g_abiHandler; std::atomic g_abiHandlerRegistrationCookie = 0; class InternalHandler : public ::facebook::react::INativeTraceHandler{ @@ -45,11 +45,11 @@ NativeEndSection(const char *profileName, const char *args, std::chrono::nanosec } private: -} // namespace winrt::Microsoft::React::implementation +} // namespace winrt::facebook::react::implementation g_internalHandler; } -uint32_t NativeTraceEventSource::InitializeTracing(::winrt::Microsoft::React::INativeTraceHandler const &handler) { +uint32_t NativeTraceEventSource::InitializeTracing(::winrt::facebook::react::INativeTraceHandler const &handler) { g_abiHandler = handler; ::facebook::react::InitializeTracing(&g_internalHandler); return ++g_abiHandlerRegistrationCookie; diff --git a/vnext/Desktop/ABI/NativeTraceEventSource.h b/vnext/Desktop/ABI/NativeTraceEventSource.h index aafa724c9a5..9643a82560d 100644 --- a/vnext/Desktop/ABI/NativeTraceEventSource.h +++ b/vnext/Desktop/ABI/NativeTraceEventSource.h @@ -1,15 +1,15 @@ #pragma once -#include "Microsoft.React.NativeTraceEventSource.g.h" +#include "facebook.react.NativeTraceEventSource.g.h" -namespace winrt::Microsoft::React::implementation { +namespace winrt::facebook::react::implementation { struct NativeTraceEventSource { NativeTraceEventSource() = default; - static uint32_t InitializeTracing(Microsoft::React::INativeTraceHandler const &handler); + static uint32_t InitializeTracing(facebook::react::INativeTraceHandler const &handler); static void UninitializeTracing(uint32_t cookie); }; -} // namespace winrt::Microsoft::React::implementation -namespace winrt::Microsoft::React::factory_implementation { +} // namespace winrt::facebook::react::implementation +namespace winrt::facebook::react::factory_implementation { struct NativeTraceEventSource : NativeTraceEventSourceT {}; -} // namespace winrt::Microsoft::React::factory_implementation +} // namespace winrt::facebook::react::factory_implementation diff --git a/vnext/Desktop/ABI/NativeTracing.idl b/vnext/Desktop/ABI/NativeTracing.idl index 3fdba4d3a44..9c43ef75e7c 100644 --- a/vnext/Desktop/ABI/NativeTracing.idl +++ b/vnext/Desktop/ABI/NativeTracing.idl @@ -1,4 +1,4 @@ -namespace Microsoft.React { +namespace facebook.react { // ABI_REVIEW: // representing diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index b1f4d2a4860..90d230275c4 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -36,7 +36,7 @@ true {95048601-C3DC-475F-ADF8-7C0C764C10D5} React.Windows.Desktop - Microsoft.React + facebook.react en-US 16.0 C++/WinRT diff --git a/vnext/Desktop/module.g.cpp b/vnext/Desktop/module.g.cpp index 9e3d166d31b..a1ed4613ebe 100644 --- a/vnext/Desktop/module.g.cpp +++ b/vnext/Desktop/module.g.cpp @@ -6,9 +6,9 @@ #include "pch.h" #include "winrt/base.h" void* winrt_make_Microsoft_ReactNative_ReactNativeHost(); -void* winrt_make_Microsoft_React_MemoryTracker(); -void* winrt_make_Microsoft_React_NativeLogEventSource(); -void* winrt_make_Microsoft_React_NativeTraceEventSource(); +void* winrt_make_facebook_react_MemoryTracker(); +void* winrt_make_facebook_react_NativeLogEventSource(); +void* winrt_make_facebook_react_NativeTraceEventSource(); bool __stdcall winrt_can_unload_now() noexcept { @@ -33,19 +33,19 @@ void* __stdcall winrt_get_activation_factory([[maybe_unused]] std::wstring_view return winrt_make_Microsoft_ReactNative_ReactNativeHost(); } - if (requal(name, L"Microsoft.React.MemoryTracker")) + if (requal(name, L"facebook.react.MemoryTracker")) { - return winrt_make_Microsoft_React_MemoryTracker(); + return winrt_make_facebook_react_MemoryTracker(); } - if (requal(name, L"Microsoft.React.NativeLogEventSource")) + if (requal(name, L"facebook.react.NativeLogEventSource")) { - return winrt_make_Microsoft_React_NativeLogEventSource(); + return winrt_make_facebook_react_NativeLogEventSource(); } - if (requal(name, L"Microsoft.React.NativeTraceEventSource")) + if (requal(name, L"facebook.react.NativeTraceEventSource")) { - return winrt_make_Microsoft_React_NativeTraceEventSource(); + return winrt_make_facebook_react_NativeTraceEventSource(); } return nullptr; diff --git a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp index db03d075c63..f08358fdadb 100644 --- a/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp +++ b/vnext/ReactWindowsCore/Modules/AsyncStorageModuleWin32.cpp @@ -242,7 +242,7 @@ AsyncStorageModuleWin32::~AsyncStorageModuleWin32() { // condition_variable for the async task to acknowledge cancellation by // nulling out m_action. Once m_action is null, it is safe to proceed // wth closing the DB connection - winrt::slim_shared_lock_guard guard{m_lock}; + winrt::slim_lock_guard guard{m_lock}; swap(tasks, m_tasks); if (m_action) { m_action.Cancel(); From 45e81d98dca88369f708f2434dcaeb7d77601b26 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 16:50:45 -0700 Subject: [PATCH 32/38] Removed ARM from Desktop solution --- vnext/ReactWindows-Desktop.sln | 48 ---------------------------------- 1 file changed, 48 deletions(-) diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 96aa8d66f03..e85d543e442 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -33,7 +33,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FollyWin32", "FollyWin32\Fo EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertySheets", "{6F24927E-EE45-4DB2-91DA-DCC6E98B0C42}" ProjectSection(SolutionItems) = preProject - PropertySheets\ARM.props = PropertySheets\ARM.props PropertySheets\Debug.props = PropertySheets\Debug.props PropertySheets\React.Cpp.props = PropertySheets\React.Cpp.props PropertySheets\Release.props = PropertySheets\Release.props @@ -45,7 +44,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PropertySheets", "PropertyS EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibrary", "{43A78B84-278B-4B99-8887-4029D551173E}" ProjectSection(SolutionItems) = preProject - PropertySheets\StaticLibrary\ARM.props = PropertySheets\StaticLibrary\ARM.props PropertySheets\StaticLibrary\Debug.props = PropertySheets\StaticLibrary\Debug.props PropertySheets\StaticLibrary\Release.props = PropertySheets\StaticLibrary\Release.props PropertySheets\StaticLibrary\Win32.props = PropertySheets\StaticLibrary\Win32.props @@ -55,7 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StaticLibrary", "StaticLibr EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application", "{102E37B8-4BE5-4DC1-A650-16706EFB3306}" ProjectSection(SolutionItems) = preProject - PropertySheets\Application\ARM.props = PropertySheets\Application\ARM.props PropertySheets\Application\Debug.props = PropertySheets\Application\Debug.props PropertySheets\Application\Release.props = PropertySheets\Application\Release.props PropertySheets\Application\Win32.props = PropertySheets\Application\Win32.props @@ -65,7 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DynamicLibrary", "DynamicLibrary", "{2EB5E646-7EB4-4FED-B1A8-0AEEF2D32268}" ProjectSection(SolutionItems) = preProject - PropertySheets\DynamicLibrary\ARM.props = PropertySheets\DynamicLibrary\ARM.props PropertySheets\DynamicLibrary\Debug.props = PropertySheets\DynamicLibrary\Debug.props PropertySheets\DynamicLibrary\Release.props = PropertySheets\DynamicLibrary\Release.props PropertySheets\DynamicLibrary\Win32.props = PropertySheets\DynamicLibrary\Win32.props @@ -129,176 +125,132 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Debug|ARM = Debug|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 - Release|ARM = Release|ARM EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|ARM.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.ActiveCfg = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x64.Build.0 = Debug|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.ActiveCfg = Debug|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Debug|x86.Build.0 = Debug|Win32 - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|ARM.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.ActiveCfg = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x64.Build.0 = Release|x64 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.ActiveCfg = Release|Win32 {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB}.Release|x86.Build.0 = Release|Win32 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|ARM.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.ActiveCfg = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x64.Build.0 = Debug|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.ActiveCfg = Debug|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Debug|x86.Build.0 = Debug|Win32 - {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|ARM.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.ActiveCfg = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x64.Build.0 = Release|x64 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.ActiveCfg = Release|Win32 {96CD24DC-91C2-480A-BC26-EE2250DA80D7}.Release|x86.Build.0 = Release|Win32 - {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|ARM.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.ActiveCfg = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x64.Build.0 = Debug|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.ActiveCfg = Debug|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Debug|x86.Build.0 = Debug|Win32 - {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|ARM.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.ActiveCfg = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x64.Build.0 = Release|x64 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.ActiveCfg = Release|Win32 {74085F13-2DDE-45E5-A0CA-927AC9D0B953}.Release|x86.Build.0 = Release|Win32 - {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|ARM.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.ActiveCfg = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x64.Build.0 = Debug|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.ActiveCfg = Debug|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Debug|x86.Build.0 = Debug|Win32 - {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|ARM.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.ActiveCfg = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x64.Build.0 = Release|x64 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.ActiveCfg = Release|Win32 {95048601-C3DC-475F-ADF8-7C0C764C10D5}.Release|x86.Build.0 = Release|Win32 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|ARM.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.ActiveCfg = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x64.Build.0 = Debug|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.ActiveCfg = Debug|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Debug|x86.Build.0 = Debug|Win32 - {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|ARM.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.ActiveCfg = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x64.Build.0 = Release|x64 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.ActiveCfg = Release|Win32 {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB}.Release|x86.Build.0 = Release|Win32 - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.ActiveCfg = Debug|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|ARM.Build.0 = Debug|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.ActiveCfg = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x64.Build.0 = Debug|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.ActiveCfg = Debug|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Debug|x86.Build.0 = Debug|Win32 - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.ActiveCfg = Release|ARM - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|ARM.Build.0 = Release|ARM {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.ActiveCfg = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x64.Build.0 = Release|x64 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.ActiveCfg = Release|Win32 {700A84FD-F92A-43F1-8D06-B0E0745DF9B5}.Release|x86.Build.0 = Release|Win32 - {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|ARM.ActiveCfg = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.ActiveCfg = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x64.Build.0 = Debug|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.ActiveCfg = Debug|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Debug|x86.Build.0 = Debug|Win32 - {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|ARM.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.ActiveCfg = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.Build.0 = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.Build.0 = Release|Win32 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|ARM.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.ActiveCfg = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x64.Build.0 = Debug|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Debug|x86.ActiveCfg = Debug|x64 - {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|ARM.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.ActiveCfg = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x64.Build.0 = Release|x64 {6F354505-FE3A-4BD2-A9A6-D12BBF37A85C}.Release|x86.ActiveCfg = Release|x64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM.ActiveCfg = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.ActiveCfg = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.Build.0 = Debug|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.ActiveCfg = Debug|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.Build.0 = Debug|Win32 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM.ActiveCfg = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.ActiveCfg = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.Build.0 = Release|x64 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.ActiveCfg = Release|Win32 {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.Build.0 = Release|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM.ActiveCfg = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.ActiveCfg = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.Build.0 = Debug|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.ActiveCfg = Debug|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.Build.0 = Debug|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.ActiveCfg = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32 {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.Build.0 = Release|Win32 - {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|ARM.ActiveCfg = Debug|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x64.ActiveCfg = Debug|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x64.Build.0 = Debug|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x86.ActiveCfg = Debug|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Debug|x86.Build.0 = Debug|Win32 - {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|ARM.ActiveCfg = Release|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x64.ActiveCfg = Release|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x64.Build.0 = Release|x64 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x86.ActiveCfg = Release|Win32 {17DD1B17-3094-40DD-9373-AC2497932ECA}.Release|x86.Build.0 = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.ActiveCfg = Debug|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|ARM.Build.0 = Debug|ARM {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.ActiveCfg = Debug|x64 {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x64.Build.0 = Debug|x64 {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.ActiveCfg = Debug|Win32 {3A1BE021-6877-481A-9C03-7C5A1224E897}.Debug|x86.Build.0 = Debug|Win32 - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.ActiveCfg = Release|ARM - {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|ARM.Build.0 = Release|ARM {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.ActiveCfg = Release|x64 {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x64.Build.0 = Release|x64 {3A1BE021-6877-481A-9C03-7C5A1224E897}.Release|x86.ActiveCfg = Release|Win32 From 4d740b651834e3a99a7a8514f91e5dbd6867e6c0 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 16:58:12 -0700 Subject: [PATCH 33/38] Reverted a couple of needlesly changed files --- vnext/Desktop.ABITests/MemoryTrackerTests.cpp | 3 ++- vnext/Desktop/ABI/MemoryTracker.idl | 2 +- vnext/Desktop/ABI/NativeLogging.idl | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp index 8513753f8e0..64881235c03 100644 --- a/vnext/Desktop.ABITests/MemoryTrackerTests.cpp +++ b/vnext/Desktop.ABITests/MemoryTrackerTests.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include +#include #include "SimpleMessageQueue.h" @@ -48,7 +49,7 @@ TEST_CLASS(MemoryTrackerTests) { TestCheckEqual(1000ull, tracker.PeakMemoryUsage(), "PeakMemoryUsage"); } - + TEST_METHOD(ThresholdHandler_Called) { init_apartment(winrt::apartment_type::single_threaded); diff --git a/vnext/Desktop/ABI/MemoryTracker.idl b/vnext/Desktop/ABI/MemoryTracker.idl index 316cd680c89..fa986c69fb1 100644 --- a/vnext/Desktop/ABI/MemoryTracker.idl +++ b/vnext/Desktop/ABI/MemoryTracker.idl @@ -2,7 +2,7 @@ import "ABI/MessageQueue.idl"; // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different -// namespace, e.g. "facebook.react"? +// namespace, e.g. "Microsoft.React"? namespace facebook.react { // ABI_REVIEW: diff --git a/vnext/Desktop/ABI/NativeLogging.idl b/vnext/Desktop/ABI/NativeLogging.idl index 49ef87e4ef9..ff242084612 100644 --- a/vnext/Desktop/ABI/NativeLogging.idl +++ b/vnext/Desktop/ABI/NativeLogging.idl @@ -12,7 +12,7 @@ // ABI_REVIEW: // Given this is a new API without usage legacy, should we use the chance to introduce a different -// namespace, e.g. "facebook.react"? +// namespace, e.g. "Microsoft.React"? namespace facebook.react { // ABI_REVIEW: From c29d26040e4912aebc7e385ed5b4c48d80cb4bc9 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 17:06:57 -0700 Subject: [PATCH 34/38] Reverted remaining Shared-referencing files --- vnext/PropertySheets/ReactCommunity.cpp.props | 2 +- vnext/Scripts/ReactWin32.nuspec | 36 +++++++++---------- vnext/Scripts/Tfs/Layout-Headers.ps1 | 6 ++-- vnext/layoutFilesForNuget.bat | 1 + vnext/package.json | 3 +- 5 files changed, 25 insertions(+), 23 deletions(-) diff --git a/vnext/PropertySheets/ReactCommunity.cpp.props b/vnext/PropertySheets/ReactCommunity.cpp.props index 6b8a5a53923..f7c2da01f8b 100644 --- a/vnext/PropertySheets/ReactCommunity.cpp.props +++ b/vnext/PropertySheets/ReactCommunity.cpp.props @@ -10,7 +10,7 @@ FOLLY_MOBILE=1;%(PreprocessorDefinitions) - $(FollyDir);$(ReactNativeDir)\ReactCommon;$(ReactNativeDir)\ReactCommon\jscallinvoker;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(YogaDir);%(AdditionalIncludeDirectories) + $(FollyDir);$(ReactNativeDir)\ReactCommon;$(ReactNativeDir)\ReactCommon\jscallinvoker;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(YogaDir);%(AdditionalIncludeDirectories) FOLLY_NO_CONFIG;NOMINMAX;_HAS_AUTO_PTR_ETC;RN_EXPORT=;__unused=[[maybe_unused]];%(PreprocessorDefinitions) diff --git a/vnext/Scripts/ReactWin32.nuspec b/vnext/Scripts/ReactWin32.nuspec index df4c4a82bdc..c54093c805e 100644 --- a/vnext/Scripts/ReactWin32.nuspec +++ b/vnext/Scripts/ReactWin32.nuspec @@ -29,23 +29,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -54,7 +54,7 @@ - + diff --git a/vnext/Scripts/Tfs/Layout-Headers.ps1 b/vnext/Scripts/Tfs/Layout-Headers.ps1 index 5a8bdc9921b..85a671d4f22 100644 --- a/vnext/Scripts/Tfs/Layout-Headers.ps1 +++ b/vnext/Scripts/Tfs/Layout-Headers.ps1 @@ -57,9 +57,9 @@ Get-ChildItem -Path $ReactWindowsRoot\stubs -Name -Recurse -Include $patterns | } # React.Windows.Core headers -Get-ChildItem -Path $ReactWindowsRoot\Shared -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` - -Path $ReactWindowsRoot\Shared\$_ ` - -Destination (New-Item -ItemType Directory $TargetRoot\inc\Shared\$(Split-Path $_) -Force) ` +Get-ChildItem -Path $ReactWindowsRoot\ReactWindowsCore -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` + -Path $ReactWindowsRoot\ReactWindowsCore\$_ ` + -Destination (New-Item -ItemType Directory $TargetRoot\inc\ReactWindowsCore\$(Split-Path $_) -Force) ` -Force } diff --git a/vnext/layoutFilesForNuget.bat b/vnext/layoutFilesForNuget.bat index 9b0750b6114..31792b5de33 100644 --- a/vnext/layoutFilesForNuget.bat +++ b/vnext/layoutFilesForNuget.bat @@ -56,6 +56,7 @@ mkdir %DESTROOT%\inc\ReactUWP >nul 2>&1 %COPYCMD% %RNROOT%\ReactCommon\jsi %DESTROOT%\inc\jsi %COPYCMD% %SRCROOT%\stubs %DESTROOT%\inc\stubs %COPYCMD% %SRCROOT%\Desktop\*.h %DESTROOT%\inc\ReactWin32 +%COPYCMD% %SRCROOT%\ReactWindowsCore\*.h %DESTROOT%\inc\ReactWindowsCore %COPYCMD% %SRCROOT%\ReactUWP\*.h %DESTROOT%\inc\ReactUWP %COPYCMD% %SRCROOT%\include %DESTROOT%\inc\include %COPYCMD% %SRCROOT%\Test\*.h %DESTROOT%\inc\Test diff --git a/vnext/package.json b/vnext/package.json index 09340a678e5..150f3cbfbc0 100644 --- a/vnext/package.json +++ b/vnext/package.json @@ -91,6 +91,7 @@ "/PropertySheets", "/ReactCommon", "/ReactUWP", + "/ReactWindowsCore", "/Scripts", "/Shared", "/stubs", @@ -114,4 +115,4 @@ "/typings-index.js.map", "/rn-get-polyfills.js" ] -} \ No newline at end of file +} From 2f5143337140c4da296ec83da8e25172b91d08be Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 17:10:13 -0700 Subject: [PATCH 35/38] Added RNwCore README --- vnext/ReactWindowsCore/README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 vnext/ReactWindowsCore/README.md diff --git a/vnext/ReactWindowsCore/README.md b/vnext/ReactWindowsCore/README.md new file mode 100644 index 00000000000..aac59aca8ba --- /dev/null +++ b/vnext/ReactWindowsCore/README.md @@ -0,0 +1,4 @@ +# DO NOT ADD NEW SOURCES INTO THIS DIRECTORY + +This directory will be removed, and its sources will be relocated.\ +It is kept for compatibility purposes and is scheduled for removal when React Native Windows moves to React Native 0.63. From 8815f7eb002c3f75b67b4b6072a287704eb1282e Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 17:38:21 -0700 Subject: [PATCH 36/38] Reverted Unit Tests project file --- vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index de2bf1e09c4..84f5784e4f1 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -40,7 +40,7 @@ - $(ReactNativeWindowsDir)\Mso;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Desktop;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(MSBuildThisFileDirectory);$(IncludePath) + $(ReactNativeWindowsDir)\Mso;$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Desktop;$(FollyDir);$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(MSBuildThisFileDirectory);$(IncludePath) true From 8e91796160fa2895f31ea425cceff7366a5940c6 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 21:15:25 -0700 Subject: [PATCH 37/38] Upgrade doc references to RN v0.62.0 --- docs/project-structure.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/project-structure.md b/docs/project-structure.md index 71499f50f0b..baad3e75798 100644 --- a/docs/project-structure.md +++ b/docs/project-structure.md @@ -40,7 +40,7 @@ Holds sources common to both Windows variants, that require different build conf *Static Library*
React Native core, cross-platform C++ types and interfaces.
Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.60.0/ReactCommon. +See https://github.com/facebook/react-native/tree/v0.62.0/ReactCommon. ### Folly *Static Library*
@@ -74,9 +74,9 @@ Common framework for running out of process and/or full React instance testing. ### IntegrationTests (Node Project) *MSBuild Node project. For reading/editing purposes only (no build artifact)*
-Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.60.0/RNTester). +Set of JavaScript component tests for [RNTester](https://github.com/facebook/react-native/tree/v0.62.0/RNTester). Sources provided as part of the `react-native` Node dependency. Not part of this repository.
-See https://github.com/facebook/react-native/tree/v0.60.0/IntegrationTests. +See https://github.com/facebook/react-native/tree/v0.62.0/IntegrationTests. ## Windows Desktop Projects From 46d0396150cc57bda73d47632406e22007a1900c Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Wed, 27 May 2020 23:40:52 -0700 Subject: [PATCH 38/38] Removed CI obsolete tasks --- .ado/templates/prepare-env.yml | 6 +----- .ado/templates/react-native-init.yml | 10 +++------- .ado/windows-vs-pr.yml | 12 ++++-------- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index fcc37dac7a7..f1a3c3435d1 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -42,10 +42,6 @@ steps: inputs: script: yarn ${{ parameters.yarnBuildCmd }} - - template: install-SDK.yml - parameters: - sdkVersion: $(Win10Version) - - task: PowerShell@2 displayName: List Visual Studio Components inputs: @@ -69,4 +65,4 @@ steps: inputs: targetType: inline # filePath | inline script: | - Get-WmiObject Win32_LogicalDisk \ No newline at end of file + Get-WmiObject Win32_LogicalDisk diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index 95d13d15e5b..8eb3a63dc5e 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -21,7 +21,7 @@ steps: - task: CmdLine@2 displayName: yarn install (local react-native-windows) inputs: - script: yarn install --frozen-lockfile + script: yarn install --frozen-lockfile - task: CmdLine@2 displayName: yarn build @@ -99,10 +99,6 @@ steps: condition: and(succeeded(), eq('true', ${{ parameters.experimentalNugetDependency }})) - - template: install-SDK.yml - parameters: - sdkVersion: $(Win10Version) - - task: PowerShell@2 displayName: List Visual Studio Components inputs: @@ -143,8 +139,8 @@ steps: inputs: script: npx --no-install react-native bundle --entry-file index.js --platform windows --bundle-output test.bundle workingDirectory: $(Agent.BuildDirectory)\testcli - - # We are experiencing random package restore failures. + + # We are experiencing random package restore failures. # We want to uploading the vedaccio logs to aid in diagnosing if it is verdaccio or npmjs.org # To do so we have to kill the existing server because it keeps a file-lock on the log file - task: PowerShell@2 diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index d1aa1bdc141..3cee0fad469 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -368,10 +368,6 @@ jobs: clean: false submodules: false - - task: VisualStudioTestPlatformInstaller@1 - inputs: - versionSelector: latestStable - - template: templates/build-rnw.yml parameters: yarnBuildCmd: build @@ -405,7 +401,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest - template: templates/stop-packagers.yml @@ -428,7 +424,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/blame -- RunConfiguration.TestSessionTimeout=300000' condition: and(succeeded(), ne(variables['BuildConfiguration'], 'Debug')) @@ -444,7 +440,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: false collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/ListTests' condition: failed() @@ -460,7 +456,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: toolsInstaller + vsTestVersion: latest otherConsoleOptions: '/blame -- RunConfiguration.TestSessionTimeout=300000' condition: failed()