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

package/Microsoft.ReactNative.Cxx/ReactCommon/react/timing/primitives.h

@@ -7,7 +7,9 @@
 
 #pragma once
 
+#include <react/debug/flags.h>
 #include <chrono>
+#include <functional>
 
 namespace facebook::react {
 
@@ -193,11 +195,10 @@ class HighResTimeStamp {
       const HighResDuration& rhs);
 
  public:
-  HighResTimeStamp() noexcept
-      : chronoTimePoint_(std::chrono::steady_clock::now()) {}
+  HighResTimeStamp() noexcept : chronoTimePoint_(chronoNow()) {}
 
-  static constexpr HighResTimeStamp now() noexcept {
-    return HighResTimeStamp(std::chrono::steady_clock::now());
+  static HighResTimeStamp now() noexcept {
+    return HighResTimeStamp(chronoNow());
   }
 
   static constexpr HighResTimeStamp min() noexcept {
@@ -228,6 +229,14 @@ class HighResTimeStamp {
     return HighResTimeStamp(chronoTimePoint);
   }
 
+#ifdef REACT_NATIVE_DEBUG
+  static void setTimeStampProviderForTesting(
+      std::function<std::chrono::steady_clock::time_point()>&&
+          timeStampProvider) {
+    getTimeStampProvider() = std::move(timeStampProvider);
+  }
+#endif
+
   // This method is provided for convenience, if you need to convert
   // HighResTimeStamp to some common epoch with time stamps from other sources.
   constexpr std::chrono::steady_clock::time_point toChronoSteadyClockTimePoint()
@@ -275,6 +284,25 @@ class HighResTimeStamp {
       : chronoTimePoint_(chronoTimePoint) {}
 
   std::chrono::steady_clock::time_point chronoTimePoint_;
+
+#ifdef REACT_NATIVE_DEBUG
+  static std::function<std::chrono::steady_clock::time_point()>&
+  getTimeStampProvider() {
+    static std::function<std::chrono::steady_clock::time_point()>
+        timeStampProvider = nullptr;
+    return timeStampProvider;
+  }
+
+  static std::chrono::steady_clock::time_point chronoNow() {
+    auto& timeStampProvider = getTimeStampProvider();
+    return timeStampProvider != nullptr ? timeStampProvider()
+                                        : std::chrono::steady_clock::now();
+  }
+#else
+  inline static std::chrono::steady_clock::time_point chronoNow() {
+    return std::chrono::steady_clock::now();
+  }
+#endif
 };
 
 inline constexpr HighResDuration operator-(

package/Microsoft.ReactNative.Cxx/ReactContext.h

@@ -8,9 +8,6 @@
 #ifndef MICROSOFT_REACTNATIVE_REACTCONTEXT
 #define MICROSOFT_REACTNATIVE_REACTCONTEXT
 
-#if !defined(CORE_ABI) && !defined(__APPLE__)
-#include <CppWinRTIncludes.h>
-#endif
 #include <ReactCommon/CallInvoker.h>
 #include <string_view>
 #include "JSValueWriter.h"
@@ -72,16 +69,6 @@ struct ReactContext {
     m_handle.EmitJSEvent(eventEmitterName, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
   }
 
-#if !defined(CORE_ABI) && !defined(USE_FABRIC) && !defined(__APPLE__) && !defined(CXXUNITTESTS)
-  // Dispatch eventName event to the view.
-  // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
-  template <class... TArgs>
-  void DispatchEvent(xaml::FrameworkElement const &view, std::wstring_view eventName, TArgs &&...args) const noexcept {
-    XamlUIService::FromContext(m_handle).DispatchEvent(
-        view, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
-  }
-#endif
-
   friend bool operator==(ReactContext const &left, ReactContext const &right) noexcept {
     return left.m_handle == right.m_handle;
   }

package/Microsoft.ReactNative.Cxx/StructInfo.h

@@ -81,7 +81,7 @@ struct FieldInfo {
   FieldInfo(TValue TClass::*fieldPtr) noexcept
       : m_fieldReader{FieldReader<TClass, TValue>},
         m_fieldWriter{FieldWriter<TClass, TValue>},
-        m_fieldPtrStore{*reinterpret_cast<uintptr_t *>(&fieldPtr)} {
+        m_fieldPtrStore{StoreFieldPtr(fieldPtr)} {
     static_assert(sizeof(m_fieldPtrStore) >= sizeof(fieldPtr));
   }
 
@@ -94,6 +94,13 @@ struct FieldInfo {
   }
 
  private:
+  template <class TClass, class TValue>
+  static uintptr_t StoreFieldPtr(TValue TClass::*fieldPtr) noexcept {
+    uintptr_t result{};
+    std::memcpy(&result, &fieldPtr, sizeof(fieldPtr));
+    return result;
+  }
+
   FieldReaderType m_fieldReader;
   FieldWriterType m_fieldWriter;
   const uintptr_t m_fieldPtrStore;

package/Microsoft.ReactNative.Cxx/UI.Composition.Effects.h

@@ -3,8 +3,4 @@
 
 #pragma once
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Composition.Effects.h>
-#else
-#include <winrt/Windows.UI.Composition.Effects.h>
-#endif //  USE_WINUI3

package/Microsoft.ReactNative.Cxx/UI.Composition.h

@@ -3,8 +3,4 @@
 
 #pragma once
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Composition.h>
-#else
-#include <winrt/Windows.UI.Composition.h>
-#endif //  USE_WINUI3

package/Microsoft.ReactNative.Cxx/UI.Input.h

@@ -3,8 +3,4 @@
 
 #pragma once
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Input.h>
-#else
-#include <winrt/Windows.UI.Input.h>
-#endif //  USE_WINUI3

package/Microsoft.ReactNative.Cxx/UI.Popups.h

@@ -3,8 +3,4 @@
 
 #pragma once
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Popups.h>
-#else
-#include <winrt/Windows.UI.Popups.h>
-#endif //  USE_WINUI3

package/Microsoft.ReactNative.Cxx/UI.Text.h

@@ -5,12 +5,8 @@
 
 #include <winrt/Windows.UI.Text.h>
 
-#ifdef USE_WINUI3
 #include <winrt/Microsoft.UI.Text.h>
 namespace text = winrt::Microsoft::UI::Text;
 namespace winrt::Microsoft::UI::Text {
 using FontStyle = winrt::Windows::UI::Text::FontStyle;
 }
-#else
-namespace text = winrt::Windows::UI::Text;
-#endif //  USE_WINUI3

package/Microsoft.ReactNative.Cxx/XamlUtils.h

@@ -33,39 +33,6 @@ WINRT_IMPL_LINK(GetModuleHandleW, 4);
 
 namespace XAML_CPPWINRT_NAMESPACE {
 
-// Return Application::Current() when it is present or nullptr otherwise.
-// It does not throw exception as Application::Current() does.
-inline Application TryGetCurrentApplication() noexcept {
-#ifndef USE_WINUI3
-  constexpr auto xamlDll = L"Windows.UI.Xaml.dll";
-#else
-  constexpr auto xamlDll = L"Microsoft.UI.Xaml.dll";
-#endif
-
-  if (auto xamlIsLoaded = WINRT_IMPL_GetModuleHandleW(xamlDll)) {
-    auto applicationStatics = get_activation_factory<IApplicationStatics>(name_of<Application>());
-    auto abiApplicationStatics = static_cast<impl::abi_t<IApplicationStatics> *>(get_abi(applicationStatics));
-    void *value{};
-    abiApplicationStatics->get_Current(&value);
-    return Application{value, take_ownership_from_abi};
-  } else {
-    // If we don't have XAML loaded, we are not a XAML app
-    return nullptr;
-  }
-}
-
-// In the legacy architecture, RNW uses a Uwp Xaml app as the groundwork for the UI.
-// In the new architecture, WinUI3 Xaml may be involved, but only as XamlIslands -- leaf nodes in the RNW content.
-// This function returns the Uwp/System Xaml Application if we're running in the legacy architecture and Xaml is
-// running, and null if otherwise.
-inline Application TryGetCurrentUwpXamlApplication() noexcept {
-#ifdef USE_WINUI3
-  return nullptr;
-#else
-  return TryGetCurrentApplication();
-#endif
-}
-
 // Using Windows::UI::ColorHelper causes the process to load Windows.UI.Xaml.dll which is not needed just to fill a
 // Color struct
 inline winrt::Windows::UI::Color FromArgb(uint8_t a, uint8_t r, uint8_t g, uint8_t b) {

package/Microsoft.ReactNative.Managed/JSValueReader.cs

@@ -5,11 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading;
-#if !USE_WINUI3
-using Windows.UI.Xaml.Media;
-#else
 using Microsoft.UI.Xaml.Media;
-#endif
 
 namespace Microsoft.ReactNative.Managed
 {

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

@@ -81,7 +81,6 @@
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\WinUI.props" />
   <Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CSharp.Dependencies.props" />
   <ItemGroup>
-    <Compile Include="AttributedViewManager.cs" />
     <Compile Include="IJSValueTreeReader.cs" />
     <Compile Include="IReactPromise.cs" />
     <Compile Include="JSValue.cs" />
@@ -126,8 +125,6 @@
     <Compile Include="ReactPromise.cs" />
     <Compile Include="ReactSyncMethodInfo.cs" />
     <Compile Include="ReflectionReactPackageProvider.cs" />
-    <Compile Include="ViewManagerAttributes.cs" />
-    <Compile Include="ViewManagerEvent.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Properties\Microsoft.ReactNative.Managed.rd.xml" />
   </ItemGroup>

package/Microsoft.ReactNative.Managed/ReactContext.cs

@@ -1,12 +1,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-#if !USE_WINUI3
-using System.Reflection.Metadata;
-using Windows.UI.Xaml;
-#else
 using Microsoft.UI.Xaml;
-#endif
 
 namespace Microsoft.ReactNative.Managed
 {

package/Microsoft.ReactNative.Managed/ReactContextGenerator.cs

@@ -4,11 +4,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
-#if !USE_WINUI3
-using Windows.UI.Xaml;
-#else
 using Microsoft.UI.Xaml;
-#endif
 
 namespace Microsoft.ReactNative.Managed
 {

package/Microsoft.ReactNative.Managed/ReactPackageBuilderExtensions.cs

@@ -83,30 +83,5 @@ namespace Microsoft.ReactNative.Managed
       return false;
     }
 
-    /// <summary>
-    /// Adds the view managers defined in the given assembly via reflection to the package builder.
-    /// </summary>
-    public static void AddViewManagers(this IReactPackageBuilder packageBuilder, Assembly assembly)
-    {
-      foreach (var typeInfo in assembly.DefinedTypes)
-      {
-        if (!typeInfo.IsAbstract && typeInfo.ImplementedInterfaces.Contains(typeof(IViewManager)))
-        {
-          packageBuilder.AddViewManager(typeInfo.Name, () => (IViewManager)Activator.CreateInstance(typeInfo.AsType()));
-        }
-      }
-    }
-
-    /// <summary>
-    /// Adds the view manages in the given assembly via reflection to the package builder.
-    /// </summary>
-    /// <remarks>
-    /// This method will be obsolete soon. It should only be called by existing generated project that still use the `Microsoft.ReactNative.SharedManaged` project
-    /// where s_currentAssembly will reflect the users assembly that compiles this code as well.
-    /// </remarks>
-    public static void AddViewManagers(this IReactPackageBuilder packageBuilder)
-    {
-      AddViewManagers(packageBuilder, s_currentAssembly);
-    }
   }
 }

package/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs

@@ -30,10 +30,6 @@ namespace Microsoft.ReactNative.Managed
 
     public bool UseFastRefresh => IsValid ? Handle.UseFastRefresh : false;
 
-    #pragma warning disable 612, 618 // Deprecated
-    public bool UseWebDebugger => IsValid ? Handle.UseWebDebugger : false;
-    #pragma warning restore 612, 618
-
     public bool RequestDevBundle => IsValid ? Handle.RequestDevBundle : true;
 
     public IReactSettingsSnapshot Handle { get; }

package/Microsoft.ReactNative.Managed/ReflectionReactPackageProvider.cs

@@ -6,7 +6,7 @@ using Microsoft.ReactNative;
 namespace Microsoft.ReactNative.Managed
 {
   /// <summary>
-  /// A default implementation that uses reflection to extract the Modules and ViewManagers
+  /// A default implementation that uses reflection to extract the Modules
   /// to be registered on the package builder.
   /// </summary>
   /// <typeparam name="T">This must be thea type defined in the assembly where the items for the react package should be extracted.</typeparam>
@@ -47,7 +47,6 @@ namespace Microsoft.ReactNative.Managed
       var assembly = typeof(T).Assembly;
 
       packageBuilder.AddAttributedModules(assembly);
-      packageBuilder.AddViewManagers(assembly);
       JSValueReaderGenerator.RegisterAssembly(assembly);
       JSValueWriterGenerator.RegisterAssembly(assembly);
     }

package/Microsoft.ReactNative.Managed.CodeGen/CodeAnalyzer.cs

@@ -153,11 +153,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
           assembly.Modules.Add(module);
         }
 
-        if (IsViewManager(type))
-        {
-          assembly.ViewManagers.Add(type);
-        }
-
         // Proactively register serializable types.
         switch (type.TypeKind)
         {
@@ -275,11 +270,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       return assembly;
     }
 
-    internal bool IsViewManager(INamedTypeSymbol type)
-    {
-      return !type.IsAbstract && type.AllInterfaces.Any(iface => iface.Equals(ReactTypes.IViewManagerType, SymbolEqualityComparer.Default));
-    }
-
     internal bool TryExtractModule(INamedTypeSymbol type, [NotNullWhen(returnValue: true)] out ReactModule? module)
     {
       if (TryFindAttribute(type, ReactTypes.ReactModuleAttribute, out var attr))

package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.ViewManager.cs

@@ -15,42 +15,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
   /// </summary>
   public partial class CodeGenerator
   {
-    internal MemberDeclarationSyntax CreateViewManagers(IEnumerable<INamedTypeSymbol> viewManagers)
-    {
-      var registrationCalls = new List<StatementSyntax>();
-      foreach (var viewManager in viewManagers)
-      {
-        // Given "MyApp.MyViewManager"
-        // Generates:
-        //    packageBuilder.AddViewManager("MyViewManager", () => new global::MyApp.ViewManager);
-        registrationCalls.Add(
-          InvocationStatement(
-            MemberAccessExpression(ReactNativeNames.PackageBuilderId, ReactNativeNames.AddViewManager),
-            LiteralExpression(viewManager.Name),
-            ParenthesizedLambdaExpression(
-              parameterList: ParameterList(),
-              block: null,
-              expressionBody: ObjectCreationExpression(viewManager))
-          )
-        );
-      }
-
-      // Generates:
-      //    internal void CreateViewManager(IPackageBuilder packageBuilder)
-      //    {
-      //       ... registrationCalls (ses above)
-      //    }
-      return MethodDeclaration(
-          PredefinedType(Token(SyntaxKind.VoidKeyword)),
-          ReactNativeNames.CreateViewManagers)
-        .AddModifiers(
-          Token(SyntaxKind.InternalKeyword))
-        .AddParameterListParameters(
-          GetPackageBuilderArgument())
-        .WithBody(
-          Block(
-            registrationCalls));
-    }
 
     private ParameterSyntax GetPackageBuilderArgument()
     {

package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.cs

@@ -35,12 +35,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       var registrationInvocations = new List<StatementSyntax>();
       var providerMembers = new List<MemberDeclarationSyntax>();
 
-      if (assembly.ViewManagers.Any())
-      {
-        registrationInvocations.Add(InvocationStatement(ReactNativeNames.CreateViewManagers, IdentifierName(ReactNativeNames.PackageBuilderId)));
-        providerMembers.Add(CreateViewManagers(assembly.ViewManagers));
-      }
-
       if (assembly.Modules.Any())
       {
         registrationInvocations.Add(InvocationStatement(ReactNativeNames.CreateModules, IdentifierName((ReactNativeNames.PackageBuilderId))));

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactAssembly.cs

@@ -8,8 +8,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
 {
   public class ReactAssembly
   {
-    public ICollection<INamedTypeSymbol> ViewManagers { get; } = new List<INamedTypeSymbol>();
-
     public ICollection<ReactModule> Modules { get; } = new List<ReactModule>();
 
     public IDictionary<ITypeSymbol, IMethodSymbol> JSReaderFunctions { get; } = new Dictionary<ITypeSymbol, IMethodSymbol>(SymbolEqualityComparer.Default);

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactTypes.cs

@@ -24,7 +24,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
         public INamedTypeSymbol Task { get; }
         public INamedTypeSymbol TaskOfT { get; }
 
-        public INamedTypeSymbol IViewManagerType { get; }
         public INamedTypeSymbol IReactPackageProvider { get; }
         public INamedTypeSymbol IReactPackageBuilder { get; }
         public INamedTypeSymbol IReactModuleBuilder { get; }
@@ -66,7 +65,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
             Task = FindBclType(compilation, "System.Threading.Tasks.Task");
             TaskOfT = FindBclType(compilation, "System.Threading.Tasks.Task`1")!.ConstructUnboundGenericType();
 
-            IViewManagerType = FindReactNativeType(compilation, "IViewManager");
             IReactPackageProvider = FindReactNativeType(compilation, "IReactPackageProvider");
             IReactPackageBuilder = FindReactNativeType(compilation, "IReactPackageBuilder");
             IReactModuleBuilder = FindReactNativeType(compilation, "IReactModuleBuilder");

package/Microsoft.ReactNative.Managed.CodeGen/ReactNativeNames.cs

@@ -29,7 +29,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     public static readonly SyntaxToken Module = Identifier("module");
     public static readonly SyntaxToken CreatePackage = Identifier("CreatePackage");
     public static readonly SyntaxToken CreatePackageImplementation = Identifier("CreatePackageImplementation");
-    public static readonly SyntaxToken AddViewManager = Identifier("AddViewManager");
     public static readonly SyntaxToken AddModule = Identifier("AddModule");
 
     public static readonly SyntaxToken AddInitializer = Identifier("AddInitializer");
@@ -37,7 +36,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     public static readonly SyntaxToken AddMethod = Identifier("AddMethod");
     public static readonly SyntaxToken AddSyncMethod = Identifier("AddSyncMethod");
 
-    public static readonly SyntaxToken CreateViewManagers = Identifier("CreateViewManagers");
     public static readonly SyntaxToken CreateModules = Identifier("CreateModules");
     public static readonly SyntaxToken CreateSerializers = Identifier("CreateSerializers");
     public static readonly SyntaxToken CreateEnumSerializers = Identifier("CreateEnumSerializers");

package/Mso/src/dispatchQueue/queueService.cpp

@@ -205,8 +205,10 @@ void QueueService::InvokeTask(
   DispatchTask taskToInvoke{std::move(task)};
   taskToInvoke.Get()->Invoke(); // Call Get()->Invoke instead of operator() to flatten call stack
 
-  while (taskToInvoke = context.TakeNextDeferredTask()) {
+  taskToInvoke = context.TakeNextDeferredTask();
+  while (taskToInvoke) {
     taskToInvoke.Get()->Invoke();
+    taskToInvoke = context.TakeNextDeferredTask();
   }
 }
 

package/Mso/src/dispatchQueue/uiScheduler_winrt.cpp

@@ -11,9 +11,7 @@ using namespace winrt;
 using namespace Windows::Foundation;
 #include "winrt/Windows.System.h"
 
-#ifdef USE_WINUI3
 #include "winrt/Microsoft.UI.Dispatching.h"
-#endif
 
 namespace Mso {
 
@@ -86,7 +84,6 @@ struct DispatcherTraits<WindowsTypeTag> {
 };
 using WindowsDispatcherTraits = DispatcherTraits<WindowsTypeTag>;
 
-#ifdef USE_WINUI3
 struct MicrosoftTypeTag;
 using MicrosoftTaskDispatcherHandler = TaskDispatcherHandler<DispatcherTraits<MicrosoftTypeTag>>;
 
@@ -100,8 +97,6 @@ struct DispatcherTraits<MicrosoftTypeTag> {
 };
 using MicrosoftDispatcherTraits = DispatcherTraits<MicrosoftTypeTag>;
 
-#endif
-
 //! TaskDispatcherHandler is a DispatcherQueueHandler delegate that we pass to DispatcherQueue.
 //! We use custom ref counting to avoid extra memory allocations and to handle reference to DispatchTask.
 template <typename TDispatcherTraits>
@@ -271,7 +266,8 @@ bool UISchedulerWinRT<TDispatcherTraits>::TryTakeTask(
     --m_taskCount;
   }
 
-  if (queue = m_queue.GetStrongPtr()) {
+  queue = m_queue.GetStrongPtr();
+  if (queue) {
     return queue->TryDequeTask(task);
   }
 
@@ -418,14 +414,10 @@ void UISchedulerWinRT<TDispatcherTraits>::CleanupContext::CheckTermination() noe
 
 DispatchQueue DispatchQueueStatic::GetCurrentUIThreadQueue() noexcept {
   DispatchQueue queue{nullptr};
-#if USE_WINUI3
   queue = UISchedulerWinRT<MicrosoftDispatcherTraits>::GetOrCreateUIThreadQueue();
   if (!queue) {
-#endif
     queue = UISchedulerWinRT<WindowsDispatcherTraits>::GetOrCreateUIThreadQueue();
-#if USE_WINUI3
   }
-#endif
   return queue;
 }
 

package/PropertySheets/Bundle.Common.targets

@@ -17,7 +17,7 @@
   </Target>
 
   <!-- See https://github.com/facebook/react-native/blob/07d090dbc6c46b8f3760dbd25dbe0540c18cb3f3/react.gradle#L190 for reference -->
-  <Target Name="CompileHermesBytecode" AfterTargets="MakeBundle" Condition="'$(UseBundle)' == 'true' AND '$(UseHermes)' == 'true'">
+  <Target Name="CompileHermesBytecode" AfterTargets="MakeBundle" Condition="'$(UseBundle)' == 'true'">
     <Message Importance="High" Text="Running [$(HermesCompilerCommand) -emit-binary -out $(BundleOutputFile).hbc $(BundleOutputFile) $(HermesCompilerFlags) -output-source-map] to precompile bundle file." />
     <Exec Command='$(HermesCompilerCommand) -emit-binary -out "$(BundleOutputFile).hbc" "$(BundleOutputFile)" $(HermesCompilerFlags) -output-source-map' ConsoleToMSBuild="true" WorkingDirectory="$(BundleCommandWorkingDir)" />
     <Move SourceFiles="$(BundleOutputFile).hbc" DestinationFiles="$(BundleOutputFile)" />

package/PropertySheets/Bundle.props

@@ -36,7 +36,7 @@
     <UseDevBundle Condition="'$(UseDevBundle)' == '' and '$(Configuration)' != 'Debug'">false</UseDevBundle>
 
     <!-- Extra arguments to pass to the bundler command -->
-    <BundlerExtraArgs Condition="'$(BundlerExtraArgs)' == '' AND '$(UseHermes)' == 'true'">--minify false</BundlerExtraArgs>
+    <BundlerExtraArgs Condition="'$(BundlerExtraArgs)' == ''">--minify false</BundlerExtraArgs>
 
     <!-- Command to use to create a bundle -->
     <BundleCliCommand Condition="'$(BundleCliCommand)' == ''">npx @react-native-community/cli bundle</BundleCliCommand>
@@ -64,12 +64,11 @@
     <BundleSourceMap Condition="'$(BundleSourceMap)' == ''">$(BaseBundleSourceMap).map</BundleSourceMap>
 
     <!-- Filename for source maps generated by metro-->
-    <PackagerSourceMapExtension Condition="'$(PackagerSourceMapExtension)' == '' AND '$(UseHermes)' != 'true'">.map</PackagerSourceMapExtension>
-    <PackagerSourceMapExtension Condition="'$(PackagerSourceMapExtension)' == '' AND '$(UseHermes)' == 'true'">.packager.map</PackagerSourceMapExtension>
+    <PackagerSourceMapExtension Condition="'$(PackagerSourceMapExtension)' == ''">.packager.map</PackagerSourceMapExtension>
     <PackagerSourceMap Condition="'$(PackagerSourceMap)' == ''">$(BaseBundleSourceMap)$(PackagerSourceMapExtension)</PackagerSourceMap>
 
     <!-- Filename for source maps generated by Hermes -->
-    <HermesSourceMap Condition="'$(HermesSourceMap)' == '' AND '$(UseHermes)' == 'true'">$(BaseBundleSourceMap).compiler.map</HermesSourceMap>
+    <HermesSourceMap Condition="'$(HermesSourceMap)' == ''">$(BaseBundleSourceMap).compiler.map</HermesSourceMap>
 
     <!-- Command to compile Hermes bytecode -->
     <HermesCompilerCommand Condition="'$(HermesCompilerCommand)' == ''">$(HermesPackage)\tools\native\release\x86\hermes.exe</HermesCompilerCommand>

package/PropertySheets/External/Microsoft.ReactNative.Common.props

@@ -35,7 +35,6 @@
   <PropertyGroup>
     <ProjectDir Condition="'$(ProjectDir)' == ''">$(MSBuildProjectDirectory)\</ProjectDir>
     <UseExperimentalNuget Condition="'$(UseExperimentalNuget)' == ''">false</UseExperimentalNuget>
-    <HermesNoDLLCopy Condition="'$(UseHermes)' != 'true'">true</HermesNoDLLCopy>
 
     <RestorePackagesWithLockFile Condition="'$(RestorePackagesWithLockFile)' == ''">true</RestorePackagesWithLockFile>
     <RestoreForceEvaluate Condition="'$(RestoreForceEvaluate)' == ''">false</RestoreForceEvaluate>

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CSharpApp.targets

@@ -25,7 +25,7 @@
     <!-- WinUI package name and version are set by WinUI.props -->
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" Condition="$(UseHermes)" />
+    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
   </ItemGroup>
 
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\ManagedCodeGen\Microsoft.ReactNative.Managed.CodeGen.targets"

package/PropertySheets/External/Microsoft.ReactNative.Uwp.CppApp.targets

@@ -25,7 +25,7 @@
     <!-- WinUI package name and version are set by WinUI.props -->
     <PackageReference Include="$(WinUIPackageName)" Version="$(WinUIPackageVersion)" Condition="'$(OverrideWinUIPackage)'!='true'" />
     <!-- Hermes version is set by JSEngine.props -->
-    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" Condition="$(UseHermes)" />
+    <PackageReference Include="Microsoft.JavaScript.Hermes" Version="$(HermesVersion)" />
   </ItemGroup>
 
   <!-- The props file for bundling is not set up to be just defaults, it assumes to be run at the end of the project. -->

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.81.1</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.82.0-preview.1</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
-    <ReactNativeWindowsMinor>81</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>1</ReactNativeWindowsPatch>
+    <ReactNativeWindowsMinor>82</ReactNativeWindowsMinor>
+    <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>58d0858332f98821a7f434ba5f6e39ddbe81d0cc</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>ff00401de651ccddf5a25d411c3ace8e49f12189</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/PropertySheets/JSEngine.props

@@ -6,7 +6,7 @@
     <!-- Enabling this will (1) Include hermes glues in the Microsoft.ReactNative binaries AND (2) Make hermes the default engine -->
     <UseHermes Condition="'$(UseHermes)' == ''">true</UseHermes>
     <!-- This will be true if (1) the client want to use hermes by setting UseHermes to true OR (2) We are building for UWP where dynamic switching is enabled -->
-    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2511.7001-d7ca19b3</HermesVersion>
+    <HermesVersion Condition="'$(HermesVersion)' == ''">0.0.0-2512.22001-bc3d0ed7</HermesVersion>
     <HermesPackage Condition="'$(HermesPackage)' == '' And Exists('$(PkgMicrosoft_JavaScript_Hermes)')">$(PkgMicrosoft_JavaScript_Hermes)</HermesPackage>
     <HermesPackage Condition="'$(HermesPackage)' == ''">$(NuGetPackageRoot)\Microsoft.JavaScript.Hermes\$(HermesVersion)</HermesPackage>
     <EnableHermesInspectorInReleaseFlavor Condition="'$(EnableHermesInspectorInReleaseFlavor)' == ''">false</EnableHermesInspectorInReleaseFlavor>

package/PropertySheets/NuGet.LockFile.props

@@ -10,15 +10,7 @@
   <PropertyGroup>
     <RestoreLockedMode Condition="'$(RestoreLockedMode)'=='' OR '$(BuildingInRnwRepo)'=='true'">true</RestoreLockedMode>
 
-    <!-- RnwNewArchOnly is for projects that always build with RnwNewArch so they don't add .newarch to the filename. -->
-    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(SolutionName)'=='ReactWindows-Desktop'">true</RnwNewArchOnly>
-    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.CppApp.props'">true</RnwNewArchOnly>
-    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'=='' AND '$(RnwExternalPropsLoaded)'=='Microsoft.ReactNative.Composition.Package.props'">true</RnwNewArchOnly>
-    <RnwNewArchOnly Condition="'$(RnwNewArchOnly)'==''">false</RnwNewArchOnly>
-
     <NuGetLockFileName>packages</NuGetLockFileName>
-    <NuGetLockFileName Condition="'$(UseHermes)'=='false'">$(NuGetLockFileName).chakra</NuGetLockFileName>
-    <NuGetLockFileName Condition="'$(RnwNewArch)'=='true' AND '$(RnwNewArchOnly)'=='false'">$(NuGetLockFileName).newarch</NuGetLockFileName>
     <NuGetLockFileName Condition="'$(UseExperimentalWinUI3)'=='true'">$(NuGetLockFileName).experimentalwinui3</NuGetLockFileName>
     <NuGetLockFilePath>.\$(NuGetLockFileName).lock.json</NuGetLockFilePath>
   </PropertyGroup>

package/PropertySheets/OutputMSBuildProperties.targets

@@ -17,7 +17,6 @@
         "WinUIPackageVersion": "$(WinUIPackageVersion)",
         "WindowsTargetPlatformVersion": "$(WindowsTargetPlatformVersion)",
         "UseExperimentalNuGet": "$(UseExperimentalNuGet)",
-        "UseHermes": "$(UseHermes)",
         "UseWinUI3": "$(UseWinUI3)",
         "UseFabric": "$(UseFabric)",
         "RnwNewArch": "$(RnwNewArch)"