react-native-windows 0.72.14 → 0.73.0-preview.1

package/Microsoft.ReactNative/Views/cppwinrt/DynamicAutomationPeer.idl

@@ -49,13 +49,18 @@ namespace Microsoft.ReactNative
     Selected = 0,
     Disabled,
     Checked,
-    Unchecked,
     Busy,
     Expanded,
-    Collapsed,
     CountStates
   };
 
+  enum AccessibilityStateCheckedValue
+  {
+    Unchecked = 0, // Maps to ToggleState::Off
+    Checked,       // Maps to ToggleState::On
+    Mixed          // Maps to ToggleState::Indeterminate
+  };
+
   // When adding a new numeric value, make sure to increment 'numericValuesCount' in FrameworkElementViewManager
   // updateProperties depends on Min, Max, Now values being 0-2 for indexing. Be careful not to break that logic when adding new values.
   enum AccessibilityValue
@@ -87,12 +92,8 @@ namespace Microsoft.ReactNative
     static Boolean GetAccessibilityStateDisabled(XAML_NAMESPACE.UIElement element);
 
     static XAML_NAMESPACE.DependencyProperty AccessibilityStateCheckedProperty { get; };
-    static void SetAccessibilityStateChecked(XAML_NAMESPACE.UIElement element, Boolean value);
-    static Boolean GetAccessibilityStateChecked(XAML_NAMESPACE.UIElement element);
-
-    static XAML_NAMESPACE.DependencyProperty AccessibilityStateUncheckedProperty { get; };
-    static void SetAccessibilityStateUnchecked(XAML_NAMESPACE.UIElement element, Boolean value);
-    static Boolean GetAccessibilityStateUnchecked(XAML_NAMESPACE.UIElement element);
+    static void SetAccessibilityStateChecked(XAML_NAMESPACE.UIElement element, AccessibilityStateCheckedValue value);
+    static AccessibilityStateCheckedValue GetAccessibilityStateChecked(XAML_NAMESPACE.UIElement element);
 
     static XAML_NAMESPACE.DependencyProperty AccessibilityStateBusyProperty { get; };
     static void SetAccessibilityStateBusy(XAML_NAMESPACE.UIElement element, Boolean value);
@@ -102,10 +103,6 @@ namespace Microsoft.ReactNative
     static void SetAccessibilityStateExpanded(XAML_NAMESPACE.UIElement element, Boolean value);
     static Boolean GetAccessibilityStateExpanded(XAML_NAMESPACE.UIElement element);
 
-    static XAML_NAMESPACE.DependencyProperty AccessibilityStateCollapsedProperty { get; };
-    static void SetAccessibilityStateCollapsed(XAML_NAMESPACE.UIElement element, Boolean value);
-    static Boolean GetAccessibilityStateCollapsed(XAML_NAMESPACE.UIElement element);
-
     static XAML_NAMESPACE.DependencyProperty AccessibilityValueMinProperty { get; };
     static void SetAccessibilityValueMin(XAML_NAMESPACE.UIElement element, Double value);
     static Double GetAccessibilityValueMin(XAML_NAMESPACE.UIElement element);

package/Microsoft.ReactNative/Views/cppwinrt/ViewPanel.idl

@@ -8,7 +8,7 @@ namespace Microsoft.ReactNative
 {
   [default_interface]
   [webhosthidden]
-  runtimeclass ViewPanel : XAML_NAMESPACE.Controls.Panel
+  runtimeclass ViewPanel : XAML_NAMESPACE.Controls.Grid
   {
     // Constructors
     ViewPanel();
@@ -18,22 +18,14 @@ namespace Microsoft.ReactNative
     void RemoveAt(UInt32 index);
     void Clear();
 
-    void FinalizeProperties();
-    XAML_NAMESPACE.Controls.Border GetOuterBorder();
-
     // Public Properties
     XAML_NAMESPACE.Media.Brush ViewBackground { get; set; };
-    XAML_NAMESPACE.Thickness BorderThickness { get; set; };
-    XAML_NAMESPACE.Media.Brush BorderBrush { get; set; };
-    XAML_NAMESPACE.CornerRadius CornerRadius { get; set; };
-    Boolean ClipChildren { get; set; };
 
     // ViewPanel Properties
     static XAML_NAMESPACE.DependencyProperty ViewBackgroundProperty { get; };
     static XAML_NAMESPACE.DependencyProperty BorderThicknessProperty { get; };
     static XAML_NAMESPACE.DependencyProperty BorderBrushProperty { get; };
     static XAML_NAMESPACE.DependencyProperty CornerRadiusProperty { get; };
-    static XAML_NAMESPACE.DependencyProperty ClipChildrenProperty { get; };
 
     // Attached Properties
     static XAML_NAMESPACE.DependencyProperty TopProperty { get; };

package/Microsoft.ReactNative/XamlHelper.cpp

@@ -19,7 +19,7 @@ xaml::Media::Brush XamlHelper::BrushFrom(JSValueArgWriter const &valueProvider)
   return ::Microsoft::ReactNative::IsValidColorValue(value) ? ::Microsoft::ReactNative::BrushFrom(value) : nullptr;
 }
 
-Windows::UI::Color XamlHelper::ColorFrom(JSValueArgWriter const &valueProvider) noexcept {
+winrt::Windows::UI::Color XamlHelper::ColorFrom(JSValueArgWriter const &valueProvider) noexcept {
   auto value = GetFollyDynamicFromValueProvider(valueProvider);
   return ::Microsoft::ReactNative::ColorFrom(value);
 }

package/Microsoft.ReactNative/XamlHelper.h

@@ -15,7 +15,7 @@ struct XamlHelper : XamlHelperT<XamlHelper> {
   XamlHelper() = default;
 
   static xaml::Media::Brush BrushFrom(JSValueArgWriter const &valueProvider) noexcept;
-  static Windows::UI::Color ColorFrom(JSValueArgWriter const &valueProvider) noexcept;
+  static winrt::Windows::UI::Color ColorFrom(JSValueArgWriter const &valueProvider) noexcept;
 
   static xaml::DependencyProperty ReactTagProperty() noexcept;
   static int64_t GetReactTag(xaml::DependencyObject const &dependencyObject) noexcept;

package/Microsoft.ReactNative/packages.lock.json

@@ -0,0 +1,128 @@
+{
+  "version": 1,
+  "dependencies": {
+    "native,Version=v0.0": {
+      "boost": {
+        "type": "Direct",
+        "requested": "[1.76.0, )",
+        "resolved": "1.76.0",
+        "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
+      },
+      "Microsoft.JavaScript.Hermes": {
+        "type": "Direct",
+        "requested": "[0.1.15, )",
+        "resolved": "0.1.15",
+        "contentHash": "My/u5RvxoymtwWokoweU6iVpuP79w271UjadcmSNqnQ9ESIv00tlVP4sHnIiN3t2lJNDeciyE1EVF4swGPECKQ=="
+      },
+      "Microsoft.SourceLink.GitHub": {
+        "type": "Direct",
+        "requested": "[1.1.1, )",
+        "resolved": "1.1.1",
+        "contentHash": "IaJGnOv/M7UQjRJks7B6p7pbPnOwisYGOIzqCz5ilGFTApZ3ktOR+6zJ12ZRPInulBmdAf1SrGdDG2MU8g6XTw==",
+        "dependencies": {
+          "Microsoft.Build.Tasks.Git": "1.1.1",
+          "Microsoft.SourceLink.Common": "1.1.1"
+        }
+      },
+      "Microsoft.UI.Xaml": {
+        "type": "Direct",
+        "requested": "[2.8.0, )",
+        "resolved": "2.8.0",
+        "contentHash": "vxdHxTr63s5KVtNddMFpgvjBjUH50z7seq/5jLWmmSuf8poxg+sXrywkofUdE8ZstbpO9y3FL/IXXUcPYbeesA==",
+        "dependencies": {
+          "Microsoft.Web.WebView2": "1.0.1264.42"
+        }
+      },
+      "Microsoft.Windows.CppWinRT": {
+        "type": "Direct",
+        "requested": "[2.0.211028.7, )",
+        "resolved": "2.0.211028.7",
+        "contentHash": "JBGI0c3WLoU6aYJRy9Qo0MLDQfObEp+d4nrhR95iyzf7+HOgjRunHDp/6eGFREd7xq3OI1mll9ecJrMfzBvlyg=="
+      },
+      "Microsoft.Build.Tasks.Git": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q=="
+      },
+      "Microsoft.SourceLink.Common": {
+        "type": "Transitive",
+        "resolved": "1.1.1",
+        "contentHash": "WMcGpWKrmJmzrNeuaEb23bEMnbtR/vLmvZtkAP5qWu7vQsY59GqfRJd65sFpBszbd2k/bQ8cs8eWawQKAabkVg=="
+      },
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      },
+      "common": {
+        "type": "Project"
+      },
+      "fmt": {
+        "type": "Project"
+      },
+      "folly": {
+        "type": "Project",
+        "dependencies": {
+          "Fmt": "[1.0.0, )",
+          "boost": "[1.76.0, )"
+        }
+      },
+      "reactcommon": {
+        "type": "Project",
+        "dependencies": {
+          "Folly": "[1.0.0, )",
+          "boost": "[1.76.0, )"
+        }
+      }
+    },
+    "native,Version=v0.0/win10-arm": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-arm-aot": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-arm64-aot": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-x64": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-x64-aot": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-x86": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    },
+    "native,Version=v0.0/win10-x86-aot": {
+      "Microsoft.Web.WebView2": {
+        "type": "Transitive",
+        "resolved": "1.0.1264.42",
+        "contentHash": "7OBUTkzQ5VI/3gb0ufi5U4zjuCowAJwQg2li0zXXzqkM+S1kmOlivTy1R4jAW+gY5Vyg510M+qMAESCQUjrfgA=="
+      }
+    }
+  }
+}

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.cpp

@@ -112,7 +112,7 @@ void JsiHostObjectWrapper::SetProperty(
   throw;
 }
 
-Windows::Foundation::Collections::IVector<JsiPropertyIdRef> JsiHostObjectWrapper::GetPropertyIds(
+winrt::Windows::Foundation::Collections::IVector<JsiPropertyIdRef> JsiHostObjectWrapper::GetPropertyIds(
     JsiRuntime const &runtime) try {
   JsiAbiRuntime *rt{JsiAbiRuntime::GetFromJsiRuntime(runtime)};
   auto names = m_hostObject->getPropertyNames(*rt);

package/Microsoft.ReactNative.Cxx/JSI/JsiAbiApi.h

@@ -46,7 +46,7 @@ struct JsiHostObjectWrapper : implements<JsiHostObjectWrapper, IJsiHostObject> {
 
   JsiValueRef GetProperty(JsiRuntime const &runtime, JsiPropertyIdRef const &name);
   void SetProperty(JsiRuntime const &runtime, JsiPropertyIdRef const &name, JsiValueRef const &value);
-  Windows::Foundation::Collections::IVector<JsiPropertyIdRef> GetPropertyIds(JsiRuntime const &runtime);
+  winrt::Windows::Foundation::Collections::IVector<JsiPropertyIdRef> GetPropertyIds(JsiRuntime const &runtime);
 
   std::shared_ptr<facebook::jsi::HostObject> const &HostObjectSharedPtr() noexcept;
 

package/Microsoft.ReactNative.Cxx/JSI/JsiApiContext.cpp

@@ -34,8 +34,8 @@ facebook::jsi::Runtime *TryGetOrCreateContextRuntime(ReactContext const &context
     // We want to keep the JSI runtime while current instance is alive.
     // The JSI runtime object must be local to our DLL.
     // We create a property name based on the current DLL handle.
-    HMODULE currentDllHanlde = reinterpret_cast<HMODULE>(&__ImageBase);
-    std::wstring jsiRuntimeLocalName = L"jsiRuntime_" + std::to_wstring(reinterpret_cast<uintptr_t>(currentDllHanlde));
+    HMODULE currentDllHandle = reinterpret_cast<HMODULE>(&__ImageBase);
+    std::wstring jsiRuntimeLocalName = L"jsiRuntime_" + std::to_wstring(reinterpret_cast<uintptr_t>(currentDllHandle));
     using ValueType = ReactNonAbiValue<std::unique_ptr<JsiAbiRuntime>>;
     ReactPropertyId<ValueType> jsiRuntimeProperty{L"ReactNative.InstanceData", jsiRuntimeLocalName.c_str()};
     ValueType runtimeValue{std::in_place, std::move(runtimeHolder)};

package/Microsoft.ReactNative.Cxx/JSValue.h

@@ -29,7 +29,7 @@ JSValue TakeJSValue(IJSValueWriter const &writer) noexcept;
 // JSValueObject declaration.
 //==============================================================================
 
-//! JSValueObject is based on std::map and has a custom constructor with std::intializer_list.
+//! JSValueObject is based on std::map and has a custom constructor with std::initializer_list.
 //! It is possible to write: JSValueObject{{"X", 4}, {"Y", 5}} and assign it to JSValue.
 //! It uses the std::less<> comparison algorithm that allows an efficient
 //! key lookup using std::string_view that does not allocate memory for the std::string key.
@@ -103,7 +103,7 @@ bool operator!=(JSValueObject const &left, JSValueObject const &right) noexcept;
 // JSValueArray declaration.
 //==============================================================================
 
-//! JSValueArray is based on std::vector<JSValue> and has a custom constructor with std::intializer_list.
+//! JSValueArray is based on std::vector<JSValue> and has a custom constructor with std::initializer_list.
 //! It is possible to write: JSValueArray{"X", 42, nullptr, true} and assign it to JSValue.
 struct JSValueArray : std::vector<JSValue> {
   //! Default constructor.

package/Microsoft.ReactNative.Cxx/Microsoft.ReactNative.Cxx.vcxitems

@@ -36,7 +36,6 @@
         $(NodeApiJsiSrcDir);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>JSI_VERSION=10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Midl>
       <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -352,7 +352,7 @@ struct MethodSignatureMatchResult {
   bool IsResultMatching;
   bool AreArgsMatching;
   bool AreCallbacksMatching;
-  bool IsPromiseMathcing;
+  bool IsPromiseMatching;
   bool IsSucceeded;
 };
 
@@ -420,10 +420,10 @@ struct MethodSignature {
           std::make_index_sequence<CallbackCount>{});
     }
 
-    result.IsPromiseMathcing = std::is_same_v<OutputPromises, typename TOtherMethodSignature::OutputPromises>;
+    result.IsPromiseMatching = std::is_same_v<OutputPromises, typename TOtherMethodSignature::OutputPromises>;
 
     result.IsSucceeded = result.IsResultMatching && result.ArgCountCompare == 0 && result.AreArgsMatching &&
-        result.CallbackCountCompare == 0 && result.AreCallbacksMatching && result.IsPromiseMathcing;
+        result.CallbackCountCompare == 0 && result.AreCallbacksMatching && result.IsPromiseMatching;
 
     return result;
   }
@@ -486,7 +486,7 @@ constexpr static bool MatchMethodSignature() noexcept {
     static_assert(matchResult.AreCallbacksMatching, "Method callback types are different from the method spec.");
   }
 
-  static_assert(matchResult.IsPromiseMathcing, "Method Promise type is different from the method spec.");
+  static_assert(matchResult.IsPromiseMatching, "Method Promise type is different from the method spec.");
 
   return matchResult.IsSucceeded;
 }

package/Microsoft.ReactNative.Cxx/ReactHandleHelper.h

@@ -27,7 +27,7 @@ auto TestHandle(int *) -> void;
 
 template <class T>
 inline constexpr bool HasHandleV =
-    std::is_base_of_v<Windows::Foundation::IInspectable, std::decay_t<decltype(Internal::TestHandle<T>(0))>>;
+    std::is_base_of_v<winrt::Windows::Foundation::IInspectable, std::decay_t<decltype(Internal::TestHandle<T>(0))>>;
 
 // True if two types with Handle() have the same handle.
 template <class T, std::enable_if_t<HasHandleV<T>, int> = 0>

package/Microsoft.ReactNative.Cxx/ReactNonAbiValue.h

@@ -44,7 +44,7 @@ struct ReactNonAbiValue : implements<ReactNonAbiValue<T>, IReactNonAbiValue> {
 // a new instance of implementation::ReactNonAbiValue. The std::in_place allows to disambiguate the calls to
 // other constructors.
 template <class T>
-struct ReactNonAbiValue : Windows::Foundation::IInspectable {
+struct ReactNonAbiValue : winrt::Windows::Foundation::IInspectable {
   // Create a new instance of implementation::ReactNonAbiValue with args and keep a ref-counted pointer to it.
   template <class... TArgs>
   ReactNonAbiValue(std::in_place_t, TArgs &&...args) noexcept
@@ -53,7 +53,7 @@ struct ReactNonAbiValue : Windows::Foundation::IInspectable {
   // Create an empty ReactNonAbiValue.
   ReactNonAbiValue(std::nullptr_t = nullptr) noexcept {}
 
-  // Create a ReactNonAbiValue with taking the onwership from the provided pointer.
+  // Create a ReactNonAbiValue with taking the ownership from the provided pointer.
   ReactNonAbiValue(void *ptr, take_ownership_from_abi_t) noexcept : IInspectable(ptr, take_ownership_from_abi) {}
 
   // Get a pointer to the value from the object it implements IReactNonAbiValue.

package/Microsoft.ReactNative.Cxx/ReactNotificationService.h

@@ -129,15 +129,16 @@ struct ReactNotificationArgs : ReactNotificationArgsBase {
 };
 
 template <class THandle, class TData>
-inline constexpr bool IsValidHandlerV =
-    std::is_invocable_v<THandle, Windows::Foundation::IInspectable const &, ReactNotificationArgs<TData> const &>;
+inline constexpr bool IsValidHandlerV = std::
+    is_invocable_v<THandle, winrt::Windows::Foundation::IInspectable const &, ReactNotificationArgs<TData> const &>;
 
 struct ReactNotificationService {
   // Notification data result type is either T or std::optional<T>.
   // T is returned for types inherited from IInspectable.
   // The std::optional<T> is returned for all other types.
   template <class T>
-  using ResultType = std::conditional_t<std::is_base_of_v<Windows::Foundation::IInspectable, T>, T, std::optional<T>>;
+  using ResultType =
+      std::conditional_t<std::is_base_of_v<winrt::Windows::Foundation::IInspectable, T>, T, std::optional<T>>;
 
   // Create a new empty instance of ReactNotificationService.
   ReactNotificationService(std::nullptr_t = nullptr) noexcept {}
@@ -165,7 +166,7 @@ struct ReactNotificationService {
               notificationId.Handle(),
               dispatcher.Handle(),
               [handler = std::forward<THandler>(handler)](
-                  Windows::Foundation::IInspectable const &sender, IReactNotificationArgs const &args) noexcept {
+                  winrt::Windows::Foundation::IInspectable const &sender, IReactNotificationArgs const &args) noexcept {
                 handler(sender, ReactNotificationArgs<TData>{args});
               })
         : nullptr;
@@ -192,7 +193,7 @@ struct ReactNotificationService {
               notificationId.Handle(),
               dispatcher.Handle(),
               [handler = std::forward<THandler>(handler)](
-                  Windows::Foundation::IInspectable const &sender, IReactNotificationArgs const &args) noexcept {
+                  winrt::Windows::Foundation::IInspectable const &sender, IReactNotificationArgs const &args) noexcept {
                 handler(sender, ReactNotificationArgs<TData>{args});
               })
         : nullptr;
@@ -211,7 +212,7 @@ struct ReactNotificationService {
   static void SendNotification(
       IReactNotificationService const &handle,
       ReactNotificationId<TData> const &notificationId,
-      Windows::Foundation::IInspectable const &sender,
+      ::winrt::Windows::Foundation::IInspectable const &sender,
       TValue &&value) noexcept {
     if (handle) {
       handle.SendNotification(
@@ -222,7 +223,7 @@ struct ReactNotificationService {
   static void SendNotification(
       IReactNotificationService const &handle,
       ReactNotificationId<void> const &notificationId,
-      Windows::Foundation::IInspectable const &sender) noexcept {
+      winrt::Windows::Foundation::IInspectable const &sender) noexcept {
     if (handle) {
       handle.SendNotification(notificationId.Handle(), sender, nullptr);
     }
@@ -279,14 +280,14 @@ struct ReactNotificationService {
   template <class TData, class TValue, std::enable_if_t<!std::is_void_v<TData>, int> = 0>
   void SendNotification(
       ReactNotificationId<TData> const &notificationId,
-      Windows::Foundation::IInspectable const &sender,
+      winrt::Windows::Foundation::IInspectable const &sender,
       TValue &&value) const noexcept {
     SendNotification(m_handle, notificationId, sender, std::forward<TValue>(value));
   }
 
   void SendNotification(
       ReactNotificationId<void> const &notificationId,
-      Windows::Foundation::IInspectable const &sender) const noexcept {
+      winrt::Windows::Foundation::IInspectable const &sender) const noexcept {
     SendNotification(m_handle, notificationId, sender);
   }
 

package/Microsoft.ReactNative.Cxx/ReactPropertyBag.h

@@ -48,7 +48,7 @@
 // In case if we do not have a requirement to pass values across the DLL/EXE boundary,
 // we can use the ReactNonAbiValue<T> wrapper to store non-ABI safe values.
 // The type ReactNonAbiValue<T> is a smart pointer similar to winrt::com_ptr
-// or winrt::Windows::Foundation::IInspactable. It is treated as IInspectable type and
+// or winrt::Windows::Foundation::IInspectable. It is treated as IInspectable type and
 // **is not** wrapped in std::optional. It can be casted to bool to check if it is null.
 //
 // For example, we can define a property to use in our DLL or EXE to store std::string:
@@ -165,7 +165,8 @@ struct ReactPropertyBag {
   // T is returned for types inherited from IInspectable.
   // The std::optional<T> is returned for all other types.
   template <class T>
-  using ResultType = std::conditional_t<std::is_base_of_v<Windows::Foundation::IInspectable, T>, T, std::optional<T>>;
+  using ResultType =
+      std::conditional_t<std::is_base_of_v<winrt::Windows::Foundation::IInspectable, T>, T, std::optional<T>>;
 
   // Create a new empty instance of ReactPropertyBag.
   ReactPropertyBag(std::nullptr_t = nullptr) noexcept {}
@@ -186,7 +187,7 @@ struct ReactPropertyBag {
   // Get property value by property name.
   template <class T>
   static ResultType<T> Get(IReactPropertyBag const &handle, ReactPropertyId<T> const &propertyId) noexcept {
-    Windows::Foundation::IInspectable propertyValue = handle ? handle.Get(propertyId.Handle()) : nullptr;
+    winrt::Windows::Foundation::IInspectable propertyValue = handle ? handle.Get(propertyId.Handle()) : nullptr;
     return FromObject<T>(propertyValue);
   }
 
@@ -197,7 +198,7 @@ struct ReactPropertyBag {
       IReactPropertyBag const &handle,
       ReactPropertyId<T> const &propertyId,
       TCreateValue const &createValue) noexcept {
-    Windows::Foundation::IInspectable propertyValue = handle
+    winrt::Windows::Foundation::IInspectable propertyValue = handle
         ? handle.GetOrCreate(propertyId.Handle(), [&createValue]() noexcept { return ToObject<T>(createValue()); })
         : nullptr;
     return FromObject<T>(propertyValue);
@@ -247,7 +248,7 @@ struct ReactPropertyBag {
 
   // Box value to an ABI-safe object.
   template <class T, class TValue, std::enable_if_t<!IsReactNonAbiValueV<T> || std::is_same_v<T, TValue>, int> = 0>
-  static Windows::Foundation::IInspectable ToObject(TValue const &value) noexcept {
+  static winrt::Windows::Foundation::IInspectable ToObject(TValue const &value) noexcept {
     // We box WinRT types and return IInspectable-inherited values as-is.
     // The ReactNonAbiValue<U> is treated as IInspectable-inherited value if TValue=='ReactNonAbiValue<U>'.
     return box_value(value);
@@ -255,7 +256,7 @@ struct ReactPropertyBag {
 
   // Box value to an ABI-safe object.
   template <class T, class TValue, std::enable_if_t<IsReactNonAbiValueV<T> && !std::is_same_v<T, TValue>, int> = 0>
-  static Windows::Foundation::IInspectable ToObject(TValue &&value) noexcept {
+  static winrt::Windows::Foundation::IInspectable ToObject(TValue &&value) noexcept {
     // Create ReactNonAbiValue<U> with newly allocated wrapper for U and pass TValue as an argument to the U
     // constructor. For example, we can pass TValue=='const char*' to U=='std::string' where
     // T=='ReactNonAbiValue<std::string>'.
@@ -264,33 +265,33 @@ struct ReactPropertyBag {
 
   // Box value to an ABI-safe object.
   template <class T>
-  static Windows::Foundation::IInspectable ToObject(std::optional<T> const &value) noexcept {
+  static winrt::Windows::Foundation::IInspectable ToObject(std::optional<T> const &value) noexcept {
     return value ? ToObject<T>(*value) : nullptr;
   }
 
   // Unbox value from an ABI-safe object.
   template <class T>
-  static auto FromObject(Windows::Foundation::IInspectable const &obj) noexcept {
+  static auto FromObject(winrt::Windows::Foundation::IInspectable const &obj) noexcept {
     // The code mostly borrowed from the winrt::unbox_value_or implementation to return
     // empty std::optional in case if obj is null or has a wrong type.
-    if constexpr (std::is_base_of_v<Windows::Foundation::IInspectable, T>) {
+    if constexpr (std::is_base_of_v<winrt::Windows::Foundation::IInspectable, T>) {
       return obj.try_as<T>();
 #ifndef __APPLE__
     } else if constexpr (impl::has_category_v<T>) {
       if (obj) {
 #ifdef WINRT_IMPL_IUNKNOWN_DEFINED
         if constexpr (std::is_same_v<T, GUID>) {
-          if (auto temp = obj.try_as<Windows::Foundation::IReference<guid>>()) {
+          if (auto temp = obj.try_as<winrt::Windows::Foundation::IReference<guid>>()) {
             return std::optional<T>{temp.Value()};
           }
         }
 #endif
-        if (auto temp = obj.try_as<Windows::Foundation::IReference<T>>()) {
+        if (auto temp = obj.try_as<winrt::Windows::Foundation::IReference<T>>()) {
           return std::optional<T>{temp.Value()};
         }
 
         if constexpr (std::is_enum_v<T>) {
-          if (auto temp = obj.try_as<Windows::Foundation::IReference<std::underlying_type_t<T>>>()) {
+          if (auto temp = obj.try_as<winrt::Windows::Foundation::IReference<std::underlying_type_t<T>>>()) {
             return std::optional<T>{static_cast<T>(temp.Value())};
           }
         }

package/Microsoft.ReactNative.Managed/JSValueReaderGenerator.cs

@@ -18,7 +18,7 @@ namespace Microsoft.ReactNative.Managed
     // The current assembly to ensure we always register the basic type readers
     private static readonly Assembly s_currentAssembly = typeof(JSValueReaderGenerator).Assembly;
 
-    private static readonly ConcurrentDictionary<Assembly, bool> s_registerdAssemblies = new ConcurrentDictionary<Assembly, bool>();
+    private static readonly ConcurrentDictionary<Assembly, bool> s_registeredAssemblies = new ConcurrentDictionary<Assembly, bool>();
     private static readonly ConcurrentDictionary<Type, MethodInfo> s_codeGenerateGenericExtensionMethods = new ConcurrentDictionary<Type, MethodInfo>();
 
     private static readonly Lazy<KeyValuePair<Type, MethodInfo>[]> s_allMethods;
@@ -28,12 +28,12 @@ namespace Microsoft.ReactNative.Managed
     public static void RegisterAssembly(Assembly assembly)
     {
       // UnitTests re-register over and over, safe to skip if already added.
-      if (s_registerdAssemblies.ContainsKey(assembly))
+      if (s_registeredAssemblies.ContainsKey(assembly))
       {
         return;
       }
 
-      s_registerdAssemblies.GetOrAdd(assembly, true);
+      s_registeredAssemblies.GetOrAdd(assembly, true);
 
       // Fail programs that register after we started serializing values.
       if (s_allMethods.IsValueCreated)
@@ -53,7 +53,7 @@ namespace Microsoft.ReactNative.Managed
 
     static JSValueReaderGenerator()
     {
-      s_registerdAssemblies.GetOrAdd(s_currentAssembly, true);
+      s_registeredAssemblies.GetOrAdd(s_currentAssembly, true);
 
       // Get all extension ReadValue methods for IJSValueReader and JSValue.
       // The first parameter must be IJSValueReader or JSValue.
@@ -63,7 +63,7 @@ namespace Microsoft.ReactNative.Managed
       s_allMethods = new Lazy<KeyValuePair<Type, MethodInfo>[]>(() =>
       {
         var extensionMethods =
-          from assembly in s_registerdAssemblies.Keys
+          from assembly in s_registeredAssemblies.Keys
           from type in assembly.GetTypes()
           let typeInfo = type.GetTypeInfo()
           where typeInfo.IsSealed && !typeInfo.IsGenericType && !typeInfo.IsNested

package/Microsoft.ReactNative.Managed/JSValueWriterGenerator.cs

@@ -19,7 +19,7 @@ namespace Microsoft.ReactNative.Managed
     // The current assembly to ensure we always register the basic type readers
     private static readonly Assembly s_currentAssembly = typeof(JSValueReaderGenerator).Assembly;
 
-    private static readonly ConcurrentDictionary<Assembly, bool> s_registerdAssemblies = new ConcurrentDictionary<Assembly, bool>();
+    private static readonly ConcurrentDictionary<Assembly, bool> s_registeredAssemblies = new ConcurrentDictionary<Assembly, bool>();
     private static readonly ConcurrentDictionary<Type, MethodInfo> s_codeGenerateGenericExtensionMethods = new ConcurrentDictionary<Type, MethodInfo>();
 
     private static readonly Lazy<KeyValuePair<Type, MethodInfo>[]> s_allMethods;
@@ -29,12 +29,12 @@ namespace Microsoft.ReactNative.Managed
     public static void RegisterAssembly(Assembly assembly)
     {
       // UnitTests re-register over and over, safe to skip if already added.
-      if (s_registerdAssemblies.ContainsKey(assembly))
+      if (s_registeredAssemblies.ContainsKey(assembly))
       {
         return;
       }
 
-      s_registerdAssemblies.GetOrAdd(assembly, true);
+      s_registeredAssemblies.GetOrAdd(assembly, true);
 
       // Fail programs that register after we started serializing values.
       if (s_allMethods.IsValueCreated)
@@ -54,7 +54,7 @@ namespace Microsoft.ReactNative.Managed
 
     static JSValueWriterGenerator()
     {
-      s_registerdAssemblies.GetOrAdd(s_currentAssembly, true);
+      s_registeredAssemblies.GetOrAdd(s_currentAssembly, true);
 
       // Get all extension WriteValue methods for IJSValueWriter.
       // The first parameter must be IJSValueWriter.
@@ -64,7 +64,7 @@ namespace Microsoft.ReactNative.Managed
       s_allMethods = new Lazy<KeyValuePair<Type, MethodInfo>[]>(() =>
       {
         var extensionMethods =
-          from assembly in s_registerdAssemblies.Keys
+          from assembly in s_registeredAssemblies.Keys
           from type in assembly.GetTypes()
           let typeInfo = type.GetTypeInfo()
           where typeInfo.IsSealed && !typeInfo.IsGenericType && !typeInfo.IsNested

package/Microsoft.ReactNative.Managed/Microsoft.ReactNative.Managed.csproj

@@ -76,7 +76,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
   </PropertyGroup>
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\NuGet.CSharp.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
@@ -136,12 +135,19 @@
     <ProjectReference Include="$(ReactNativeWindowsDir)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj">
       <Project>{f7d32bd0-2749-483e-9a0d-1635ef7e3136}</Project>
       <Name>Microsoft.ReactNative</Name>
+      <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
     </ProjectReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>$(NETCoreUWPVersion)</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
+  <Choose>
+    <When Condition="'$(EnableSourceLink)' == 'true'">
+      <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+      </ItemGroup>
+    </When>
+  </Choose>
   <!--
     Visual Studio (but not MSBuild) will ignore Conditions applied directly to
     the PackageReference or ItemGroup containing a PackageReference. Both

package/Microsoft.ReactNative.Managed/ReactPackageBuilderExtensions.cs

@@ -18,7 +18,7 @@ namespace Microsoft.ReactNative.Managed
     /// This caches for each assembly (keyed on location
     /// </summary>
     /// <remarks>
-    /// We use concurrentDictionary instead of ConcurrentBag due to it's performance charateristics.
+    /// We use concurrentDictionary instead of ConcurrentBag due to it's performance characteristics.
     /// </remarks>
     private static readonly ConcurrentDictionary<Assembly, Lazy<Dictionary<string, AttributedModule>>> s_registeredAssemblies =
       new ConcurrentDictionary<Assembly, Lazy<Dictionary<string, AttributedModule>>>();