react-native-windows 0.81.1 → 0.82.0-preview.1

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/image/conversions.h

@@ -0,0 +1,174 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <unordered_map>
+
+#include <folly/dynamic.h>
+#include <glog/logging.h>
+#include <react/debug/react_native_expect.h>
+#include <react/renderer/core/PropsParserContext.h>
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/imagemanager/primitives.h>
+
+namespace facebook::react {
+
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageSource &result) {
+  if (value.hasType<std::string>()) {
+    result = {
+        /* .type = */ ImageSource::Type::Remote,
+        /* .uri = */ (std::string)value,
+    };
+    return;
+  }
+
+  if (value.hasType<std::unordered_map<std::string, RawValue>>()) {
+    auto items = (std::unordered_map<std::string, RawValue>)value;
+    result = {};
+
+    result.type = ImageSource::Type::Remote;
+
+    if (items.find("__packager_asset") != items.end()) {
+      result.type = ImageSource::Type::Local;
+    }
+
+    if (items.find("width") != items.end() && items.find("height") != items.end() &&
+        // The following checks have to be removed after codegen is shipped.
+        // See T45151459.
+        items.at("width").hasType<Float>() && items.at("height").hasType<Float>()) {
+      result.size = {(Float)items.at("width"), (Float)items.at("height")};
+    }
+
+    if (items.find("scale") != items.end() &&
+        // The following checks have to be removed after codegen is shipped.
+        // See T45151459.
+        items.at("scale").hasType<Float>()) {
+      result.scale = (Float)items.at("scale");
+    } else {
+      result.scale = items.find("deprecated") != items.end() ? 0.0f : 1.0f;
+    }
+
+    if (items.find("url") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("url").hasType<std::string>()) {
+      result.uri = (std::string)items.at("url");
+    }
+
+    if (items.find("uri") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("uri").hasType<std::string>()) {
+      result.uri = (std::string)items.at("uri");
+    }
+
+    if (items.find("bundle") != items.end() &&
+        // The following should be removed after codegen is shipped.
+        // See T45151459.
+        items.at("bundle").hasType<std::string>()) {
+      result.bundle = (std::string)items.at("bundle");
+      result.type = ImageSource::Type::Local;
+    }
+
+    if (items.find("headers") != items.end() &&
+        items.at("headers").hasType<std::unordered_map<std::string, std::string>>()) {
+      auto headers = (std::unordered_map<std::string, std::string>)items.at("headers");
+      for (const auto &header : headers) {
+        result.headers.push_back(header);
+      }
+    }
+
+    if (items.find("body") != items.end() && items.at("body").hasType<std::string>()) {
+      result.body = (std::string)items.at("body");
+    }
+
+    if (items.find("method") != items.end() && items.at("method").hasType<std::string>()) {
+      result.method = (std::string)items.at("method");
+    }
+
+    if (items.find("cache") != items.end() && items.at("cache").hasType<std::string>()) {
+      auto cache = (std::string)items.at("cache");
+      if (cache == "reload") {
+        result.cache = ImageSource::CacheStategy::Reload;
+      } else if (cache == "force-cache") {
+        result.cache = ImageSource::CacheStategy::ForceCache;
+      } else if (cache == "only-if-cached") {
+        result.cache = ImageSource::CacheStategy::OnlyIfCached;
+      }
+    }
+
+    return;
+  }
+
+  // The following should be removed after codegen is shipped.
+  // See T45151459.
+  result = {};
+  result.type = ImageSource::Type::Invalid;
+}
+
+inline std::string toString(const ImageSource &value) {
+  return "{uri: " + value.uri + "}";
+}
+
+inline void fromRawValue(const PropsParserContext &context, const RawValue &value, ImageResizeMode &result) {
+  react_native_expect(value.hasType<std::string>());
+  if (!value.hasType<std::string>()) {
+    LOG(ERROR) << "Unsupported ImageResizeMode type";
+    // "cover" is default in non-Fabric web and iOS
+    result = ImageResizeMode::Cover;
+    return;
+  }
+
+  auto stringValue = (std::string)value;
+  if (stringValue == "cover") {
+    result = ImageResizeMode::Cover;
+  } else if (stringValue == "contain") {
+    result = ImageResizeMode::Contain;
+  } else if (stringValue == "stretch") {
+    result = ImageResizeMode::Stretch;
+  } else if (stringValue == "center") {
+    result = ImageResizeMode::Center;
+  } else if (stringValue == "repeat") {
+    result = ImageResizeMode::Repeat;
+  } else if (stringValue == "none") {
+    result = ImageResizeMode::None;
+  } else {
+    LOG(ERROR) << "Unsupported ImageResizeMode value: " << stringValue;
+    react_native_expect(false);
+    // "cover" is default in non-Fabric web and iOS
+    result = ImageResizeMode::Cover;
+  }
+}
+
+inline std::string toString(const ImageResizeMode &value) {
+  switch (value) {
+    case ImageResizeMode::Cover:
+      return "cover";
+    case ImageResizeMode::Contain:
+      return "contain";
+    case ImageResizeMode::Stretch:
+      return "stretch";
+    case ImageResizeMode::Center:
+      return "center";
+    case ImageResizeMode::Repeat:
+      return "repeat";
+    case ImageResizeMode::None:
+      return "none";
+//#[Windows
+#if defined(_MSC_VER)
+    default:
+        __assume(0);
+#elif defined(__GNUC__) || defined(__clang__)
+    default:
+        __builtin_unreachable();
+#endif
+// 15379 #Windows]
+  }
+}
+
+} // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/text/ParagraphShadowNode.cpp

@@ -36,6 +36,7 @@
 namespace facebook::react {
 using Content = ParagraphShadowNode::Content;
 
+// NOLINTNEXTLINE(facebook-hte-CArray)
 const char ParagraphComponentName[] = "Paragraph";
 
 void ParagraphShadowNode::initialize() noexcept {

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/AccessibilityPrimitives.h

@@ -12,6 +12,8 @@
 #include <string>
 #include <vector>
 
+#include <react/renderer/debug/DebugStringConvertible.h>
+
 namespace facebook::react {
 
 enum class AccessibilityTraits : uint32_t {
@@ -91,10 +93,10 @@ struct AccessibilityState {
   std::optional<bool> selected{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionItemProvider Implementation
   bool busy{false};
   std::optional<bool> expanded{std::nullopt};
+  enum CheckedState { Unchecked, Checked, Mixed, None } checked{None};
   std::optional<bool> readOnly{std::nullopt}; // [Windows] - Do not remove; required for Windows IRangeValueProvider and IValueProvider Implementation
   std::optional<bool> multiselectable{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionProvider Implementation
   std::optional<bool> required{std::nullopt}; // [Windows] - Do not remove; required for Windows ISelectionProvider Implementation
-  enum { Unchecked, Checked, Mixed, None } checked{None};
 };
 
 constexpr bool operator==(
@@ -111,6 +113,29 @@ constexpr bool operator!=(
   return !(rhs == lhs);
 }
 
+#if RN_DEBUG_STRING_CONVERTIBLE
+inline std::string toString(AccessibilityState::CheckedState state) {
+  switch (state) {
+    case AccessibilityState::Unchecked:
+      return "Unchecked";
+    case AccessibilityState::Checked:
+      return "Checked";
+    case AccessibilityState::Mixed:
+      return "Mixed";
+    case AccessibilityState::None:
+      return "None";
+  }
+}
+
+inline std::string toString(const AccessibilityState& accessibilityState) {
+  return "{disabled:" + toString(accessibilityState.disabled) +
+      ",selected:" + toString(accessibilityState.selected) +
+      ",checked:" + toString(accessibilityState.checked) +
+      ",busy:" + toString(accessibilityState.busy) +
+      ",expanded:" + toString(accessibilityState.expanded) + "}";
+}
+#endif
+
 struct AccessibilityLabelledBy {
   std::vector<std::string> value{};
 };
@@ -170,8 +195,6 @@ inline std::string toString(
     case AccessibilityLiveRegion::Assertive:
       return "assertive";
   }
-  // [windows] Default return for unexpected enum values
-  return "none";
 }
 
 enum class AccessibilityRole {

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/components/view/conversions.h

@@ -1571,4 +1571,4 @@ inline std::string toString(const Transform& transform) {
   return result;
 }
 
-} // namespace facebook::react
+} // namespace facebook::react

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/core/ShadowNode.cpp

@@ -163,7 +163,7 @@ std::shared_ptr<ShadowNode> ShadowNode::clone(
   }
 }
 
-ContextContainer::Shared ShadowNode::getContextContainer() const {
+std::shared_ptr<const ContextContainer> ShadowNode::getContextContainer() const {
   return family_->componentDescriptor_.getContextContainer();
 }
 

package/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/imagemanager/primitives.h

@@ -0,0 +1,189 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include <react/renderer/core/graphicsConversions.h>
+#include <react/renderer/core/propsConversions.h>
+#include <react/renderer/debug/debugStringConvertibleUtils.h>
+#include <react/renderer/graphics/Float.h>
+#include <react/renderer/graphics/Size.h>
+
+namespace facebook::react {
+
+class ImageSource {
+ public:
+  enum class Type { Invalid, Remote, Local };
+  enum class CacheStategy { Default, Reload, ForceCache, OnlyIfCached };
+
+  Type type{};
+  std::string uri{};
+  std::string bundle{};
+  Float scale{3};
+  Size size{0};
+  std::string body{};
+  std::string method{};
+  CacheStategy cache = CacheStategy::Default;
+  std::vector<std::pair<std::string, std::string>> headers{};
+
+  bool operator==(const ImageSource& rhs) const {
+    return std::tie(this->type, this->uri) == std::tie(rhs.type, rhs.uri);
+  }
+
+  bool operator!=(const ImageSource& rhs) const {
+    return !(*this == rhs);
+  }
+
+#ifdef RN_SERIALIZABLE_STATE
+  folly::dynamic toDynamic() const {
+    folly::dynamic imageSourceResult = folly::dynamic::object();
+    switch (type) {
+      case ImageSource::Type::Invalid:
+        imageSourceResult["type"] = "invalid";
+        break;
+      case ImageSource::Type::Remote:
+        imageSourceResult["type"] = "remote";
+        break;
+      case ImageSource::Type::Local:
+        imageSourceResult["type"] = "local";
+        break;
+    }
+
+    imageSourceResult["uri"] = uri;
+    imageSourceResult["bundle"] = bundle;
+    imageSourceResult["scale"] = scale;
+
+    folly::dynamic sizeResult = folly::dynamic::object();
+    sizeResult["width"] = size.width;
+    sizeResult["height"] = size.height;
+    imageSourceResult["size"] = sizeResult;
+
+    imageSourceResult["body"] = body;
+    imageSourceResult["method"] = method;
+
+    switch (cache) {
+      case ImageSource::CacheStategy::Default:
+        imageSourceResult["cache"] = "default";
+        break;
+      case ImageSource::CacheStategy::Reload:
+        imageSourceResult["cache"] = "reload";
+        break;
+      case ImageSource::CacheStategy::ForceCache:
+        imageSourceResult["cache"] = "force-cache";
+        break;
+      case ImageSource::CacheStategy::OnlyIfCached:
+        imageSourceResult["cache"] = "only-if-cached";
+        break;
+    }
+
+    folly::dynamic headersObject = folly::dynamic::object();
+    for (const auto& header : headers) {
+      headersObject[header.first] = header.second;
+    }
+    imageSourceResult["headers"] = headersObject;
+    return imageSourceResult;
+  }
+
+#endif
+
+#if RN_DEBUG_STRING_CONVERTIBLE
+  SharedDebugStringConvertibleList getDebugProps(
+      const std::string& prefix) const {
+    ImageSource imageSource{};
+
+    SharedDebugStringConvertibleList headersList;
+    for (const auto& header : headers) {
+      headersList.push_back(debugStringConvertibleItem(
+          prefix + "-header-" + header.first, header.second));
+    }
+
+    return headersList +
+        SharedDebugStringConvertibleList{
+            debugStringConvertibleItem(
+                prefix + "-type", toString(type), toString(imageSource.type)),
+            debugStringConvertibleItem(prefix + "-uri", uri, imageSource.uri),
+            debugStringConvertibleItem(
+                prefix + "-bundle", bundle, imageSource.bundle),
+            debugStringConvertibleItem(
+                prefix + "-scale", scale, imageSource.scale),
+            debugStringConvertibleItem(
+                prefix + "-size",
+                react::toString(size),
+                react::toString(imageSource.size)),
+            debugStringConvertibleItem(
+                prefix + "-body", body, imageSource.body),
+            debugStringConvertibleItem(
+                prefix + "-method", method, imageSource.method),
+            debugStringConvertibleItem(
+                prefix + "-cache",
+                toString(cache),
+                toString(imageSource.cache)),
+        };
+  }
+
+  std::string toString(const Type& typeValue) const {
+    switch (typeValue) {
+      case ImageSource::Type::Invalid:
+        return "invalid";
+      case ImageSource::Type::Remote:
+        return "remote";
+      case ImageSource::Type::Local:
+        return "local";
+    //[Windows #15263
+    default:
+        return "Unknown"; 
+        //]
+    }
+  }
+
+  std::string toString(const CacheStategy& cacheValue) const {
+    switch (cacheValue) {
+      case ImageSource::CacheStategy::Default:
+        return "default";
+      case ImageSource::CacheStategy::Reload:
+        return "reload";
+      case ImageSource::CacheStategy::ForceCache:
+        return "force-cache";
+      case ImageSource::CacheStategy::OnlyIfCached:
+        return "only-if-cached";
+        //[Windows #15263
+    default:
+        return "Unknown"; 
+        //]
+    }
+  }
+#endif
+};
+
+#ifdef RN_SERIALIZABLE_STATE
+inline folly::dynamic toDynamic(const ImageSource& imageSource) {
+  return imageSource.toDynamic();
+}
+#endif
+
+using ImageSources = std::vector<ImageSource>;
+
+enum class ImageResizeMode : int8_t {
+  Cover = 0,
+  Contain = 1,
+  Stretch = 2,
+  Center = 3,
+  Repeat = 4,
+  None = 5,
+};
+
+class ImageErrorInfo {
+ public:
+  std::string error{};
+  int responseCode{};
+  std::vector<std::pair<std::string, std::string>> httpResponseHeaders{};
+};
+
+} // namespace facebook::react

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

@@ -22,10 +22,26 @@ 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;
+    const std::optional<std::string_view>& trackName,
+    const std::optional<std::string_view>& trackGroup) {
+  std::string perfettoTrackName = PERFETTO_DEFAULT_TRACK_NAME;
+
+  if (trackName || trackGroup) {
+    perfettoTrackName += ": ";
+
+    if (trackGroup) {
+      perfettoTrackName += *trackGroup;
+      if (trackName) {
+        perfettoTrackName += " | ";
+      }
+    }
+
+    if (trackName) {
+      perfettoTrackName += *trackName;
+    }
+  }
+
+  return perfettoTrackName;
 }
 #elif defined(WITH_FBSYSTRACE)
 int64_t getDeltaNanos(HighResTimeStamp jsTime) {
@@ -51,10 +67,12 @@ int64_t getDeltaNanos(HighResTimeStamp jsTime) {
     const std::string_view& eventName,
     HighResTimeStamp startTime,
     HighResTimeStamp endTime,
-    const std::optional<std::string_view>& trackName) {
+    const std::optional<std::string_view>& trackName,
+    const std::optional<std::string_view>& trackGroup) {
 #if defined(WITH_PERFETTO)
   if (TRACE_EVENT_CATEGORY_ENABLED("react-native")) {
-    auto track = getPerfettoWebPerfTrackAsync(toPerfettoTrackName(trackName));
+    auto track = getPerfettoWebPerfTrackAsync(
+        toPerfettoTrackName(trackName, trackGroup));
     TRACE_EVENT_BEGIN(
         "react-native",
         perfetto::DynamicString(eventName.data(), eventName.size()),
@@ -78,13 +96,14 @@ int64_t getDeltaNanos(HighResTimeStamp jsTime) {
 /* static */ void ReactPerfettoLogger::mark(
     const std::string_view& eventName,
     HighResTimeStamp startTime,
-    const std::optional<std::string_view>& trackName) {
+    const std::optional<std::string_view>& trackName,
+    const std::optional<std::string_view>& trackGroup) {
 #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)),
+        getPerfettoWebPerfTrackSync(toPerfettoTrackName(trackName, trackGroup)),
         highResTimeStampToPerfettoTraceTime(startTime));
   }
 #endif

package/ReactCommon/cgmanifest.json

@@ -6,7 +6,7 @@
                 "Type": "git",
                 "Git": {
                   "RepositoryUrl": "https://github.com/microsoft/node-api-jsi",
-                  "CommitHash": "21b47f08b762b21b1d4d970940ab23f59f43249c"
+                  "CommitHash": "4b8a4a59c4e1b7b988b809dedffd89a7662aa785"
                 }
             },
             "DevelopmentDependency": false

package/Scripts/Microsoft.ReactNative.nuspec

@@ -19,53 +19,35 @@
     <file src="$nugetroot$\Microsoft.ReactNative.targets" target="build\native"/>
     <file src="$nugetroot$\Microsoft.ReactNative.VersionCheck.targets" target="build\native"/>
 
-    <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$\ReactWindows\$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" />
+    <file src="$nugetroot$\ReactWindows\$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$\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"/> 
+    <file src="$nugetroot$\ReactWindows\x64\Release\Microsoft.ReactNative\Microsoft.ReactNative.xml" target="lib\uap10.0"/> 
     -->
 
     <!-- Included in Microsoft.ReactNative -->
-    <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$\ReactWindows\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\win10-arm64" />
 
-    <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$\ReactWindows\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\win10-x86" />
 
-    <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" />
+    <file src="$nugetroot$\ReactWindows\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\win10-x64" />
 
     <!-- Included in Microsoft.ReactNative.Debug -->
-    <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$\ReactWindows\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\win10-arm64" />
 
-    <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$\ReactWindows\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\win10-x86" />
 
-    <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$\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" />
+    <file src="$nugetroot$\ReactWindows\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\win10-x64" />
 
   </files>
 </package>

package/Scripts/NuGetRestoreForceEvaluateAllSolutions.ps1

@@ -1,4 +1,5 @@
 param(
+    [switch] $SkipLockDeletion
 )
 
 [string] $RepoRoot = Resolve-Path "$PSScriptRoot\..\.."
@@ -6,39 +7,38 @@ param(
 $StartingLocation = Get-Location
 Set-Location -Path $RepoRoot
 
-try
-{
-    # Delete existing lock files
-    $existingLockFiles = (Get-ChildItem -File -Recurse -Path $RepoRoot -Filter *.lock.json)
-    $existingLockFiles | Foreach-Object {
-        Write-Host Deleting $_.FullName
-        Remove-Item $_.FullName
+try {
+    if (-not $SkipLockDeletion) {
+        # 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') }
+    $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
+    # Run all solutions for each platform to ensure all projects are restored
+    # (some projects are only configured for specific platforms)
+    $platforms = @("x64","x86","ARM64")
     $($packagesSolutions; $vnextSolutions) | Foreach-Object {
-        Write-Host Restoring $_.FullName with defaults
-        & msbuild /t:Restore /p:RestoreForceEvaluate=true $_.FullName
+        foreach ($platform in $platforms) {
+            Write-Host Restoring $_.FullName with Platform=$platform
+            & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:Platform=$platform $_.FullName
+        }
     }
 
     # Re-run solutions that build with UseExperimentalWinUI3
-    $experimentalSolutions = @("playground-composition.sln", "Microsoft.ReactNative.sln", "Microsoft.ReactNative.NewArch.sln", "ReactWindows-Desktop.sln");
+    $experimentalSolutions = @("playground-composition.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
+        foreach ($platform in $platforms) {
+            Write-Host Restoring $_.FullName with UseExperimentalWinUI3=true Platform=$platform
+            & msbuild /t:Restore /p:RestoreForceEvaluate=true /p:UseExperimentalWinUI3=true /p:Platform=$platform $_.FullName
+        }
     }
 }
-finally
-{
+finally {
     Set-Location -Path "$StartingLocation"
 }