diff --git a/change/react-native-windows-2019-12-06-16-26-09-cppwinrt.json b/change/react-native-windows-2019-12-06-16-26-09-cppwinrt.json
new file mode 100644
index 00000000000..489c4d40423
--- /dev/null
+++ b/change/react-native-windows-2019-12-06-16-26-09-cppwinrt.json
@@ -0,0 +1,8 @@
+{
+ "type": "prerelease",
+ "comment": "Aligning Microsoft.Windows.CppWinRT Versions",
+ "packageName": "react-native-windows",
+ "email": "jthysell@microsoft.com",
+ "commit": "92dd27dbe29042bd9b64d7fb1f2559ce05c2861d",
+ "date": "2019-12-07T00:26:09.540Z"
+}
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
index dfab7711e3a..38901561b68 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj
@@ -1,6 +1,6 @@
-
+
true
true
@@ -158,13 +158,13 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/packages.config b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/packages.config
index da3ad3ff024..790637cec08 100644
--- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/packages.config
+++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/packages.config
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/vnext/Desktop.ABITests/ActivationFactory.cpp b/vnext/Desktop.ABITests/ActivationFactory.cpp
index ceafcae5688..9c3aa5046d9 100644
--- a/vnext/Desktop.ABITests/ActivationFactory.cpp
+++ b/vnext/Desktop.ABITests/ActivationFactory.cpp
@@ -4,7 +4,7 @@
using namespace winrt;
extern "C" {
-int32_t WINRT_CALL OS_RoGetActivationFactory(void *classId, guid const &iid, void **factory) noexcept;
+int32_t __stdcall OS_RoGetActivationFactory(void *classId, guid const &iid, void **factory) noexcept;
}
#ifdef _M_IX86
@@ -17,7 +17,7 @@ bool starts_with(std::wstring_view value, std::wstring_view match) noexcept {
return 0 == value.compare(0, match.size(), match);
}
-int32_t WINRT_CALL WINRT_RoGetActivationFactory(void *classId, guid const &iid, void **factory) noexcept {
+int32_t __stdcall WINRT_RoGetActivationFactory(void *classId, guid const &iid, void **factory) noexcept {
*factory = nullptr;
std::wstring_view name{WINRT_WindowsGetStringRawBuffer(classId, nullptr)};
HMODULE library{nullptr};
diff --git a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj
index 604ead4960c..306b3a81f8c 100644
--- a/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj
+++ b/vnext/Desktop.ABITests/React.Windows.Desktop.ABITests.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -139,12 +139,12 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
+
\ No newline at end of file
diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
index 9c84abc8ccd..5a2dbe1a164 100644
--- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
+++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
index b9d8f47c541..6aeb7404fc8 100644
--- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
+++ b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj
index eee91750a38..3ba3f9d2f95 100644
--- a/vnext/Desktop/React.Windows.Desktop.vcxproj
+++ b/vnext/Desktop/React.Windows.Desktop.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -171,7 +171,7 @@
-
+
@@ -181,7 +181,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config
index d927a5e9266..2015e425775 100644
--- a/vnext/Desktop/packages.config
+++ b/vnext/Desktop/packages.config
@@ -3,6 +3,6 @@
-
+
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
index e8cf92d8703..f3ba92dfd66 100644
--- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
+++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
@@ -1,7 +1,7 @@
-
+
true
true
@@ -270,14 +270,14 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/vnext/Microsoft.ReactNative/packages.config b/vnext/Microsoft.ReactNative/packages.config
index 1e11e946323..bd147ef8642 100644
--- a/vnext/Microsoft.ReactNative/packages.config
+++ b/vnext/Microsoft.ReactNative/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/vnext/ReactUWP/Modules/DeviceInfoModule.cpp b/vnext/ReactUWP/Modules/DeviceInfoModule.cpp
index 51c339cbc62..7ce32ba8463 100644
--- a/vnext/ReactUWP/Modules/DeviceInfoModule.cpp
+++ b/vnext/ReactUWP/Modules/DeviceInfoModule.cpp
@@ -4,6 +4,7 @@
#include "pch.h"
#include
+#include
#include
#include "DeviceInfoModule.h"
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj
index c8c23995d8c..381b277ba04 100644
--- a/vnext/ReactUWP/ReactUWP.vcxproj
+++ b/vnext/ReactUWP/ReactUWP.vcxproj
@@ -1,6 +1,6 @@
-
+
Debug
@@ -367,31 +367,12 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
Designer
-
-
-
-
-
-
@@ -439,7 +420,7 @@
-
+
@@ -449,8 +430,8 @@
-
-
+
+
diff --git a/vnext/ReactUWP/ReactUWP.vcxproj.filters b/vnext/ReactUWP/ReactUWP.vcxproj.filters
index 88610026bdd..6c04e88d1b0 100644
--- a/vnext/ReactUWP/ReactUWP.vcxproj.filters
+++ b/vnext/ReactUWP/ReactUWP.vcxproj.filters
@@ -301,14 +301,18 @@
Views
-
Views
-
Utils
+
+ Views
+
+
+ Modules\Animated
+
@@ -617,15 +621,21 @@
Modules
-
Views
-
Utils
-
+
+ Utils
+
+
+ Views
+
+
+ Modules\Animated
+
@@ -637,57 +647,6 @@
Endpoint\dll
-
-
- ABI\lib
-
-
- ABI\idl
-
-
- Endpoint\dll
-
-
- Endpoint
-
-
- ABI
-
-
- ABI
-
-
- Base
-
-
- CxxReactUwp
-
-
- Executors
-
-
- Modules
-
-
- Pch
-
-
- Polyester
-
-
- Sandbox
-
-
- Threading
-
-
- Utils
-
-
- Views
-
-
-
diff --git a/vnext/ReactUWP/Views/Image/ReactImage.cpp b/vnext/ReactUWP/Views/Image/ReactImage.cpp
index 24ab84f66af..bd91a2ff37d 100644
--- a/vnext/ReactUWP/Views/Image/ReactImage.cpp
+++ b/vnext/ReactUWP/Views/Image/ReactImage.cpp
@@ -6,6 +6,7 @@
#include "ReactImage.h"
#include
+#include
#include
#include "Unicode.h"
diff --git a/vnext/ReactUWP/Views/module.g.cpp b/vnext/ReactUWP/Views/module.g.cpp
index b67512c1345..8e205bf5996 100644
--- a/vnext/ReactUWP/Views/module.g.cpp
+++ b/vnext/ReactUWP/Views/module.g.cpp
@@ -9,7 +9,7 @@
#include
-int32_t WINRT_CALL WINRT_CanUnloadNow() noexcept
+int32_t __stdcall WINRT_CanUnloadNow() noexcept
{
if (!::Microsoft::WRL::Module<::Microsoft::WRL::InProc>::GetModule().Terminate())
{
@@ -25,8 +25,7 @@ int32_t WINRT_CALL WINRT_CanUnloadNow() noexcept
return 0; // S_OK
}
-int32_t WINRT_CALL WINRT_GetActivationFactory(void* classId, void** factory) noexcept
-{
+int32_t __stdcall WINRT_GetActivationFactory(void *classId, void **factory) noexcept {
try
{
*factory = nullptr;
diff --git a/vnext/ReactUWP/packages.config b/vnext/ReactUWP/packages.config
index 277a3c9de89..405a2f363d4 100644
--- a/vnext/ReactUWP/packages.config
+++ b/vnext/ReactUWP/packages.config
@@ -2,7 +2,7 @@
-
+
\ No newline at end of file
diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
index 6f34a7bd1d9..28458fdb7c5 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
+++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj
@@ -1,6 +1,6 @@
-
+
true
true
@@ -160,15 +160,15 @@
-
+
This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-
-
+
+
\ No newline at end of file
diff --git a/vnext/local-cli/generator-windows/templates/cpp/src/packages.config b/vnext/local-cli/generator-windows/templates/cpp/src/packages.config
index 517e3053b7b..28f472d005d 100644
--- a/vnext/local-cli/generator-windows/templates/cpp/src/packages.config
+++ b/vnext/local-cli/generator-windows/templates/cpp/src/packages.config
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/vnext/makewinrt.inc b/vnext/makewinrt.inc
deleted file mode 100644
index 45ec998b4bd..00000000000
--- a/vnext/makewinrt.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-###########################################################
-#
-# Common include file for NMAKE
-# Need to keep consistent with the reactUWP.vcxproj
-#
-###########################################################
-
-LIBLET_WINRT = 1
-LIBLET_NO_PRECOMP = 1
-
-!include $(WAREHOUSEIMPORTDIR)\libletmake\x-none\nmake\make.inc
-
-INCLUDES = $(INCLUDES); \
- $(ATLINCDIR); \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\Folly; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactCommon\Yoga; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\stubs; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\shared; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\include; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\include\ReactWindowsCore; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\ReactWindowsCore; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\ReactUWP; \
- $(OPENSOURCE_REACTNATIVE)\OfficeISS\ReactWindows\ReactUWP\Pch; \
- $(PKGJAVASCRIPTCORE_TEMP)\build\native\include; \
- $(PKGBOOST)\lib\native\include; \
- $(PKGMICROSOFT_CHAKRACORE_VC140)\build\native\include; \
- $(OTOOLSINCROOT)\cppwinrt; \
-
-!LISTFILES -recursive JAVASCRIPTCORE_TEMP_HEADERS = $(PKGJAVASCRIPTCORE_TEMP) *.h
-!LISTFILES -recursive BOOST_HEADERS = $(PKGBOOST) *
-
-HEADERS = $(HEADERS) \
- $(JAVASCRIPTCORE_TEMP_HEADERS) \
- $(BOOST_HEADERS) \
-
-CPP_ENABLE_STD_17=1
-CPP_ENABLE_AWAIT=1
-
-C_DEFINES = $(C_DEFINES) -D REACTWINDOWS_BUILD
-C_DEFINES = $(C_DEFINES) -D RN_PLATFORM=windows
-C_DEFINES = $(C_DEFINES) -D USE_EDGEMODE_JSRT
-C_DEFINES = $(C_DEFINES) -D NOMINMAX
-C_DEFINES = $(C_DEFINES) -D FOLLY_NO_CONFIG
-C_DEFINES = $(C_DEFINES) -D RN_EXPORT=
-C_DEFINES = $(C_DEFINES) -D JSI_EXPORT=
-C_DEFINES = $(C_DEFINES) -D WIN32=0
-C_DEFINES = $(C_DEFINES) -D WINRT=1
-C_DEFINES = $(C_DEFINES) -D _HAS_AUTO_PTR_ETC
-
-
-C_FLAGS = $(C_FLAGS) -wd4068 -wd4189 -wd4100 -wd4239 -wd4458 -wd4244 -wd4456
-C_FLAGS = $(C_FLAGS) /bigobj