Skip to content

Remove CORE_ABI and bring rnwin32 and MS.RN much closer in functionality #16079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
acoates-ms wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Remove CORE_ABI and bring rnwin32 and MS.RN much closer in functionality #16079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8309df
Remove CORE_ABI and bring rnwin32 and MS.RN much closer in functionality
acoates-ms May 1, 2026
e4cdcf1
format
acoates-ms May 1, 2026
338735f
Change files
acoates-ms May 1, 2026
81fc423
Move unification
acoates-ms May 1, 2026
f299c7b
Fixes
acoates-ms May 1, 2026
756c662
fix
acoates-ms May 1, 2026
4637469
fix
acoates-ms May 1, 2026
a852f2e
fix
acoates-ms May 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
RnwNewArch;
UseFabric;
FollyDir;
IncludeFabricInterface;
UseFabric;
YogaDir;
WinVer;
Expand Down
7 changes: 7 additions & 0 deletions change/react-native-windows-83a04eac-5263-4e7a-99d8-85f1ac764999.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Remove CORE_ABI and bring rnwin32 and MS.RN much closer in functionality",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
4 changes: 0 additions & 4 deletions vnext/Desktop.ABITests/Application.manifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@
<assemblyIdentity name="React.Windows.Desktop.ABITests" type="win32" version="1.0.0.0" />

<file name="react-native-win32.dll">
<activatableClass
name="facebook.react.NativeLogEventSource"
threadingModel="both"
xmlns="urn:schemas-microsoft-com:winrt.v1" />
<activatableClass
name="Microsoft.Internal.TestController"
threadingModel="both"
Expand Down
47 changes: 0 additions & 47 deletions vnext/Desktop.ABITests/NativeLogEventTests.cpp
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions vnext/Desktop.ABITests/PerfTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License.

#include "pch.h"
#include <winrt/facebook.react.h>

#include <Shared/Logging.h>

Expand All @@ -16,30 +15,6 @@ namespace ABITests {
TEST_CLASS (PerfTests) {
static const uint32_t iterations = 100000000;

static void HandleLogEvents(::winrt::facebook::react::LogLevel l, hstring const &m) {}

TEST_METHOD(TimeNewAbiInitializeLogging) {
// ensure the DLL has been loaded before starting perf measurements
uint32_t loggingRegistrationToken = NativeLogEventSource::InitializeLogging(HandleLogEvents);

LARGE_INTEGER accu{0}, a{0}, b{0};

NativeLogHandler logHandler = HandleLogEvents;

QueryPerformanceCounter(&a);

for (int i = 0; i < iterations; ++i) {
NativeLogEventSource::InitializeLogging(logHandler);
}

QueryPerformanceCounter(&b);
accu.QuadPart = b.QuadPart - a.QuadPart;

PrintResult("TimeNewAbiInitializeLogging", iterations, accu.QuadPart);

NativeLogEventSource::UninitializeLogging(loggingRegistrationToken);
}

TEST_METHOD(TimeOldAbiInitializeLogging) {
LARGE_INTEGER accu{0}, a{0}, b{0};

Expand Down
12 changes: 0 additions & 12 deletions vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
<V8AppPlatform>win32</V8AppPlatform>
<!-- Default enable WinUI3. -->
<UseWinUI3 Condition="'$(UseWinUI3)' == ''">true</UseWinUI3>
<!-- Desktop can use WinUI3 in Old Arch so disable the check. -->
<ForcePaperUseWinUI3 Condition="'$(UseWinUI3)'=='true'">true</ForcePaperUseWinUI3>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />
Expand Down Expand Up @@ -75,12 +73,8 @@
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(VCInstallDir)UnitTest\include;$(ReactNativeDir)\ReactCommon;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<!--
CORE_ABI - marks ABI elements that are shared between UWP and Win32 DLLs.
-->
<PreprocessorDefinitions>
_CONSOLE;
CORE_ABI;
MSO_MOTIFCPP;
%(PreprocessorDefinitions)
</PreprocessorDefinitions>
Expand Down Expand Up @@ -124,9 +118,6 @@
'GetTargetFileName' MSBuild task in the 'GetRNDllPath' target below (and potentially share
build logic with it).
-->
<CppWinRTDynamicProjectWinMDReferences Include="$(OutputPath)..\React.Windows.Desktop\facebook.react.winmd">
<WinMDPath>$(OutputPath)..\React.Windows.Desktop\facebook.react.winmd</WinMDPath>
</CppWinRTDynamicProjectWinMDReferences>
<CppWinRTDynamicProjectWinMDReferences Include="$(OutputPath)..\React.Windows.Desktop\Microsoft.Internal.winmd">
<WinMDPath>$(OutputPath)..\React.Windows.Desktop\Microsoft.Internal.winmd</WinMDPath>
</CppWinRTDynamicProjectWinMDReferences>
Expand Down Expand Up @@ -154,8 +145,6 @@
<ClCompile Include="ReactPackageBuilderTests.cpp" />
<ClCompile Include="ReactPackageProviderTests.cpp" />
<ClCompile Include="RedBoxTests.cpp" />
<ClCompile Include="SimpleMessageQueue.cpp" />
<ClCompile Include="NativeLogEventTests.cpp" />
<ClCompile Include="pch.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
Expand All @@ -168,7 +157,6 @@
<ItemGroup>
<ClInclude Include="..\Microsoft.ReactNative.IntegrationTests\TestEventService.h" />
<ClInclude Include="..\Microsoft.ReactNative.IntegrationTests\TestReactNativeHostHolder.h" />
<ClInclude Include="SimpleMessageQueue.h" />
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="DynamicReaderWriterTests.cpp" />
<ClCompile Include="NativeLogEventTests.cpp" />
<ClCompile Include="PerfTests.cpp" />
<ClCompile Include="ReactContextTests.cpp" />
<ClCompile Include="ReactDispatcherTests.cpp" />
Expand All @@ -35,17 +34,11 @@
<ClCompile Include="main.cpp">
<Filter>Utilities</Filter>
</ClCompile>
<ClCompile Include="SimpleMessageQueue.cpp">
<Filter>Utilities</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="pch.h">
<Filter>Utilities</Filter>
</ClInclude>
<ClInclude Include="SimpleMessageQueue.h">
<Filter>Utilities</Filter>
</ClInclude>
<ClInclude Include="..\Microsoft.ReactNative.IntegrationTests\TestEventService.h">
<Filter>Utilities</Filter>
</ClInclude>
Expand Down
33 changes: 0 additions & 33 deletions vnext/Desktop.ABITests/SimpleMessageQueue.cpp
View file
Open in desktop

This file was deleted.

24 changes: 0 additions & 24 deletions vnext/Desktop.ABITests/SimpleMessageQueue.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
<V8AppPlatform>win32</V8AppPlatform>
<!-- Default enable WinUI3. -->
<UseWinUI3 Condition="'$(UseWinUI3)' == ''">true</UseWinUI3>
<!-- Desktop can use WinUI3 in Old Arch so disable the check. -->
<ForcePaperUseWinUI3 Condition="'$(UseWinUI3)'=='true'">true</ForcePaperUseWinUI3>
<UseV8>true</UseV8>
<V8AppPlatform>win32</V8AppPlatform>
</PropertyGroup>
Expand Down Expand Up @@ -66,12 +64,9 @@
<SDLCheck>true</SDLCheck>
<!--
See https://stackoverflow.com/questions/42847103/stdtr1-with-visual-studio-2017.

CORE_ABI - marks ABI elements that are shared between UWP and Win32 DLLs.
-->
<PreprocessorDefinitions>
BOOST_ASIO_HAS_IOCP;
CORE_ABI;
_WIN32_WINNT=$(WinVer);
WIN32;
_WINDOWS;
Expand Down
Loading
Loading