diff --git a/change/react-native-windows-2020-03-03-21-47-48-util.includes.cleanup.json b/change/react-native-windows-2020-03-03-21-47-48-util.includes.cleanup.json new file mode 100644 index 00000000000..be3b9b23da7 --- /dev/null +++ b/change/react-native-windows-2020-03-03-21-47-48-util.includes.cleanup.json @@ -0,0 +1,9 @@ +{ + "type": "prerelease", + "comment": "Moved header files from ReactUWP\\Utils to include\\ReactUWP\\Utils. Updated project references.", + "packageName": "react-native-windows", + "email": "lamdoan@microsoft.com", + "commit": "2067c346e36d3e32032563fece5383356345010b", + "dependentChangeType": "patch", + "date": "2020-03-04T05:47:48.464Z" +} \ No newline at end of file diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 032c1aa3177..2ea2d757478 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -143,8 +143,17 @@ - + + + + + + + + + + @@ -160,12 +169,8 @@ - - - - @@ -189,7 +194,6 @@ - @@ -216,9 +220,6 @@ - - - diff --git a/vnext/ReactUWP/ReactUWP.vcxproj.filters b/vnext/ReactUWP/ReactUWP.vcxproj.filters index 0d22c31026c..e5a1873f1cd 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj.filters +++ b/vnext/ReactUWP/ReactUWP.vcxproj.filters @@ -327,9 +327,6 @@ Base - - Utils - Modules @@ -348,9 +345,6 @@ Threading - - Utils - Modules @@ -516,9 +510,6 @@ Views - - Utils - Views @@ -531,12 +522,6 @@ Views - - Utils - - - Utils - Views @@ -573,18 +558,9 @@ Modules - - Utils - Views - - Utils - - - Utils - Modules\Animated @@ -615,9 +591,6 @@ Threading - - Utils - Views @@ -627,9 +600,6 @@ Views - - Utils - TurboModule @@ -643,6 +613,39 @@ Modules\Animated + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + + + Utils + diff --git a/vnext/ReactUWP/Utils/Helpers.cpp b/vnext/ReactUWP/Utils/Helpers.cpp index fa24044b2b6..7877ac62f2a 100644 --- a/vnext/ReactUWP/Utils/Helpers.cpp +++ b/vnext/ReactUWP/Utils/Helpers.cpp @@ -4,9 +4,9 @@ #include "pch.h" #include +#include #include #include -#include "Helpers.h" namespace winrt { using namespace Windows::UI::Xaml::Controls::Primitives; diff --git a/vnext/ReactUWP/Utils/LocalBundleReader.cpp b/vnext/ReactUWP/Utils/LocalBundleReader.cpp index 0afa5a82c53..305d80bad9c 100644 --- a/vnext/ReactUWP/Utils/LocalBundleReader.cpp +++ b/vnext/ReactUWP/Utils/LocalBundleReader.cpp @@ -3,9 +3,9 @@ #include "pch.h" +#include #include #include -#include "LocalBundleReader.h" #include "Unicode.h" #if _MSC_VER <= 1913 diff --git a/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp b/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp index 825e0fc43b3..8f85d360f2f 100644 --- a/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp +++ b/vnext/ReactUWP/Utils/ResourceBrushUtils.cpp @@ -3,8 +3,8 @@ #include "pch.h" -#include "ResourceBrushUtils.h" -#include "StandardControlResourceKeyNames.h" +#include +#include #include diff --git a/vnext/ReactUWP/Utils/UwpPreparedScriptStore.cpp b/vnext/ReactUWP/Utils/UwpPreparedScriptStore.cpp index 6d66a5f14b9..cb80c255653 100644 --- a/vnext/ReactUWP/Utils/UwpPreparedScriptStore.cpp +++ b/vnext/ReactUWP/Utils/UwpPreparedScriptStore.cpp @@ -1,10 +1,10 @@ #include "pch.h" +#include +#include #include #include #include "Unicode.h" -#include "Utils/UwpPreparedScriptStore.h" -#include "Utils/UwpScriptStore.h" #include "jsi/jsi.h" #if _MSC_VER <= 1913 diff --git a/vnext/ReactUWP/Utils/UwpScriptStore.cpp b/vnext/ReactUWP/Utils/UwpScriptStore.cpp index 10fd2c160f4..8cb76da61f9 100644 --- a/vnext/ReactUWP/Utils/UwpScriptStore.cpp +++ b/vnext/ReactUWP/Utils/UwpScriptStore.cpp @@ -1,11 +1,11 @@ #include "pch.h" +#include #include #include #include #include #include "Unicode.h" -#include "Utils/UwpScriptStore.h" namespace winrt { using namespace winrt::Windows::Foundation; diff --git a/vnext/include/Include.vcxitems b/vnext/include/Include.vcxitems index 2c7a013b851..194a9dbe378 100644 --- a/vnext/include/Include.vcxitems +++ b/vnext/include/Include.vcxitems @@ -21,6 +21,15 @@ + + + + + + + + + diff --git a/vnext/include/Include.vcxitems.filters b/vnext/include/Include.vcxitems.filters index a45c41b1130..9e5b13ff3fd 100644 --- a/vnext/include/Include.vcxitems.filters +++ b/vnext/include/Include.vcxitems.filters @@ -59,6 +59,33 @@ ReactUWP + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + + + ReactUWP\Utils + diff --git a/vnext/ReactUWP/Utils/CppWinrtLessExceptions.h b/vnext/include/ReactUWP/Utils/CppWinrtLessExceptions.h similarity index 100% rename from vnext/ReactUWP/Utils/CppWinrtLessExceptions.h rename to vnext/include/ReactUWP/Utils/CppWinrtLessExceptions.h diff --git a/vnext/ReactUWP/Utils/Helpers.h b/vnext/include/ReactUWP/Utils/Helpers.h similarity index 100% rename from vnext/ReactUWP/Utils/Helpers.h rename to vnext/include/ReactUWP/Utils/Helpers.h diff --git a/vnext/ReactUWP/Utils/LocalBundleReader.h b/vnext/include/ReactUWP/Utils/LocalBundleReader.h similarity index 100% rename from vnext/ReactUWP/Utils/LocalBundleReader.h rename to vnext/include/ReactUWP/Utils/LocalBundleReader.h diff --git a/vnext/ReactUWP/Utils/PropertyHandlerUtils.h b/vnext/include/ReactUWP/Utils/PropertyHandlerUtils.h similarity index 100% rename from vnext/ReactUWP/Utils/PropertyHandlerUtils.h rename to vnext/include/ReactUWP/Utils/PropertyHandlerUtils.h diff --git a/vnext/ReactUWP/Utils/PropertyUtils.h b/vnext/include/ReactUWP/Utils/PropertyUtils.h similarity index 100% rename from vnext/ReactUWP/Utils/PropertyUtils.h rename to vnext/include/ReactUWP/Utils/PropertyUtils.h diff --git a/vnext/ReactUWP/Utils/ResourceBrushUtils.h b/vnext/include/ReactUWP/Utils/ResourceBrushUtils.h similarity index 100% rename from vnext/ReactUWP/Utils/ResourceBrushUtils.h rename to vnext/include/ReactUWP/Utils/ResourceBrushUtils.h diff --git a/vnext/ReactUWP/Utils/StandardControlResourceKeyNames.h b/vnext/include/ReactUWP/Utils/StandardControlResourceKeyNames.h similarity index 100% rename from vnext/ReactUWP/Utils/StandardControlResourceKeyNames.h rename to vnext/include/ReactUWP/Utils/StandardControlResourceKeyNames.h diff --git a/vnext/ReactUWP/Utils/UwpPreparedScriptStore.h b/vnext/include/ReactUWP/Utils/UwpPreparedScriptStore.h similarity index 100% rename from vnext/ReactUWP/Utils/UwpPreparedScriptStore.h rename to vnext/include/ReactUWP/Utils/UwpPreparedScriptStore.h diff --git a/vnext/ReactUWP/Utils/UwpScriptStore.h b/vnext/include/ReactUWP/Utils/UwpScriptStore.h similarity index 100% rename from vnext/ReactUWP/Utils/UwpScriptStore.h rename to vnext/include/ReactUWP/Utils/UwpScriptStore.h