react-native-windows 0.78.6 → 0.79.0-preview.1

package/ReactCommon/TEMP_UntilReactCommonUpdate/reactperflogger/reactperflogger/ReactPerfettoLogger.cpp

@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "ReactPerfettoLogger.h"
+
+#if defined(WITH_PERFETTO)
+#include "ReactPerfetto.h"
+#elif defined(WITH_FBSYSTRACE)
+#include <fbsystrace.h>
+#endif
+
+#include <chrono>
+
+namespace facebook::react {
+
+namespace {
+
+#if defined(WITH_PERFETTO)
+const std::string PERFETTO_DEFAULT_TRACK_NAME = "# Web Performance";
+const std::string PERFETTO_TRACK_NAME_PREFIX = "# Web Performance: ";
+
+std::string toPerfettoTrackName(
+    const std::optional<std::string_view>& trackName) {
+  return trackName.has_value()
+      ? PERFETTO_TRACK_NAME_PREFIX + std::string(trackName.value())
+      : PERFETTO_DEFAULT_TRACK_NAME;
+}
+#elif defined(WITH_FBSYSTRACE)
+int64_t getDeltaNanos(double jsTime) {
+  auto now = std::chrono::steady_clock::now().time_since_epoch();
+  return static_cast<int64_t>(jsTime * 1.e6) -
+      std::chrono::duration_cast<std::chrono::nanoseconds>(now).count();
+}
+#endif
+
+} // namespace
+
+/* static */ bool ReactPerfettoLogger::isTracing() {
+#if defined(WITH_PERFETTO)
+  return TRACE_EVENT_CATEGORY_ENABLED("react-native");
+#elif defined(WITH_FBSYSTRACE)
+  // return fbsystrace_is_tracing(TRACE_TAG_REACT_APPS); // [Windows #14699]
+  return false; // [Windows #14699]
+#else
+  return false;
+#endif
+}
+
+/* static */ void ReactPerfettoLogger::measure(
+    const std::string_view& eventName,
+    double startTime,
+    double endTime,
+    const std::optional<std::string_view>& trackName) {
+#if defined(WITH_PERFETTO)
+  if (TRACE_EVENT_CATEGORY_ENABLED("react-native")) {
+    auto track = getPerfettoWebPerfTrackAsync(toPerfettoTrackName(trackName));
+    TRACE_EVENT_BEGIN(
+        "react-native",
+        perfetto::DynamicString(eventName.data(), eventName.size()),
+        track,
+        performanceNowToPerfettoTraceTime(startTime));
+    TRACE_EVENT_END(
+        "react-native", track, performanceNowToPerfettoTraceTime(endTime));
+  }
+#elif defined(WITH_FBSYSTRACE)
+  /* [Windows #14699
+  static int cookie = 0;
+  fbsystrace_begin_async_section_with_timedelta(
+      TRACE_TAG_REACT_APPS, eventName.data(), cookie, getDeltaNanos(startTime));
+  fbsystrace_end_async_section_with_timedelta(
+      TRACE_TAG_REACT_APPS, eventName.data(), cookie, getDeltaNanos(endTime));
+  cookie++;
+  Windows] */
+#endif
+}
+
+/* static */ void ReactPerfettoLogger::mark(
+    const std::string_view& eventName,
+    double startTime,
+    const std::optional<std::string_view>& trackName) {
+#if defined(WITH_PERFETTO)
+  if (TRACE_EVENT_CATEGORY_ENABLED("react-native")) {
+    TRACE_EVENT_INSTANT(
+        "react-native",
+        perfetto::DynamicString(eventName.data(), eventName.size()),
+        getPerfettoWebPerfTrackSync(toPerfettoTrackName(trackName)),
+        performanceNowToPerfettoTraceTime(startTime));
+  }
+#endif
+}
+
+} // namespace facebook::react

package/Scripts/Microsoft.ReactNative.Managed.CodeGen.nuspec

@@ -18,6 +18,6 @@
     <file src="$nugetroot$\Microsoft.ReactNative.Managed.CodeGen.targets" target="build"/>
     <file src="$nugetroot$\Microsoft.ReactNative.VersionCheck.targets" target="build"/>
 
-    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed.CodeGen\Publish\**" target="tools"/>
+    <file src="$nugetroot$\ReactWindows\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed.CodeGen\Publish\**" target="tools"/>
   </files>
 </package>

package/Scripts/Microsoft.ReactNative.Managed.nuspec

@@ -26,39 +26,39 @@
     <file src="$nugetroot$\Microsoft.ReactNative.Managed.targets" target="build"/>
     <file src="$nugetroot$\Microsoft.ReactNative.VersionCheck.targets" target="build"/>
 
-    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed\ref\Microsoft.ReactNative.Managed.dll" target="ref\uap10.0"/>
-    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.xml" target="ref\uap10.0"/> 
+    <file src="$nugetroot$\ReactWindows\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed\ref\Microsoft.ReactNative.Managed.dll" target="ref\uap10.0"/>
+    <file src="$nugetroot$\ReactWindows\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.xml" target="ref\uap10.0"/> 
 
     <!-- Include in Microsoft.ReactNative.Managed -->
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-arm64\native" />
 
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x86\native" />
 
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x64\native" />
 
     <!-- Include in Microsoft.ReactNative.Managed.Debug -->
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-arm64\native" />
 
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x86\native" />
 
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.dll" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pdb" target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative.Managed\Microsoft.ReactNative.Managed.pri" target="runtimes\win10-x64\native" />
 
     <!-- XBF files need to be included for Debug since they are not embedded in the PRI -->
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-arm64\native" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x86\native" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x64\native" />
 
   </files>
 </package>

package/Scripts/Microsoft.ReactNative.VersionCheck.targets

@@ -66,8 +66,6 @@
 
     <PropertyGroup>
       <_ReactNativeWindowsVersionCheckNugetVersion>$$nuGetPackageVersion$$</_ReactNativeWindowsVersionCheckNugetVersion>
-      <!-- Strip out the -Fabric qualifier from the version string if present -->
-      <_ReactNativeWindowsVersionCheckNugetVersion>$(_ReactNativeWindowsVersionCheckNugetVersion.Replace('-Fabric', ''))</_ReactNativeWindowsVersionCheckNugetVersion>
     </PropertyGroup>
    
     <!-- Validate package.json file -->

package/Scripts/Microsoft.ReactNative.nuspec

@@ -19,48 +19,53 @@
     <file src="$nugetroot$\Microsoft.ReactNative.targets" target="build\native"/>
     <file src="$nugetroot$\Microsoft.ReactNative.VersionCheck.targets" target="build\native"/>
 
-    <file src="$nugetroot$\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd"   target="lib\uap10.0"/>
+    <file src="$nugetroot$\ReactWindows\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\uap10.0-old"/>
+    <file src="$nugetroot$\ReactWindowsFabric\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative\Microsoft.ReactNative.winmd" target="lib\uap10.0"/>
+
+    <file src="$nugetroot$\ReactWindowsFabric\$baseplatform$\$baseconfiguration$\Microsoft.ReactNative.CsWinRT\Microsoft.ReactNative.Projection.*" target="lib\net6.0-windows10.0.22621.0" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+
     <!-- 
     Uncomment once we are producing doc xml file
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.xml"   target="lib\uap10.0"/> 
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.xml" target="lib\uap10.0-old"/> 
+    <file src="$nugetroot$\ReactWindowsFabric\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.xml" target="lib\uap10.0"/> 
     -->
 
     <!-- Included in Microsoft.ReactNative -->
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\arm64" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-arm64\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-arm64\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-arm64" />
+    <file src="$nugetroot$\ReactWindowsFabric\ARM64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-arm64" />
 
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\x86" />
+    <file src="$nugetroot$\ReactWindows\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x86\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x86\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-x86" />
+    <file src="$nugetroot$\ReactWindowsFabric\x86\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-x86" />
 
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\x64" />
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x64\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x64\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-x64" />
+    <file src="$nugetroot$\ReactWindowsFabric\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-x64" />
 
     <!-- Included in Microsoft.ReactNative.Debug -->
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\arm64" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-arm64\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-arm64\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-arm64" />
+    <file src="$nugetroot$\ReactWindowsFabric\ARM64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-arm64" />
 
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\x86" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x86\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x86\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-x86" />
+    <file src="$nugetroot$\ReactWindowsFabric\x86\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-x86" />
 
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.dll" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pdb" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.pri" target="runtimes\win10-x64\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\x64" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x64\native-old" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindowsFabric\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.*" target="runtimes\win10-x64\native" exclude="**\*.exp;**\*.lib;**\*.winmd" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native-old\win10-x64" />
+    <file src="$nugetroot$\ReactWindowsFabric\x64\Debug\Microsoft.ReactNative\Microsoft.ReactNative.lib" target="lib\native\win10-x64" />
 
     <!-- XBF files need to be included for Debug since they are not embedded in the PRI -->
-    <file src="$nugetroot$\ARM64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-arm64\native" />
-    <file src="$nugetroot$\x86\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x86\native" />
-    <file src="$nugetroot$\x64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x64\native" />
+    <file src="$nugetroot$\ReactWindows\ARM64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-arm64\native-old" />
+    <file src="$nugetroot$\ReactWindows\x86\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x86\native-old" />
+    <file src="$nugetroot$\ReactWindows\x64\Debug\Microsoft.ReactNative\**\*.xbf"  target="runtimes\win10-x64\native-old" />
 
   </files>
 </package>

package/Scripts/Microsoft.ReactNative.targets

@@ -5,17 +5,20 @@
   <PropertyGroup>
     <Native-Platform Condition="'$(Platform)' == 'Win32'">x86</Native-Platform>
     <Native-Platform Condition="'$(Platform)' != 'Win32'">$(Platform)</Native-Platform>
-    <_rnwFolder>$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native\</_rnwFolder>
+    <RnwNewArch Condition="'$(RnwNewArch)'==''">false</RnwNewArch>
+
+    <_rnwFolder>$(MSBuildThisFileDirectory)..\..\runtimes\win10-$(Native-Platform)\native</_rnwFolder>
+    <_rnwArch Condition="'$(RnwNewArch)'!='true'">-old</_rnwArch>
   </PropertyGroup>
   
   <ItemGroup>
-    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0\Microsoft.ReactNative.winmd" Private="false">
+    <Reference Include="$(MSBuildThisFileDirectory)..\..\lib\uap10.0$(_rnwArch)\Microsoft.ReactNative.winmd" Private="false">
       <Implementation>Microsoft.ReactNative.dll</Implementation>
     </Reference>
     
-    <ReferenceCopyLocalPaths Condition="Exists('$(_rnwFolder)Microsoft.ReactNative.dll')" Include="$(_rnwFolder)Microsoft.ReactNative.dll" />
-    <ReferenceCopyLocalPaths Condition="Exists('$(_rnwFolder)Microsoft.ReactNative.pri')" Include="$(_rnwFolder)Microsoft.ReactNative.pri" />
-    <ReferenceCopyLocalPaths Condition="$(Configuration) == 'Debug'" Include="$(_rnwFolder)**\*.xbf" />
+    <ReferenceCopyLocalPaths Condition="Exists('$(_rnwFolder)$(_rnwArch)\Microsoft.ReactNative.dll')" Include="$(_rnwFolder)$(_rnwArch)\Microsoft.ReactNative.dll" />
+    <ReferenceCopyLocalPaths Condition="Exists('$(_rnwFolder)$(_rnwArch)\Microsoft.ReactNative.pri')" Include="$(_rnwFolder)$(_rnwArch)\Microsoft.ReactNative.pri" />
+    <ReferenceCopyLocalPaths Condition="$(Configuration) == 'Debug'" Include="$(_rnwFolder)$(_rnwArch)\**\*.xbf" />
 
   </ItemGroup>
 

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -8,19 +8,34 @@ Set-Location -Path $RepoRoot
 
 try
 {
-    $packagesSolutions = Get-ChildItem -File -Recurse -Path packages *.sln | Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') }
-    $vnextSolutions = Get-ChildItem -File -Path vnext *.sln
+    # Delete existing lock files
+    $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
+    $existingLockFiles | Foreach-Object {
+        Write-Host Deleting $_.FullName
+        Remove-Item $_.FullName
+    }
+
+    $packagesSolutions = (Get-ChildItem -File -Recurse -Path $RepoRoot\packages -Filter *.sln )| Where-Object { !$_.FullName.Contains('node_modules') -and !$_.FullName.Contains('e2etest') }
+    $vnextSolutions = (Get-ChildItem -File -Path $RepoRoot\vnext -Filter *.sln)
 
     # Run all solutions with their defaults
-    $($packagesSolutions; $vnextSolutions) | Foreach {
+    $($packagesSolutions; $vnextSolutions) | Foreach-Object {
         Write-Host Restoring $_.FullName with defaults
         & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
     }
 
-    # Re-run solutions that we also build a Fabric variant
-    @("$RepoRoot\vnext\ReactWindows-Desktop.sln", "$RepoRoot\vnext\Microsoft.ReactNative.CppOnly.slnf") | Foreach {
-        Write-Host Restoring $_ with Fabric
-        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:RnwNewArch=true $_
+    # Re-run solutions that build with UseExperimentalWinUI3
+    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $experimentalSolutions -contains $_.Name } | Foreach-Object {
+        Write-Host Restoring $_.FullName with UseExperimentalWinUI3=true
+        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseExperimentalWinUI3=true $_.FullName
+    }
+
+    # Re-run solutions that build with Chakra
+    $chakraSolutions = @("ReactUWPTestApp.sln", "integrationtest.sln");
+    $($packagesSolutions; $vnextSolutions) | Where-Object { $chakraSolutions -contains $_.Name } | Foreach-Object {
+        Write-Host Restoring $_.FullName with UseHermes=false
+        & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseHermes=false $_.FullName
     }
 }
 finally

package/Scripts/OfficeReact.Win32.nuspec

@@ -15,23 +15,23 @@
   </metadata>
   <files>
 
-    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*"          target="lib\debug\x86"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*"          target="lib\debug\x64"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\ARM64EC\Debug\React.Windows.Desktop.DLL\react-native-win32.*"      target="lib\debug\ARM64EC"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*"        target="lib\ship\x86"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*"        target="lib\ship\x64"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\ARM64EC\Release\React.Windows.Desktop.DLL\react-native-win32.*"    target="lib\ship\ARM64EC"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"       target="lib\debug\x86"/>
-    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"       target="lib\debug\x64"/>
-    <file src="$nugetroot$\ARM64EC\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"   target="lib\debug\ARM64EC"/>
-    <file src="$nugetroot$\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd"     target="lib\ship\x86"/>
-    <file src="$nugetroot$\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd"     target="lib\ship\x64"/>
-    <file src="$nugetroot$\ARM64EC\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64EC"/>
+    <file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop.DLL\react-native-win32.*"          target="lib\debug\x86"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop.DLL\react-native-win32.*"          target="lib\debug\x64"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\ARM64EC\Debug\React.Windows.Desktop.DLL\react-native-win32.*"      target="lib\debug\ARM64EC"  exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop.DLL\react-native-win32.*"        target="lib\ship\x86"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop.DLL\react-native-win32.*"        target="lib\ship\x64"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\ARM64EC\Release\React.Windows.Desktop.DLL\react-native-win32.*"    target="lib\ship\ARM64EC"   exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"       target="lib\debug\x86"/>
+    <file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"       target="lib\debug\x64"/>
+    <file src="$nugetroot$\Desktop\ARM64EC\Debug\React.Windows.Desktop\Microsoft.ReactNative.winmd"   target="lib\debug\ARM64EC"/>
+    <file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd"     target="lib\ship\x86"/>
+    <file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd"     target="lib\ship\x64"/>
+    <file src="$nugetroot$\Desktop\ARM64EC\Release\React.Windows.Desktop\Microsoft.ReactNative.winmd" target="lib\ship\ARM64EC"/>
 
-    <file src="$nugetroot$\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"        target="lib\debug\x86"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"        target="lib\debug\x64"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\ship\x86"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
-    <file src="$nugetroot$\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\ship\x64"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x86\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"        target="lib\debug\x86"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x64\Debug\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"        target="lib\debug\x64"      exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x86\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\ship\x86"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
+    <file src="$nugetroot$\Desktop\x64\Release\React.Windows.Desktop.Test.DLL\React.Windows.Desktop.Test.**"      target="lib\ship\x64"       exclude="**\*.iobj;**\*.ipdb;**\*.exp;**\*.ilk" />
 
     <file src="$nugetroot$\inc\callinvoker\ReactCommon\CallInvoker.h" target="inc\ReactCommon"/>
     <file src="$nugetroot$\inc\callinvoker\ReactCommon\SchedulerPriority.h" target="inc\ReactCommon"/>

package/Scripts/creaternwapp.cmd

@@ -0,0 +1,177 @@
+@echo off
+REM creaternwapp.cmd [name]
+REM Creates a RNW app using the new arch template
+REM
+REM Options:
+REM
+REM name            The name of the app to create (default: testapp)
+REM /r [version]    Use react@version (default: latest)
+REM /rn [version]   Use react-native@version (default: latest)
+REM /rnw [version]  Use react-native-windows@version (default: latest)
+REM /t [template]   Use template (default: cpp-app)
+REM /linkrnw        Use your local RNW repo at RNW_ROOT
+REM /verdaccio      Configure new project to use verdaccio (used in CI)
+REM
+REM Requirements:
+REM - You've set the RNW_ROOT environment variable with the path to your clone
+
+setlocal enableextensions enabledelayedexpansion
+
+call git rev-parse --is-inside-work-tree > NUL 2>&1
+if %ERRORLEVEL% equ 0 (
+  @echo creaternwapp.cmd: Unable to create a new project in an existing git repo
+  exit /b -1
+)
+
+if "%RNW_ROOT%"=="" (
+  @echo creaternwapp.cmd: RNW_ROOT environment variable set to %~dp0..\..
+  set RNW_ROOT=%~dp0..\..
+)
+
+set APP_NAME=testapp
+set RNW_TEMPLATE_TYPE=cpp-app
+
+set R_VERSION=
+set RN_VERSION=
+set RNW_VERSION=
+set RNCLI_VERSION=
+
+set LINK_RNW=0
+set USE_VERDACCIO=0
+
+:loop
+set part=%1
+set param=%2
+if not "%part%"=="" (
+  if "%part%"=="/linkrnw" (
+      set LINK_RNW=1
+  ) else if "%part%"=="/verdaccio" (
+      set USE_VERDACCIO=1
+  ) else if "%part%"=="/r" (
+      set R_VERSION=%param%
+      shift
+  ) else if "%part%"=="/rn" (
+      set RN_VERSION=%param%
+      shift
+  ) else if "%part%"=="/rnw" (
+      set RNW_VERSION=%param%
+      shift
+  ) else if "%part%"=="/t" (
+      set RNW_TEMPLATE_TYPE=%param%
+      shift
+  ) else if "%part:~0,1%"=="/" (
+      @echo creaternwapp.cmd: Unknown flag "%part%"
+      exit /b 1
+  ) else (
+      set APP_NAME=%part%
+  )
+  shift
+  goto :loop
+)
+:loopend
+
+if %USE_VERDACCIO% equ 1 (
+  @echo creaternwapp.cmd: Setting npm to use verdaccio at http://localhost:4873
+  call npm config set registry http://localhost:4873
+)
+
+if %LINK_RNW% equ 1 (
+  @echo creaternwapp.cmd Determining versions from local RNW repo at %RNW_ROOT%
+  for /f "delims=" %%a in ('npm show "%RNW_ROOT%\vnext" devDependencies.react') do @set R_VERSION=%%a
+  for /f "delims=" %%a in ('npm show "%RNW_ROOT%\vnext" devDependencies.react-native') do @set RN_VERSION=%%a
+  for /f "delims=" %%a in ('npm show "%RNW_ROOT%\vnext" version') do @set RNW_VERSION=%%a
+  for /f "delims=" %%a in ('npm show "%RNW_ROOT%\vnext" dependencies.@react-native-community/cli') do @set RNCLI_VERSION=%%a
+)
+
+if "%RNW_VERSION%"=="" (
+  @echo creaternwapp.cmd Defaulting react-native-windows version to latest
+  set RNW_VERSION=latest
+)
+
+if "%RN_VERSION%"=="" (
+  @echo creaternwapp.cmd Determining react-native version from react-native-windows dependency
+  for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% devDependencies.react-native') do @set RN_VERSION=%%a
+)
+
+if "%RNCLI_VERSION%"=="" (
+  @echo creaternwapp.cmd Determining @react-native-community/cli version from react-native-windows dependency
+  for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% dependencies.@react-native-community/cli') do @set RNCLI_VERSION=%%a
+)
+
+if "%R_VERSION%"=="" (
+  @echo creaternwapp.cmd Determining react version from react-native-windows dependency
+  for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% devDependencies.react') do @set R_VERSION=%%a
+)
+
+@echo creaternwapp.cmd Determining concrete versions for react@%R_VERSION%, react-native@%RN_VERSION%, @react-native-community/cli@%RNCLI_VERSION%, and react-native-windows@%RNW_VERSION% 
+for /f "delims=" %%a in ('npm show react-native-windows@%RNW_VERSION% version') do @set RNW_VERSION=%%a
+for /f "delims=" %%a in ('npm show react-native@%RN_VERSION% version') do @set RN_VERSION=%%a
+for /f "delims=" %%a in ('npm show @react-native-community/cli@%RNCLI_VERSION% version') do @set RNCLI_VERSION=%%a
+for /f "delims=" %%a in ('npm show react@%R_VERSION% version') do @set R_VERSION=%%a
+
+@echo creaternwapp.cmd Creating RNW app "%APP_NAME%" with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
+
+@echo creaternwapp.cmd: Creating base RN app project with: npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% --verbose --skip-install --install-pods false --skip-git-init true
+call npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% --verbose --skip-install --install-pods false --skip-git-init true
+
+if %ERRORLEVEL% neq 0 (
+  @echo creaternwapp.cmd: Unable to create base RN app project
+  exit /b %ERRORLEVEL%
+)
+
+pushd "%APP_NAME%"
+
+if not "x%RN_VERSION:nightly=%"=="x%RN_VERSION%" (
+  @echo creaternwapp.cmd Fixing react-native nightly issues
+  pwsh.exe -Command "(gc package.json) -replace '""react-native"": ""[^\*]*""', '""react-native"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native/(.+-(config|preset))"": "".*""', '""@react-native/$1"": ""%RN_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+  pwsh.exe -Command "(gc package.json) -replace '""@react-native-community/cli((-platform-)?(ios|android))?"": "".*""', '""@react-native-community/cli$1"": ""%RNCLI_VERSION%""' | Out-File -encoding utf8NoBOM package.json"
+)
+
+@echo creaternwapp.cmd: Calling yarn install
+call yarn install
+
+@echo creaternwapp.cmd: Creating commit to save current state
+if not exist ".git\" call git init .
+call git add .
+call git commit -m "npx --yes @react-native-community/cli@latest init %APP_NAME% --version %RN_VERSION% --verbose --skip-install --install-pods false --skip-git-init true"
+
+if %USE_VERDACCIO% equ 1 (
+  @echo creaternwapp.cmd: Setting yarn to use verdaccio at http://localhost:4873
+  call yarn config set registry http://localhost:4873
+  call yarn config set npmRegistryServer http://localhost:4873
+  call yarn config set unsafeHttpWhitelist --json "[\"localhost\"]"
+)
+
+@echo creaternwapp.cmd: Adding RNW dependency to app
+call yarn add react-native-windows@%RNW_VERSION%
+
+if %LINK_RNW% equ 1 (
+  @echo creaternwapp.cmd: Linking RNW dependency to local repo
+  if exist ".yarnrc.yml" (
+    call yarn link %RNW_ROOT%\vnext
+  ) else (
+    pushd %RNW_ROOT%\vnext
+    call yarn link
+    popd
+    call yarn link react-native-windows
+  )
+)
+
+@echo creaternwapp.cmd: Calling yarn install
+call yarn install
+
+@echo creaternwapp.cmd: Creating commit to save current state
+call git add .
+call git commit -m "add rnw dependency"
+
+@echo creaternwapp.cmd Running init-windows with: npx --yes @react-native-community/cli@latest init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
+call npx --yes @react-native-community/cli@latest init-windows --template %RNW_TEMPLATE_TYPE% --overwrite --logging
+
+@echo creaternwapp.cmd Done, see new %RNW_TEMPLATE_TYPE% project in %CD% with react@%R_VERSION%, react-native@%RN_VERSION%, and react-native-windows@%RNW_VERSION%
+
+popd
+
+endlocal
+
+exit /b %ERRORLEVEL%