diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml
index d49580170bc..bb4dace8f42 100644
--- 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
new file mode 100644
index 00000000000..66994835d81
--- /dev/null
+++ 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"
+}
\ No newline at end of file
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
index 2e16904310c..b0c429ea36d 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
+++ b/packages/E2ETest/windows/ReactUWPTestApp/App.xaml
@@ -1,9 +1,7 @@
-
-
-
-
+
diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
index 2804dedd340..1107264463e 100644
--- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
+++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj
@@ -12,7 +12,7 @@
en-US
UAP
10.0.18362.0
- 10.0.15063.0
+ 10.0.14393.0
14
512
{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
@@ -134,9 +134,6 @@
6.2.8
-
- 2.2.190917002
-
@@ -167,4 +164,4 @@
-->
-
\ No newline at end of file
+
diff --git a/vnext/ReactUWP/Pch/pch.h b/vnext/ReactUWP/Pch/pch.h
index e1547e7c2d8..82f27ccd221 100644
--- a/vnext/ReactUWP/Pch/pch.h
+++ b/vnext/ReactUWP/Pch/pch.h
@@ -24,11 +24,3 @@
#include
#include
#include
-
-#include
-#include
-#include
-#include
-#include
-
-#include
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj
index ef80239a06c..0e1dec6c835 100644
--- a/vnext/ReactUWP/ReactUWP.vcxproj
+++ b/vnext/ReactUWP/ReactUWP.vcxproj
@@ -31,8 +31,7 @@
{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}
React.UWP
DynamicLibrary
- react.uwp
- 2
+ React.UWP
true
Windows Store
10.0
@@ -231,6 +230,8 @@
+
+
@@ -424,10 +425,10 @@
+
-
@@ -440,7 +441,6 @@
-
@@ -451,16 +451,6 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj.filters b/vnext/ReactUWP/ReactUWP.vcxproj.filters
index 88610026bdd..7bcd94b8270 100644
--- a/vnext/ReactUWP/ReactUWP.vcxproj.filters
+++ b/vnext/ReactUWP/ReactUWP.vcxproj.filters
@@ -566,6 +566,12 @@
Modules
+
+ Views\Image
+
+
+ Views\Image
+
Utils
@@ -759,13 +765,13 @@
Views\cppwinrt
-
+
Views\cppwinrt
-
+
Views\cppwinrt
-
+
Views\cppwinrt
diff --git a/vnext/ReactUWP/Views/DynamicAutomationPeer.h b/vnext/ReactUWP/Views/DynamicAutomationPeer.h
index 58724cb3fed..9b1fc405d6b 100644
--- 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
index 105046bd45b..3a2a2a3d427 100644
--- a/vnext/ReactUWP/Views/DynamicAutomationProperties.h
+++ b/vnext/ReactUWP/Views/DynamicAutomationProperties.h
@@ -5,7 +5,7 @@
#include
-#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
index e731cea9b98..580d2f3d978 100644
--- a/vnext/ReactUWP/Views/ViewControl.h
+++ b/vnext/ReactUWP/Views/ViewControl.h
@@ -8,7 +8,7 @@
#include
#include
-#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
index a21ae77aa80..13583c97a72 100644
--- a/vnext/ReactUWP/Views/ViewPanel.h
+++ b/vnext/ReactUWP/Views/ViewPanel.h
@@ -8,7 +8,7 @@
#include
#include
-#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
index 071dbe938d8..48763d1a1c5 100644
--- 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
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());
- return 0;
- }
-
+#ifdef _WRL_MODULE_H_
return ::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().GetActivationFactory(static_cast(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
index 16b636ed3ad..0b218a1f8d6 100644
--- a/vnext/ReactUWP/packages.config
+++ b/vnext/ReactUWP/packages.config
@@ -1,7 +1,6 @@
-