microsoft · Nov 25, 2019 · Nov 25, 2019 · Nov 25, 2019
diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml
@@ -90,12 +90,6 @@ jobs:
           restoreSolution: packages/E2ETest/windows/ReactUWPTestApp.sln
           verbosityRestore: Detailed # Options: quiet, normal, detailed
 
-      - task: PowerShell@2
-        displayName: Install MUX framework package
-        inputs:
-          targetType: "inline"
-          script:  Add-AppPackage -path $(Build.SourcesDirectory)/packages/E2ETest/windows/packages/Microsoft.UI.Xaml.2.2.190917002/tools/AppX/${{ parameters.BuildPlatform }}/Release/Microsoft.UI.Xaml.2.2.appx
-
       - task: CmdLine@2
         displayName: Create bundle
         inputs:

diff --git a/change/react-native-windows-2019-11-25-12-26-47-revert-3622-winui.json b/change/react-native-windows-2019-11-25-12-26-47-revert-3622-winui.json
@@ -0,0 +1,8 @@
+{
+  "type": "prerelease",
+  "comment": "Revert \"Add Winui 2.2 framework package (#3622)\"",
+  "packageName": "react-native-windows",
+  "email": "licanhua@live.com",
+  "commit": "05b4247de1309cf162f4097ccd501db970b46cd1",
+  "date": "2019-11-25T20:26:47.081Z"
+}
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
@@ -1,9 +1,7 @@
-<Application
+<Application
     x:Class="ReactUWPTestApp.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:ReactUWPTestApp">
-    <Application.Resources>
-        <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-    </Application.Resources>
+
 </Application>
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -12,7 +12,7 @@
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18362.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
+    <TargetPlatformMinVersion>10.0.14393.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -134,9 +134,6 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <Version>6.2.8</Version>
     </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.2.190917002</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(ReactNativeWindowsDir)\ReactUWP\ReactUWP.vcxproj">
@@ -167,4 +164,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/vnext/ReactUWP/Pch/pch.h b/vnext/ReactUWP/Pch/pch.h
@@ -24,11 +24,3 @@
 #include <winrt/Windows.UI.Xaml.Controls.h>
 #include <winrt/Windows.UI.Xaml.Media.h>
 #include <winrt/Windows.UI.Xaml.h>
-
-#include <winrt/Microsoft.UI.Xaml.Automation.Peers.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.Primitives.h>
-#include <winrt/Microsoft.UI.Xaml.Controls.h>
-#include <winrt/Microsoft.UI.Xaml.Media.h>
-#include <winrt/Microsoft.UI.Xaml.XamlTypeInfo.h>
-
-#include <XamlMetaDataProvider.h>
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj
@@ -31,8 +31,7 @@
     <ProjectGuid>{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}</ProjectGuid>
     <TargetName>React.UWP</TargetName>
     <Keyword>DynamicLibrary</Keyword>
-    <RootNamespace>react.uwp</RootNamespace>
-    <CppWinRTNamespaceMergeDepth>2</CppWinRTNamespaceMergeDepth>
+    <RootNamespace>React.UWP</RootNamespace>
     <AppContainerApplication>true</AppContainerApplication>
     <ApplicationType>Windows Store</ApplicationType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
@@ -231,6 +230,8 @@
     <ClInclude Include="Views\DatePickerViewManager.h" />
     <ClInclude Include="Views\ExpressionAnimationStore.h" />
     <ClInclude Include="Views\FlyoutViewManager.h" />
+    <ClInclude Include="Views\Image\BorderEffect.h" />
+    <ClInclude Include="Views\Image\Microsoft.UI.Composition.Effects_Impl.h" />
     <ClInclude Include="Views\Image\ImageViewManager.h" />
     <ClInclude Include="Views\Image\ReactImage.h" />
     <ClInclude Include="Views\Image\ReactImageBrush.h" />
@@ -424,10 +425,10 @@
       <AdditionalOptions>
       </AdditionalOptions>
     </Midl>
+    <Midl Include="Views/cppwinrt/BorderEffect.idl" />
     <Midl Include="Views/cppwinrt/AccessibilityAction.idl" />
     <Midl Include="Views/cppwinrt/DynamicAutomationPeer.idl" />
     <Midl Include="Views/cppwinrt/ViewPanel.idl" />
-    <Midl Include="Views\cppwinrt\BorderEffect.idl" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Version.rc">
@@ -440,7 +441,6 @@
     <Import Project="$(SolutionDir)packages\ReactNative.Hermes.Windows.0.1.3\build\native\ReactNative.Hermes.Windows.targets" Condition="Exists('$(SolutionDir)packages\ReactNative.Hermes.Windows.0.1.3\build\native\ReactNative.Hermes.Windows.targets') AND '$(OSS_RN)' != 'true' AND '$(USE_HERMES)' == 'true'" />
     <Import Project="$(SolutionDir)packages\ReactNative.V8JSI.Windows.0.1.4\build\native\ReactNative.V8JSI.Windows.targets" Condition="Exists('$(SolutionDir)packages\ReactNative.V8JSI.Windows.0.1.4\build\native\ReactNative.V8JSI.Windows.targets') AND '$(OSS_RN)' != 'true' AND '$(USE_V8)' == 'true'" />
     <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(SolutionDir)packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -451,16 +451,6 @@
     <Error Condition="!Exists('$(SolutionDir)packages\ReactNative.V8JSI.Windows.0.1.4\build\native\ReactNative.V8JSI.Windows.targets') AND '$(OSS_RN)' != 'true' AND '$(USE_V8)' == 'true'" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactNative.V8JSI.Windows.0.1.4\build\native\ReactNative.V8JSI.Windows.targets'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190530.8\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.UI.Xaml.2.2.190917002\build\native\Microsoft.UI.Xaml.targets'))" />
-  </Target>
-  <Target Name="_WinUIWorkaround" AfterTargets="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <!-- This is a workaround before https://github.com/microsoft/microsoft-ui-xaml/issues/1512 is resolved and the new WinUI framework package is released -->
-    <ItemGroup>
-      <XamlCompactPageToBeRemoved Include="@(Page)" Condition="'%(Page.TargetPath)' == 'Microsoft.UI.Xaml\DensityStyles\Compact.xbf'" />
-    </ItemGroup>
-    <ItemGroup Condition="'@(XamlCompactPageToBeRemoved)' != ''">
-      <Page Remove="@(XamlCompactPageToBeRemoved)" />
-    </ItemGroup>
   </Target>
   <Target Name="AfterCppClean">
     <RemoveDir Directories="$(IdlHeaderDirectory)" ContinueOnError="true" />

diff --git a/vnext/ReactUWP/ReactUWP.vcxproj.filters b/vnext/ReactUWP/ReactUWP.vcxproj.filters
@@ -566,6 +566,12 @@
     <ClInclude Include="Modules\ImageViewManagerModule.h">
       <Filter>Modules</Filter>
     </ClInclude>
+    <ClInclude Include="Views\Image\Microsoft.UI.Composition.Effects_Impl.h">
+      <Filter>Views\Image</Filter>
+    </ClInclude>
+    <ClInclude Include="Views\Image\BorderEffect.h">
+      <Filter>Views\Image</Filter>
+    </ClInclude>
     <ClInclude Include="Utils\Helpers.h">
       <Filter>Utils</Filter>
     </ClInclude>
@@ -759,13 +765,13 @@
     <Midl Include="Views/cppwinrt/ViewPanel.idl">
       <Filter>Views\cppwinrt</Filter>
     </Midl>
-    <Midl Include="Views/cppwinrt/AccessibilityAction.idl">
+    <Midl Include="Views/cppwinrt/BorderEffect.idl">
       <Filter>Views\cppwinrt</Filter>
     </Midl>
-    <Midl Include="Views/cppwinrt/DynamicAutomationPeer.idl">
+    <Midl Include="Views/cppwinrt/AccessibilityAction.idl">
       <Filter>Views\cppwinrt</Filter>
     </Midl>
-    <Midl Include="Views\cppwinrt\BorderEffect.idl">
+    <Midl Include="Views/cppwinrt/DynamicAutomationPeer.idl">
       <Filter>Views\cppwinrt</Filter>
     </Midl>
   </ItemGroup>

diff --git a/vnext/ReactUWP/Views/DynamicAutomationPeer.h b/vnext/ReactUWP/Views/DynamicAutomationPeer.h
@@ -12,7 +12,7 @@
 
 #include "DynamicAutomationProperties.h"
 
-#include "DynamicAutomationPeer.g.h"
+#include "react.uwp.DynamicAutomationPeer.g.h"
 namespace winrt::react::uwp::implementation {
 
 //

diff --git a/vnext/ReactUWP/Views/DynamicAutomationProperties.h b/vnext/ReactUWP/Views/DynamicAutomationProperties.h
@@ -5,7 +5,7 @@
 
 #include <winrt/Windows.UI.Xaml.h>
 
-#include "DynamicAutomationProperties.g.h"
+#include "react.uwp.DynamicAutomationProperties.g.h"
 
 namespace winrt::react::uwp::implementation {
 

diff --git a/vnext/ReactUWP/Views/ViewControl.h b/vnext/ReactUWP/Views/ViewControl.h
@@ -8,7 +8,7 @@
 #include <winrt/Windows.UI.Xaml.Automation.Peers.h>
 #include <winrt/Windows.UI.Xaml.Automation.h>
 
-#include "ViewControl.g.h"
+#include "react.uwp.ViewControl.g.h"
 namespace winrt::react::uwp::implementation {
 
 //

diff --git a/vnext/ReactUWP/Views/ViewPanel.h b/vnext/ReactUWP/Views/ViewPanel.h
@@ -8,7 +8,7 @@
 #include <winrt/Windows.UI.Xaml.Media.h>
 #include <winrt/Windows.UI.Xaml.h>
 
-#include "ViewPanel.g.h"
+#include "react.uwp.ViewPanel.g.h"
 
 namespace winrt::react::uwp::implementation {
 

diff --git a/vnext/ReactUWP/Views/module.g.cpp b/vnext/ReactUWP/Views/module.g.cpp
@@ -1,19 +1,19 @@
+// WARNING: Please don't edit this file. It was generated by C++/WinRT v1.0.190111.3
 
 #include "pch.h"
 #include "DynamicAutomationPeer.h"
 #include "DynamicAutomationProperties.h"
 #include "ViewControl.h"
 #include "ViewPanel.h"
-#include "XamlMetaDataProvider.h"
-
-#include <wrl\module.h>
 
 int32_t WINRT_CALL WINRT_CanUnloadNow() noexcept
 {
+#ifdef _WRL_MODULE_H_
     if (!::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().Terminate())
     {
         return 1; // S_FALSE
     }
+#endif
 
     if (winrt::get_module_lock())
     {
@@ -62,13 +62,11 @@ int32_t WINRT_CALL WINRT_GetActivationFactory(void* classId, void** factory) noe
             return 0;
         }
 
-        if (requal(name, L"react.uwp.XamlMetaDataProvider"))
-        {
-            *factory = winrt::detach_abi(winrt::make<winrt::react::uwp::factory_implementation::XamlMetaDataProvider>());
-          return 0;
-        }
-
+#ifdef _WRL_MODULE_H_
         return ::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().GetActivationFactory(static_cast<HSTRING>(classId), reinterpret_cast<::IActivationFactory**>(factory));
+#else
+        return winrt::hresult_class_not_available(name).to_abi();
+#endif
     }
     catch (...) { return winrt::to_hresult(); }
 }
diff --git a/vnext/ReactUWP/packages.config b/vnext/ReactUWP/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="boost" version="1.68.0.0" targetFramework="native" />
-  <package id="Microsoft.UI.Xaml" version="2.2.190917002" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.190530.8" targetFramework="native" />
   <package id="ReactNative.Hermes.Windows" version="0.1.3" targetFramework="native" Condition="'$(OSS_RN)' != 'true' AND '$(USE_HERMES)' == 'true'" />
   <package id="ReactNative.V8JSI.Windows" version="0.1.4" targetFramework="native" Condition="'$(OSS_RN)' != 'true' AND '$(USE_V8)' == 'true'" />