react-native-windows 0.68.1 → 0.69.0-preview.1

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

@@ -137,6 +137,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::PropNameID createPropNameIDFromAscii(const char *str, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromUtf8(const uint8_t *utf8, size_t length) override;
   facebook::jsi::PropNameID createPropNameIDFromString(const facebook::jsi::String &str) override;
+  facebook::jsi::PropNameID createPropNameIDFromSymbol(const facebook::jsi::Symbol &sym);
   std::string utf8(const facebook::jsi::PropNameID &id) override;
   bool compare(const facebook::jsi::PropNameID &lhs, const facebook::jsi::PropNameID &rhs) override;
 
@@ -190,7 +191,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   facebook::jsi::Function createFunctionFromHostFunction(
       const facebook::jsi::PropNameID &name,
       unsigned int paramCount,
-      facebook::jsi::HostFunctionType type) override;
+      facebook::jsi::HostFunctionType func) override;
   facebook::jsi::Value call(
       const facebook::jsi::Function &func,
       const facebook::jsi::Value &jsThis,
@@ -475,7 +476,7 @@ struct NapiJsiRuntime : facebook::jsi::Runtime {
   void SetProperty(napi_value object, napi_value propertyId, napi_value value, napi_property_attributes attrs) const;
   napi_value CreateArray(size_t length) const;
   void SetElement(napi_value array, uint32_t index, napi_value value) const;
-  static napi_value JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
+  static napi_value __cdecl JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept;
   napi_value CreateExternalFunction(napi_value name, int32_t paramCount, napi_callback callback, void *callbackData);
   napi_value CreateExternalObject(void *data, napi_finalize finalizeCallback) const;
   template <typename T>
@@ -711,6 +712,14 @@ PropNameID NapiJsiRuntime::createPropNameIDFromString(const String &str) {
   return MakePointer<PropNameID>(uniqueStr);
 }
 
+PropNameID NapiJsiRuntime::createPropNameIDFromSymbol(const Symbol &sym) {
+  // TODO: Support for symbols through the native API in JSC is very limited.
+  // While we could construct a PropNameID here, we would not be able to get a
+  // symbol property through the C++ API.
+  UNREFERENCED_PARAMETER(sym);
+  throw;
+}
+
 string NapiJsiRuntime::utf8(const PropNameID &id) {
   EnvScope scope{m_env};
 
@@ -1245,7 +1254,7 @@ size_t NapiJsiRuntime::JsiValueViewArgs::Size() const noexcept {
 #pragma region PropNameIDView
 
 NapiJsiRuntime::PropNameIDView::PropNameIDView(NapiJsiRuntime *runtime, napi_value propertyId) noexcept
-    : m_propertyId{make<PropNameID>(new (std::addressof(m_pointerStore)) NapiPointerValueView{runtime, propertyId})} {}
+    : m_propertyId{make<PropNameID>(new(std::addressof(m_pointerStore)) NapiPointerValueView{runtime, propertyId})} {}
 
 NapiJsiRuntime::PropNameIDView::operator PropNameID const &() const noexcept {
   return m_propertyId;
@@ -1702,7 +1711,7 @@ void NapiJsiRuntime::SetElement(napi_value array, uint32_t index, napi_value val
 }
 
 // The NAPI external function callback used for the JSI host function implementation.
-/*static*/ napi_value NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
+/*static*/ napi_value __cdecl NapiJsiRuntime::JsiHostFunctionCallback(napi_env env, napi_callback_info info) noexcept {
   HostFunctionWrapper *hostFuncWrapper{};
   size_t argc{};
   CHECK_NAPI_ELSE_CRASH(
@@ -1750,15 +1759,11 @@ napi_value NapiJsiRuntime::CreateExternalObject(void *data, napi_finalize finali
 // Wraps up std::unique_ptr as an external object.
 template <typename T>
 napi_value NapiJsiRuntime::CreateExternalObject(unique_ptr<T> &&data) const {
-  napi_value object =
-      CreateExternalObject(data.get(), [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
-        // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
-        if (std::is_array<T>::value) {
-          delete[] static_cast<T *>(dataToDestroy);
-        } else {
-          delete static_cast<T *>(dataToDestroy);
-        }
-      });
+  napi_finalize finalize = [](napi_env /*env*/, void *dataToDestroy, void * /*finalizerHint*/) {
+    // We wrap dataToDestroy in a unique_ptr to avoid calling delete explicitly.
+    unique_ptr<T> dataDeleter{static_cast<T *>(dataToDestroy)};
+  };
+  napi_value object = CreateExternalObject(data.get(), finalize);
 
   // We only call data.release() after the CreateExternalObject succeeds.
   // Otherwise, when CreateExternalObject fails and an exception is thrown,
@@ -1807,7 +1812,7 @@ napi_value NapiJsiRuntime::GetHostObjectProxyHandler() {
 // Sets Proxy trap method as a pointer to NapiJsiRuntime instance method.
 template <napi_value (NapiJsiRuntime::*trapMethod)(span<napi_value>), size_t argCount>
 void NapiJsiRuntime::SetProxyTrap(napi_value handler, napi_value propertyName) {
-  auto proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
+  napi_callback proxyTrap = [](napi_env env, napi_callback_info info) noexcept {
     NapiJsiRuntime *runtime{};
     napi_value args[argCount]{};
     size_t actualArgCount{argCount};

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

@@ -2,6 +2,8 @@
 // Licensed under the MIT License.
 
 #pragma once
+#ifndef MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME
+#define MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME
 
 // JSI
 #include <js_native_ext_api.h>
@@ -19,3 +21,5 @@ namespace Microsoft::JSI {
 std::unique_ptr<facebook::jsi::Runtime> __cdecl MakeNodeApiJsiRuntime(napi_env env) noexcept;
 
 } // namespace Microsoft::JSI
+
+#endif // MICROSOFT_REACTNATIVE_JSI_NODEAPIJSIRUNTIME

package/Microsoft.ReactNative.Cxx/JSValueReader.h

@@ -90,7 +90,7 @@ void ReadValue(IJSValueReader const &reader, /*out*/ T &value) noexcept;
 
 bool SkipArrayToEnd(IJSValueReader const &reader) noexcept;
 template <class... TArgs>
-void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept;
+void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &...args) noexcept;
 
 //===========================================================================
 // IJSValueReader extensions implementation
@@ -432,7 +432,7 @@ inline bool SkipArrayToEnd(IJSValueReader const &reader) noexcept {
 }
 
 template <class... TArgs>
-inline void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &... args) noexcept {
+inline void ReadArgs(IJSValueReader const &reader, /*out*/ TArgs &...args) noexcept {
   // Read as many arguments as we can or return default values.
   bool success = reader.ValueType() == JSValueType::Array;
   ((success = success && reader.GetNextArrayItem(), args = success ? ReadValue<TArgs>(reader) : TArgs{}), ...);

package/Microsoft.ReactNative.Cxx/JSValueWriter.h

@@ -64,10 +64,10 @@ template <class T>
 void WriteProperties(IJSValueWriter const &writer, T const &value) noexcept;
 
 template <class... TArgs>
-void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept;
+void WriteArgs(IJSValueWriter const &writer, TArgs const &...args) noexcept;
 
 template <class... TArgs>
-JSValueArgWriter MakeJSValueArgWriter(TArgs &&... args) noexcept;
+JSValueArgWriter MakeJSValueArgWriter(TArgs &&...args) noexcept;
 
 IJSValueWriter MakeJSValueTreeWriter() noexcept;
 
@@ -264,7 +264,7 @@ inline void WriteProperties(IJSValueWriter const &writer, T const &value) noexce
 }
 
 template <class... TArgs>
-inline void WriteArgs(IJSValueWriter const &writer, TArgs const &... args) noexcept {
+inline void WriteArgs(IJSValueWriter const &writer, TArgs const &...args) noexcept {
   writer.WriteArrayBegin();
   (WriteValue(writer, args), ...);
   writer.WriteArrayEnd();
@@ -276,7 +276,7 @@ inline JSValueArgWriter MakeJSValueArgWriter(T &&argWriter) noexcept {
 }
 
 template <class... TArgs>
-inline JSValueArgWriter MakeJSValueArgWriter(TArgs &&... args) noexcept {
+inline JSValueArgWriter MakeJSValueArgWriter(TArgs &&...args) noexcept {
   return [&args...](IJSValueWriter const &writer) noexcept { WriteArgs(writer, args...); };
 }
 
@@ -286,7 +286,7 @@ inline JSValueArgWriter MakeJSValueWriter(T &&argWriter) noexcept {
 }
 
 template <class... TArgs>
-inline JSValueArgWriter MakeJSValueWriter(TArgs &&... args) noexcept {
+inline JSValueArgWriter MakeJSValueWriter(TArgs &&...args) noexcept {
   return [&args...](IJSValueWriter const &[[maybe_unused]] writer) noexcept { (WriteValue(writer, args), ...); };
 }
 

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

@@ -12,6 +12,8 @@
     <CallInvoker_SourcePath Condition="'$(CallInvoker_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\CallInvoker.h')">$(MSBuildThisFileDirectory)</CallInvoker_SourcePath>
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\nativemodule\core</TurboModule_SourcePath>
     <TurboModule_SourcePath Condition="'$(TurboModule_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</TurboModule_SourcePath>
+    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND '$(ReactNativeDir)' != ''">$(ReactNativeDir)\ReactCommon\react\bridging</Bridging_SourcePath>
+    <Bridging_SourcePath Condition="'$(Bridging_SourcePath)' == '' AND Exists('$(MSBuildThisFileDirectory)ReactCommon\TurboModule.h')">$(MSBuildThisFileDirectory)</Bridging_SourcePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
@@ -20,6 +22,7 @@
         $(JSI_SourcePath);
         $(CallInvoker_SourcePath);
         $(TurboModule_SourcePath);
+        $(Bridging_SourcePath);
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
@@ -40,6 +43,7 @@
     <ClInclude Include="$(CallInvoker_SourcePath)\ReactCommon\CallInvoker.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)XamlUtils.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.h" />
+    <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModule.h" />
     <ClInclude Include="$(TurboModule_SourcePath)\ReactCommon\TurboModuleUtils.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)CppWinRTIncludes.h" />
@@ -104,7 +108,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>
-    <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.cpp">
+    <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <DisableSpecificWarnings>%(DisableSpecificWarnings);4100</DisableSpecificWarnings>
     </ClCompile>

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

@@ -18,9 +18,6 @@
     <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\TurboModule.cpp">
       <Filter>TurboModule</Filter>
     </ClCompile>
-    <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\LongLivedObject.cpp">
-      <Filter>TurboModule</Filter>
-    </ClCompile>
     <ClCompile Include="$(TurboModule_SourcePath)\ReactCommon\TurboModuleUtils.cpp">
       <Filter>TurboModule</Filter>
     </ClCompile>
@@ -30,6 +27,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.cpp">
       <Filter>JSI</Filter>
     </ClCompile>
+    <ClCompile Include="$(TurboModule_SourcePath)\..\..\bridging\LongLivedObject.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="$(MSBuildThisFileDirectory)Crash.h" />
@@ -152,6 +150,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)JSI\NodeApiJsiRuntime.h">
       <Filter>JSI</Filter>
     </ClInclude>
+    <ClInclude Include="$(Bridging_SourcePath)\CallbackWrapper.h" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="JSI">

package/Microsoft.ReactNative.Cxx/NativeModules.h

@@ -280,7 +280,7 @@ struct IsPromise<ReactPromise<T>> : std::true_type {};
 template <class TArgsTuple>
 constexpr size_t GetPromiseCount() noexcept {
   if constexpr (
-      std::tuple_size_v<TArgsTuple> > 0 &&
+      std::tuple_size_v < TArgsTuple >> 0 &&
       IsPromise<TupleElementOrVoid<std::tuple_size_v<TArgsTuple> - 1, TArgsTuple>>::value) {
     return 1;
   } else {
@@ -1091,7 +1091,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 
@@ -1109,7 +1109,7 @@ template <class TModule, int I, class TMethodSpec>
 struct ReactSyncMethodVerifier {
   static constexpr bool Verify() noexcept {
     ReactSyncMethodVerifier verifier{};
-    ReactMemberInfoIterator<TModule>{}.GetMemberInfo<I>(verifier);
+    ReactMemberInfoIterator<TModule>{}.template GetMemberInfo<I>(verifier);
     return verifier.m_result;
   }
 

package/Microsoft.ReactNative.Cxx/ReactContext.h

@@ -53,7 +53,7 @@ struct ReactContext {
   // Call methodName JS function of module with moduleName.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>
-  void CallJSFunction(std::wstring_view moduleName, std::wstring_view methodName, TArgs &&... args) const noexcept {
+  void CallJSFunction(std::wstring_view moduleName, std::wstring_view methodName, TArgs &&...args) const noexcept {
     m_handle.CallJSFunction(moduleName, methodName, MakeJSValueArgWriter(std::forward<TArgs>(args)...));
   }
 
@@ -61,7 +61,7 @@ struct ReactContext {
   // Call eventName JS event of module with eventEmitterName.
   // args are either function arguments or a single lambda with 'IJSValueWriter const&' argument.
   template <class... TArgs>
-  void EmitJSEvent(std::wstring_view eventEmitterName, std::wstring_view eventName, TArgs &&... args) const noexcept {
+  void EmitJSEvent(std::wstring_view eventEmitterName, std::wstring_view eventName, TArgs &&...args) const noexcept {
     m_handle.EmitJSEvent(eventEmitterName, eventName, MakeJSValueWriter(std::forward<TArgs>(args)...));
   }
 
@@ -69,7 +69,7 @@ struct ReactContext {
   // 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 {
+  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)...));
   }

package/Microsoft.ReactNative.Cxx/ReactNonAbiValue.h

@@ -22,7 +22,7 @@ template <class T>
 struct ReactNonAbiValue : implements<ReactNonAbiValue<T>, IReactNonAbiValue> {
   // Create ReactNonAbiValue and construct the wrapped value.
   template <class... TArgs>
-  ReactNonAbiValue(TArgs &&... args) noexcept : m_value{std::forward<TArgs>(args)...} {}
+  ReactNonAbiValue(TArgs &&...args) noexcept : m_value{std::forward<TArgs>(args)...} {}
 
   // Get a pointer to the wrapped value.
   int64_t GetPtr() const noexcept {
@@ -47,7 +47,7 @@ template <class T>
 struct ReactNonAbiValue : 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
+  ReactNonAbiValue(std::in_place_t, TArgs &&...args) noexcept
       : IInspectable{make<implementation::ReactNonAbiValue<T>>(std::forward<TArgs>(args)...)} {}
 
   // Create an empty ReactNonAbiValue.
@@ -100,7 +100,7 @@ struct ReactNonAbiValue : Windows::Foundation::IInspectable {
   // Call the call operator() for the stored value.
   // Crash the app if ReactNonAbiValue is empty.
   template <class... TArgs>
-  auto operator()(TArgs &&... args) const {
+  auto operator()(TArgs &&...args) const {
     return (*GetPtr())(std::forward<TArgs>(args)...);
   }
 };

package/Microsoft.ReactNative.Cxx/XamlUtils.h

@@ -8,16 +8,55 @@
 
 #include "CppWinRTIncludes.h"
 
+extern "C" {
+HMODULE
+WINAPI
+WINRT_IMPL_GetModuleHandleW(_In_opt_ LPCWSTR lpModuleName);
+}
+
+#ifndef WINRT_IMPL_LINK
+#ifdef _M_HYBRID
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:#WINRT_IMPL_" #function "@" #count "=#" #function "@" #count))
+#elif _M_ARM64EC
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:#WINRT_IMPL_" #function "=#" #function))
+#elif _M_IX86
+#define WINRT_IMPL_LINK(function, count) \
+  __pragma(comment(linker, "/alternatename:_WINRT_IMPL_" #function "@" #count "=_" #function "@" #count))
+#else
+#define WINRT_IMPL_LINK(function, count) __pragma(comment(linker, "/alternatename:WINRT_IMPL_" #function "=" #function))
+#endif
+#endif
+WINRT_IMPL_LINK(GetModuleHandleW, 4);
+#undef WINRT_IMPL_LINK
+
 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 {
-  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};
+#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;
+  }
 }
 
+// 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) {
+  return winrt::Windows::UI::Color{a, r, g, b};
+}
 } // namespace XAML_CPPWINRT_NAMESPACE

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

@@ -31,7 +31,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -39,7 +38,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -49,7 +47,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -57,7 +54,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
-    <OutputPath>bin\ARM64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -67,7 +63,6 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <DebugType>full</DebugType>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -75,7 +70,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
     <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

package/Mso/activeObject/activeObject.h

@@ -56,7 +56,7 @@ struct ActiveObjectMakePolicy {
   static const bool IsNoExcept{true};
 
   template <typename T, typename TMemoryGuard, typename... TArgs>
-  static void Make(TMemoryGuard &memoryGuard, TArgs &&... args) noexcept;
+  static void Make(TMemoryGuard &memoryGuard, TArgs &&...args) noexcept;
 };
 
 //! Custom deleter to call Finalize() or FinalizeSync() from the associated queue.
@@ -159,7 +159,7 @@ struct ActiveObjectBase : IUnknown {
 //=============================================================================================
 
 template <typename T, typename TMemoryGuard, typename... TArgs>
-/*static*/ void ActiveObjectMakePolicy::Make(TMemoryGuard &memoryGuard, TArgs &&... args) noexcept {
+/*static*/ void ActiveObjectMakePolicy::Make(TMemoryGuard &memoryGuard, TArgs &&...args) noexcept {
   memoryGuard.Obj = ::new (memoryGuard.ObjMemory) T{std::forward<TArgs>(args)...};
   memoryGuard.ObjMemory = nullptr; // Memory is now controlled by the object. Set to null to avoid memory destruction.
 

package/Mso/compilerAdapters/cppMacros.h

@@ -29,11 +29,9 @@
   Make the macro act like a statement.
 */
 #ifndef __GNUC__
-#define Statement(x)                                                   \
-  __pragma(warning(push)) __pragma(warning(disable : 4127 25037)) do { \
-    x;                                                                 \
-  }                                                                    \
-  while (0)                                                            \
+#define Statement(x)                                                        \
+  __pragma(warning(push)) __pragma(warning(disable : 4127 25037)) do { x; } \
+  while (0)                                                                 \
   __pragma(warning(pop))
 #else
 #define Statement(x) \

package/Mso/errorCode/errorProvider.h

@@ -28,7 +28,7 @@ class ErrorProvider final : public IErrorProvider {
   ErrorCode MakeErrorCode(const T &errorInfo) const noexcept;
 
   template <class TValue, class... TArgs>
-  Maybe<TValue> MakeMaybe(TArgs &&... errorArgs) const noexcept;
+  Maybe<TValue> MakeMaybe(TArgs &&...errorArgs) const noexcept;
 
   // TODO: deprecate this method in favor of TryGetErrorInfo
   bool IsOwnedErrorCode(const ErrorCode &errorCode) const noexcept;
@@ -87,7 +87,7 @@ ErrorCode ErrorProvider<T, GuidToken>::MakeErrorCode(const T &errorInfo) const n
 
 template <class T, class GuidToken>
 template <class TValue, class... TArgs>
-Maybe<TValue> ErrorProvider<T, GuidToken>::MakeMaybe(TArgs &&... errorArgs) const noexcept {
+Maybe<TValue> ErrorProvider<T, GuidToken>::MakeMaybe(TArgs &&...errorArgs) const noexcept {
   return Mso::Maybe<TValue>(MakeErrorCode(T(std::forward<TArgs>(errorArgs)...)));
 }
 

package/Mso/errorCode/maybe.h

@@ -46,14 +46,14 @@ class Maybe {
   _Allow_implicit_ctor_ Maybe(T &&value) noexcept;
 
   template <class... TArgs>
-  explicit Maybe(InPlaceTag, TArgs &&... args) noexcept;
+  explicit Maybe(InPlaceTag, TArgs &&...args) noexcept;
 
   template <
       class TItem,
       class... TArgs,
       class TDummy =
           typename std::enable_if<std::is_constructible<T, std::initializer_list<TItem> &, TArgs &&...>::value>::type>
-  explicit Maybe(InPlaceTag, std::initializer_list<TItem> il, TArgs &&... args) noexcept;
+  explicit Maybe(InPlaceTag, std::initializer_list<TItem> il, TArgs &&...args) noexcept;
 
   _Allow_implicit_ctor_ Maybe(const ErrorCode &error) noexcept;
   _Allow_implicit_ctor_ Maybe(ErrorCode &&error) noexcept;
@@ -163,13 +163,13 @@ Maybe<T>::Maybe(T &&value) noexcept {
 
 template <class T>
 template <class... TArgs>
-Maybe<T>::Maybe(InPlaceTag, TArgs &&... args) noexcept {
+Maybe<T>::Maybe(InPlaceTag, TArgs &&...args) noexcept {
   ::new (reinterpret_cast<T *>(&reinterpret_cast<char &>(m_value))) T(std::forward<TArgs>(args)...);
 }
 
 template <class T>
 template <class TItem, class... TArgs, class TDummy>
-Maybe<T>::Maybe(InPlaceTag, std::initializer_list<TItem> il, TArgs &&... args) noexcept {
+Maybe<T>::Maybe(InPlaceTag, std::initializer_list<TItem> il, TArgs &&...args) noexcept {
   ::new (reinterpret_cast<T *>(&reinterpret_cast<char &>(m_value))) T(il, std::forward<TArgs>(args)...);
 }
 

package/Mso/functional/functor.h

@@ -161,7 +161,7 @@ class FunctionObjectWrapper final
   template <typename T>
   FunctionObjectWrapper(T &&func) noexcept : m_func(std::forward<T>(func)) {}
 
-  virtual TResult Invoke(TArgs &&... args) noexcept override {
+  virtual TResult Invoke(TArgs &&...args) noexcept override {
     return m_func(std::forward<TArgs>(args)...);
   }
 
@@ -180,7 +180,7 @@ class FunctionObjectWrapperThrow final
   template <typename T>
   FunctionObjectWrapperThrow(T &&func) noexcept : m_func(std::forward<T>(func)) {}
 
-  virtual TResult Invoke(TArgs &&... args) override {
+  virtual TResult Invoke(TArgs &&...args) override {
     return m_func(std::forward<TArgs>(args)...);
   }
 
@@ -199,7 +199,7 @@ class FunctionPointerWrapper final : public ConstexprFunctorBase<Mso::IFunctor<T
  public:
   constexpr FunctionPointerWrapper(TFunc func) noexcept : m_func(func) {}
 
-  TResult Invoke(TArgs &&... args) noexcept override {
+  TResult Invoke(TArgs &&...args) noexcept override {
     return (*m_func)(std::forward<TArgs>(args)...);
   }
 
@@ -216,7 +216,7 @@ class FunctionPointerWrapperThrow final : public ConstexprFunctorBase<Mso::IFunc
  public:
   constexpr FunctionPointerWrapperThrow(TFunc func) noexcept : m_func(func) {}
 
-  TResult Invoke(TArgs &&... args) override {
+  TResult Invoke(TArgs &&...args) override {
     return (*m_func)(std::forward<TArgs>(args)...);
   }
 
@@ -234,7 +234,7 @@ class StatelessFunctorWrapper final : public ConstexprFunctorBase<Mso::IFunctor<
  public:
   constexpr StatelessFunctorWrapper(TFunc &func) noexcept : m_func(func) {}
 
-  TResult Invoke(TArgs &&... args) noexcept override {
+  TResult Invoke(TArgs &&...args) noexcept override {
     return m_func(std::forward<TArgs>(args)...);
   }
 
@@ -248,7 +248,7 @@ class StatelessFunctorWrapperThrow final : public ConstexprFunctorBase<Mso::IFun
  public:
   constexpr StatelessFunctorWrapperThrow(TFunc &func) noexcept : m_func(func) {}
 
-  TResult Invoke(TArgs &&... args) override {
+  TResult Invoke(TArgs &&...args) override {
     return m_func(std::forward<TArgs>(args)...);
   }
 

package/Mso/functional/functorRef.h

@@ -178,7 +178,7 @@ class FunctorRef<TResult(TArgs...)>
     FunctorRefWrapper &operator=(FunctorRefWrapper const &) = delete;
     ~FunctorRefWrapper() = delete;
 
-    TResult Invoke(TArgs &&... args) const noexcept override {
+    TResult Invoke(TArgs &&...args) const noexcept override {
       // If you see OACR warning "Nothrow Func Throws" here then it means that the
       // provided lambda or function object's operator() are not marked as noexcept.
 
@@ -269,7 +269,7 @@ class FunctorRefThrow<TResult(TArgs...)> final {
     FunctorRefThrowWrapper &operator=(FunctorRefThrowWrapper const &) = delete;
     ~FunctorRefThrowWrapper() = delete;
 
-    TResult Invoke(TArgs &&... args) const override {
+    TResult Invoke(TArgs &&...args) const override {
       OACR_POSSIBLE_THROW;
       // We use const_cast to enable support for mutable lambdas
       return (*const_cast<FunctorRefThrowWrapper *>(this)->m_func)(std::forward<TArgs>(args)...);

package/Mso/future/details/executor.h

@@ -197,7 +197,7 @@ namespace Internal {
 
 struct ExecutorInvoker {
   template <class TCallback, class... TArgs>
-  auto Invoke(TCallback &&callback, TArgs &&... args) noexcept -> decltype(callback(std::forward<TArgs>(args)...)) {
+  auto Invoke(TCallback &&callback, TArgs &&...args) noexcept -> decltype(callback(std::forward<TArgs>(args)...)) {
     UNREFERENCED_OACR(this);
     static_assert(noexcept(callback(std::forward<TArgs>(args)...)), "Callback must not throw.");
     return callback(std::forward<TArgs>(args)...);
@@ -209,7 +209,7 @@ struct ThrowingExecutor : TBaseExecutor {
   using TBaseExecutor::TBaseExecutor;
 
   template <class TCallback, class... TArgs>
-  auto Invoke(TCallback &&callback, TArgs &&... args) noexcept {
+  auto Invoke(TCallback &&callback, TArgs &&...args) noexcept {
     using TResult = decltype(callback(std::forward<TArgs>(args)...));
     constexpr const bool isNoExcept = noexcept(callback(std::forward<TArgs>(args)...));
     return Mso::Futures::MaybeInvoker<TResult, isNoExcept>::Invoke(

package/Mso/future/details/futureFuncInl.h

@@ -32,14 +32,14 @@ inline Future<void> MakeCompletedFuture() noexcept {
 }
 
 template <class T, class... TArgs>
-inline Future<T> MakeCompletedFutureEmplaced(TArgs &&... args) noexcept {
+inline Future<T> MakeCompletedFutureEmplaced(TArgs &&...args) noexcept {
   Promise<T> promise;
   promise.EmplaceValue(std::forward<TArgs>(args)...);
   return promise.AsFuture();
 }
 
 template <class T, class U, class... TArgs>
-inline Future<T> MakeCompletedFutureEmplaced(std::initializer_list<U> il, TArgs &&... args) noexcept {
+inline Future<T> MakeCompletedFutureEmplaced(std::initializer_list<U> il, TArgs &&...args) noexcept {
   Promise<T> promise;
   promise.EmplaceValue(il, std::forward<TArgs>(args)...);
   return promise.AsFuture();
@@ -59,14 +59,14 @@ inline Future<void> MakeSucceededFuture() noexcept {
 }
 
 template <class T, class... TArgs>
-inline Future<T> MakeSucceededFutureEmplaced(TArgs &&... args) noexcept {
+inline Future<T> MakeSucceededFutureEmplaced(TArgs &&...args) noexcept {
   Promise<T> promise;
   promise.EmplaceValue(std::forward<TArgs>(args)...);
   return promise.AsFuture();
 }
 
 template <class T, class U, class... TArgs>
-inline Future<T> MakeSucceededFutureEmplaced(std::initializer_list<U> il, TArgs &&... args) noexcept {
+inline Future<T> MakeSucceededFutureEmplaced(std::initializer_list<U> il, TArgs &&...args) noexcept {
   Promise<T> promise;
   promise.EmplaceValue(il, std::forward<TArgs>(args)...);
   return promise.AsFuture();