From 6334eaf1a46151db2297eca04ab819439f195afc Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 17:30:21 -0700 Subject: [PATCH 1/4] Remove boost.datetime from Desktop DLL. --- vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 2 -- vnext/Desktop.DLL/packages.config | 3 +-- .../React.Windows.Desktop.IntegrationTests.vcxproj | 4 ++-- .../Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj | 4 ++-- vnext/Desktop/React.Windows.Desktop.vcxproj | 2 -- vnext/Desktop/packages.config | 3 +-- vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj | 4 ++-- vnext/ReactUWP/ReactUWP.vcxproj | 4 ++-- 8 files changed, 10 insertions(+), 16 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index c4846fb478c..bd72ace7dbf 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -135,7 +135,6 @@ - @@ -145,7 +144,6 @@ - diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 6afde56a7e1..c714a510d99 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -1,8 +1,7 @@  - - + \ No newline at end of file diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 647c57c068c..4c335591f61 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -107,7 +107,7 @@ - + @@ -117,7 +117,7 @@ - + diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index 20ba94b8aef..bbd1e9cb4f3 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ 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}. - + diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index dacef82d234..613d773c59e 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -169,7 +169,6 @@ - @@ -180,7 +179,6 @@ - diff --git a/vnext/Desktop/packages.config b/vnext/Desktop/packages.config index a151cd7c4da..f037ec209f6 100644 --- a/vnext/Desktop/packages.config +++ b/vnext/Desktop/packages.config @@ -1,9 +1,8 @@  - - + \ No newline at end of file diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 1ecfb473246..f0e3acf8562 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -121,7 +121,7 @@ - + @@ -132,7 +132,7 @@ - + diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index f42a122af26..5769de6ab56 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ 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}. - + From 015bc84e318a525c1e9dfc6fda4a158cef020742 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 17:49:14 -0700 Subject: [PATCH 2/4] Define BOOST_ALL_NO_LIB=1 --- .../Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 8 +++++++- vnext/PropertySheets/React.Cpp.props | 11 ++++++++++- vnext/ReactUWP/ReactUWP.vcxproj | 15 +++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index bd72ace7dbf..ad984779941 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -128,7 +128,13 @@ - RNW_PKG_VERSION_STR=$(RNW_PKG_VERSION_STR);RNW_PKG_VERSION=$(RNW_PKG_VERSION);_UNICODE;UNICODE;%(PreprocessorDefinitions) + + RNW_PKG_VERSION_STR=$(RNW_PKG_VERSION_STR); + RNW_PKG_VERSION=$(RNW_PKG_VERSION); + _UNICODE; + UNICODE; + %(PreprocessorDefinitions) + diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index e1908f291f4..6b65d5d0305 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -39,10 +39,19 @@ - WIN32_LEAN_AND_MEAN;_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS;BOOST_SYSTEM_SOURCE;BOOST_ERROR_CODE_HEADER_ONLY;%(PreprocessorDefinitions) + + BOOST_ALL_NO_LIB=1; + WIN32_LEAN_AND_MEAN; + _SILENCE_ALL_CXX17_DEPRECATION_WARNINGS; + BOOST_SYSTEM_SOURCE; + BOOST_ERROR_CODE_HEADER_ONLY; + %(PreprocessorDefinitions) + stdcpp17 ProgramDatabase Guard diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 5769de6ab56..8b3d7c48791 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -79,10 +79,21 @@ ENABLE_NATIVE_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions) ENABLE_JS_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions) ENABLE_TRACE_POSTPROCESSING;%(PreprocessorDefinitions) - OLD_CPPWINRT;REACTWINDOWS_BUILD;RN_PLATFORM=windows;NOMINMAX;FOLLY_NO_CONFIG;RN_EXPORT=;JSI_EXPORT=;WIN32=0;WINRT=1;_HAS_AUTO_PTR_ETC;%(PreprocessorDefinitions) + + OLD_CPPWINRT; + REACTWINDOWS_BUILD; + RN_PLATFORM=windows; + NOMINMAX; + FOLLY_NO_CONFIG; + RN_EXPORT=; + JSI_EXPORT=; + WIN32=0; + WINRT=1; + _HAS_AUTO_PTR_ETC; + %(PreprocessorDefinitions) + $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)Pch;$(ReactNativeWindowsDir)ReactUWP\GeneratedWinmdHeader;$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)include\ReactUWP;$(YogaDir);$(ReactNativeDir)\ReactCommon;$(ReactNativeDir)\ReactCommon\jsi;$(ReactNativeWindowsDir)include;$(ReactNativeWindowsDir)stubs;$(ReactNativeWindowsDir)Shared;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(FollyDir);%(AdditionalIncludeDirectories) $(ChakraCoreInclude);$(ChakraCoreDebugInclude);%(AdditionalIncludeDirectories) - stdcpp17 /await %(AdditionalOptions) false From bedf8c8b9df6fb749a56bbb03968e7f92794bab7 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 18:02:46 -0700 Subject: [PATCH 3/4] Removed boost_date_time from remaining projects. --- .../React.Windows.Desktop.IntegrationTests.vcxproj | 2 -- vnext/Desktop.IntegrationTests/packages.config | 3 +-- .../Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj | 2 -- vnext/Desktop.Test.DLL/packages.config | 1 - .../React.Windows.Desktop.UnitTests.vcxproj | 2 -- vnext/Desktop.UnitTests/packages.config | 3 +-- vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj | 4 ---- vnext/JSI.Desktop.UnitTests/packages.config | 1 - vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj | 2 -- vnext/ReactUWP/ReactUWP.vcxproj | 2 -- vnext/ReactUWP/ReactUWP.vcxproj.filters | 5 +++++ vnext/ReactUWP/packages.config | 3 +-- vnext/ReactWindows-Universal.sln | 4 ++-- vnext/V8Inspector/V8Inspector.vcxproj | 2 -- 14 files changed, 10 insertions(+), 26 deletions(-) diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 4c335591f61..8fa313bbe37 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -107,7 +107,6 @@ - @@ -117,7 +116,6 @@ - diff --git a/vnext/Desktop.IntegrationTests/packages.config b/vnext/Desktop.IntegrationTests/packages.config index 6afde56a7e1..c714a510d99 100644 --- a/vnext/Desktop.IntegrationTests/packages.config +++ b/vnext/Desktop.IntegrationTests/packages.config @@ -1,8 +1,7 @@  - - + \ No newline at end of file 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 59ab41cb035..d9b70319d0d 100644 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj +++ b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj @@ -78,7 +78,6 @@ - @@ -86,7 +85,6 @@ 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}. - diff --git a/vnext/Desktop.Test.DLL/packages.config b/vnext/Desktop.Test.DLL/packages.config index 3bd16a28b1a..50b94464190 100644 --- a/vnext/Desktop.Test.DLL/packages.config +++ b/vnext/Desktop.Test.DLL/packages.config @@ -1,6 +1,5 @@  - \ No newline at end of file diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index bbd1e9cb4f3..c6225b85bc5 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -89,7 +89,6 @@ - @@ -98,7 +97,6 @@ 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}. - diff --git a/vnext/Desktop.UnitTests/packages.config b/vnext/Desktop.UnitTests/packages.config index 771627d76cf..7563964f06a 100644 --- a/vnext/Desktop.UnitTests/packages.config +++ b/vnext/Desktop.UnitTests/packages.config @@ -1,7 +1,6 @@  - - + \ No newline at end of file diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index f0e3acf8562..5b6a485910f 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -49,12 +49,10 @@ string literals. It prevents code like wchar_t* str = L"hello"; from compiling. --> - ENABLE_TRACING;%(PreprocessorDefinitions) ENABLE_NATIVE_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions) ENABLE_JS_SYSTRACE;WITH_FBSYSTRACE;%(PreprocessorDefinitions) ENABLE_TRACE_POSTPROCESSING;%(PreprocessorDefinitions) - %(AdditionalOptions) /Zc:strictStrings @@ -121,7 +119,6 @@ - @@ -132,7 +129,6 @@ - diff --git a/vnext/JSI.Desktop.UnitTests/packages.config b/vnext/JSI.Desktop.UnitTests/packages.config index 0ce940a1b2a..3f2c4553e14 100644 --- a/vnext/JSI.Desktop.UnitTests/packages.config +++ b/vnext/JSI.Desktop.UnitTests/packages.config @@ -1,7 +1,6 @@  - diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 85babe9f557..bcca4c00fd7 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -270,7 +270,6 @@ - @@ -278,7 +277,6 @@ 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}. - diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 8b3d7c48791..4e10c83302e 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -444,7 +444,6 @@ - @@ -453,7 +452,6 @@ 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}. - diff --git a/vnext/ReactUWP/ReactUWP.vcxproj.filters b/vnext/ReactUWP/ReactUWP.vcxproj.filters index 9385bea9433..7be5ca8dcef 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj.filters +++ b/vnext/ReactUWP/ReactUWP.vcxproj.filters @@ -301,6 +301,8 @@ Views + + @@ -642,6 +644,8 @@ Modules + + @@ -781,6 +785,7 @@ ABI\idl + diff --git a/vnext/ReactUWP/packages.config b/vnext/ReactUWP/packages.config index 1d568dbd195..9b6daf17568 100644 --- a/vnext/ReactUWP/packages.config +++ b/vnext/ReactUWP/packages.config @@ -1,7 +1,6 @@  - - + \ No newline at end of file diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index a7c45b36cf0..7a982c30a4a 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -100,12 +100,12 @@ Global Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 - Release|ARM = Release|ARM + Debug|ARM = Debug|ARM Release|x64 = Release|x64 Release|x86 = Release|x86 + Release|ARM = Release|ARM EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj index e921698ea11..256a8f1cf74 100644 --- a/vnext/V8Inspector/V8Inspector.vcxproj +++ b/vnext/V8Inspector/V8Inspector.vcxproj @@ -106,13 +106,11 @@ - 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 From 4f6ae29f497b466870ddc17f260029a58d1c7103 Mon Sep 17 00:00:00 2001 From: "Julio C. Rocha" Date: Tue, 29 Oct 2019 18:40:46 -0700 Subject: [PATCH 4/4] Change files --- ...-windows-2019-10-29-18-40-46-boost-datetime-nolib.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2019-10-29-18-40-46-boost-datetime-nolib.json diff --git a/change/react-native-windows-2019-10-29-18-40-46-boost-datetime-nolib.json b/change/react-native-windows-2019-10-29-18-40-46-boost-datetime-nolib.json new file mode 100644 index 00000000000..5faaf4305d9 --- /dev/null +++ b/change/react-native-windows-2019-10-29-18-40-46-boost-datetime-nolib.json @@ -0,0 +1,8 @@ +{ + "type": "none", + "comment": "Removed boost_date_time from remaining projects.", + "packageName": "react-native-windows", + "email": "julio@rochsquadron.net", + "commit": "bedf8c8b9df6fb749a56bbb03968e7f92794bab7", + "date": "2019-10-30T01:40:46.577Z" +} \ No newline at end of file