Skip to content

[Cherry-pick] Moved header files from ReactUWP\\Utils to include\\ReactUWP\\Utils. Updated project references. #4233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NickGerleman merged 2 commits into from
Mar 4, 2020
Merged

[Cherry-pick] Moved header files from ReactUWP\\Utils to include\\ReactUWP\\Utils. Updated project references. #4233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab5dd5e
Moved header files from ReactUWP\Utils to include\ReactUWP\Utils (#4230)
lamxdoan Mar 4, 2020
76532c2
reapply changes to ReactUWP.vcxproj
lamxdoan Mar 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions change/react-native-windows-2020-03-03-21-47-48-util.includes.cleanup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
19 changes: 10 additions & 9 deletions vnext/ReactUWP/ReactUWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,17 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="..\include\ReactUWP\InstanceFactory.h" />
<ClInclude Include="..\include\ReactUWP\Utils\ValueUtils.h" />
<ClInclude Include="..\include\ReactUWP\Utils\AccessibilityUtils.h" />
<ClInclude Include="..\include\ReactUWP\Utils\CppWinrtLessExceptions.h" />
<ClInclude Include="..\include\ReactUWP\Utils\Helpers.h" />
<ClInclude Include="..\include\ReactUWP\Utils\LocalBundleReader.h" />
<ClInclude Include="..\include\ReactUWP\Utils\PropertyHandlerUtils.h" />
<ClInclude Include="..\include\ReactUWP\Utils\PropertyUtils.h" />
<ClInclude Include="..\include\ReactUWP\Utils\ResourceBrushUtils.h" />
<ClInclude Include="..\include\ReactUWP\Utils\StandardControlResourceKeyNames.h" />
<ClInclude Include="..\include\ReactUWP\Utils\UwpPreparedScriptStore.h" />
<ClInclude Include="..\include\ReactUWP\Utils\UwpScriptStore.h" />
<ClInclude Include="..\include\ReactUWP\Utils\ValueUtils.h" />
<ClInclude Include="..\include\ReactUWP\Views\ControlViewManager.h" />
<ClInclude Include="..\include\ReactUWP\Views\FrameworkElementViewManager.h" />
<ClInclude Include="..\include\ReactUWP\Views\ShadowNodeBase.h" />
Expand All @@ -160,12 +169,8 @@
<ClInclude Include="Modules\Animated\SpringAnimationDriver.h" />
<ClInclude Include="Modules\Animated\TrackingAnimatedNode.h" />
<ClInclude Include="..\include\ReactUWP\TurboModuleUtils.h" />
<ClInclude Include="Utils\ResourceBrushUtils.h" />
<ClInclude Include="Threading\BatchingUIMessageQueueThread.h" />
<ClInclude Include="Utils\CppWinrtLessExceptions.h" />
<ClInclude Include="Utils\StandardControlResourceKeyNames.h" />
<ClInclude Include="Utils\UwpPreparedScriptStore.h" Condition="'$(PATCH_RN)' == 'true'" />
<ClInclude Include="Utils\UwpScriptStore.h" Condition="'$(PATCH_RN)' == 'true'" />
<ClInclude Include="Executors\WebSocketJSExecutorUwp.h" />
<ClInclude Include="Modules\Animated\AdditionAnimatedNode.h" />
<ClInclude Include="Modules\Animated\AnimatedNode.h" />
Expand All @@ -189,7 +194,6 @@
<ClInclude Include="Modules\Animated\SubtractionAnimatedNode.h" />
<ClInclude Include="Modules\Animated\TransformAnimatedNode.h" />
<ClInclude Include="Modules\Animated\ValueAnimatedNode.h" />
<ClInclude Include="Utils\Helpers.h" />
<ClInclude Include="Modules\AppStateModuleUwp.h" />
<ClInclude Include="Modules\AppThemeModuleUwp.h" />
<ClInclude Include="Modules\AlertModuleUwp.h" />
Expand All @@ -216,9 +220,6 @@
<ClInclude Include="Threading\JSQueueThread.h" />
<ClInclude Include="Threading\UIMessageQueueThread.h" />
<ClInclude Include="Threading\WorkerMessageQueueThread.h" />
<ClInclude Include="Utils\LocalBundleReader.h" />
<ClInclude Include="Utils\PropertyHandlerUtils.h" />
<ClInclude Include="Utils\PropertyUtils.h" />
<ClInclude Include="Views\ActivityIndicatorViewManager.h" />
<ClInclude Include="Views\CheckboxViewManager.h" />
<ClInclude Include="Views\DatePickerViewManager.h" />
Expand Down
63 changes: 33 additions & 30 deletions vnext/ReactUWP/ReactUWP.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,6 @@
<ClInclude Include="..\include\ReactUWP\InstanceFactory.h">
<Filter>Base</Filter>
</ClInclude>
<ClInclude Include="Utils\LocalBundleReader.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Modules\LocationObserverModule.h">
<Filter>Modules</Filter>
</ClInclude>
Expand All @@ -348,9 +345,6 @@
<ClInclude Include="Threading\JSQueueThread.h">
<Filter>Threading</Filter>
</ClInclude>
<ClInclude Include="Utils\PropertyUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Modules\TimingModule.h">
<Filter>Modules</Filter>
</ClInclude>
Expand Down Expand Up @@ -516,9 +510,6 @@
<ClInclude Include="Views\DatePickerViewManager.h">
<Filter>Views</Filter>
</ClInclude>
<ClInclude Include="Utils\PropertyHandlerUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Views\ControlViewManager.h">
<Filter>Views</Filter>
</ClInclude>
Expand All @@ -531,12 +522,6 @@
<ClInclude Include="..\include\ReactUWP\Views\ViewManagerBase.h">
<Filter>Views</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\ValueUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\AccessibilityUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Views\ViewControl.h">
<Filter>Views</Filter>
</ClInclude>
Expand Down Expand Up @@ -573,18 +558,9 @@
<ClInclude Include="Modules\ImageViewManagerModule.h">
<Filter>Modules</Filter>
</ClInclude>
<ClInclude Include="Utils\Helpers.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Views\KeyboardEventHandler.h">
<Filter>Views</Filter>
</ClInclude>
<ClInclude Include="Utils\UwpPreparedScriptStore.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Utils\UwpScriptStore.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Modules\Animated\NativeAnimatedNodeManager.h">
<Filter>Modules\Animated</Filter>
</ClInclude>
Expand Down Expand Up @@ -615,9 +591,6 @@
<ClInclude Include="Threading\BatchingUIMessageQueueThread.h">
<Filter>Threading</Filter>
</ClInclude>
<ClInclude Include="Utils\CppWinrtLessExceptions.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Views\SliderViewManager.h">
<Filter>Views</Filter>
</ClInclude>
Expand All @@ -627,9 +600,6 @@
<ClInclude Include="Views\RefreshControlManager.h">
<Filter>Views</Filter>
</ClInclude>
<ClInclude Include="Utils\ResourceBrushUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="Utils\StandardControlResourceKeyNames.h" />
<ClInclude Include="..\include\ReactUWP\TurboModuleUtils.h">
<Filter>TurboModule</Filter>
Expand All @@ -643,6 +613,39 @@
<ClInclude Include="Modules\Animated\CalculatedAnimationDriver.h">
<Filter>Modules\Animated</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\AccessibilityUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\CppWinrtLessExceptions.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\Helpers.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\LocalBundleReader.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\PropertyHandlerUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\PropertyUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\ResourceBrushUtils.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\StandardControlResourceKeyNames.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\UwpPreparedScriptStore.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\UwpScriptStore.h">
<Filter>Utils</Filter>
</ClInclude>
<ClInclude Include="..\include\ReactUWP\Utils\ValueUtils.h">
<Filter>Utils</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="EndPoints\dll\react-native-uwp.arm.def">
Expand Down
2 changes: 1 addition & 1 deletion vnext/ReactUWP/Utils/Helpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
#include "pch.h"

#include <Modules/NativeUIManager.h>
#include <Utils/Helpers.h>
#include <winrt/Windows.Foundation.Metadata.h>
#include <winrt/Windows.UI.Xaml.Media.h>
#include "Helpers.h"

namespace winrt {
using namespace Windows::UI::Xaml::Controls::Primitives;
Expand Down
2 changes: 1 addition & 1 deletion vnext/ReactUWP/Utils/LocalBundleReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

#include "pch.h"

#include <Utils/LocalBundleReader.h>
#include <winrt/Windows.Storage.Streams.h>
#include <winrt/Windows.Storage.h>
#include "LocalBundleReader.h"
#include "Unicode.h"

#if _MSC_VER <= 1913
Expand Down
4 changes: 2 additions & 2 deletions vnext/ReactUWP/Utils/ResourceBrushUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "pch.h"

#include "ResourceBrushUtils.h"
#include "StandardControlResourceKeyNames.h"
#include <Utils/ResourceBrushUtils.h>
#include <Utils/StandardControlResourceKeyNames.h>

#include <winrt/Windows.UI.Xaml.h>

Expand Down
4 changes: 2 additions & 2 deletions vnext/ReactUWP/Utils/UwpPreparedScriptStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include "pch.h"

#include <Utils/UwpPreparedScriptStore.h>
#include <Utils/UwpScriptStore.h>
#include <winrt/Windows.Storage.FileProperties.h>
#include <winrt/Windows.Storage.Streams.h>
#include "Unicode.h"
#include "Utils/UwpPreparedScriptStore.h"
#include "Utils/UwpScriptStore.h"
#include "jsi/jsi.h"

#if _MSC_VER <= 1913
Expand Down
2 changes: 1 addition & 1 deletion vnext/ReactUWP/Utils/UwpScriptStore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#include "pch.h"

#include <Utils/UwpScriptStore.h>
#include <winrt/Windows.Foundation.h>
#include <winrt/Windows.Storage.FileProperties.h>
#include <winrt/Windows.Storage.h>
#include <future>
#include "Unicode.h"
#include "Utils/UwpScriptStore.h"

namespace winrt {
using namespace winrt::Windows::Foundation;
Expand Down
9 changes: 9 additions & 0 deletions vnext/include/Include.vcxitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,15 @@
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\IXamlRootView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\ReactRootView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\ReactUwp.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\CppWinrtLessExceptions.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\Helpers.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\LocalBundleReader.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\PropertyHandlerUtils.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\PropertyUtils.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\ResourceBrushUtils.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\StandardControlResourceKeyNames.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\UwpPreparedScriptStore.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\UwpScriptStore.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\ViewManagerProvider.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\XamlView.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\AccessibilityUtils.h" />
Expand Down
27 changes: 27 additions & 0 deletions vnext/include/Include.vcxitems.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,33 @@
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\XamlView.h">
<Filter>ReactUWP</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\CppWinrtLessExceptions.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\Helpers.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\LocalBundleReader.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\PropertyHandlerUtils.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\PropertyUtils.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\ResourceBrushUtils.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\StandardControlResourceKeyNames.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\UwpPreparedScriptStore.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ReactUWP\Utils\UwpScriptStore.h">
<Filter>ReactUWP\Utils</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="ReactUWP">
Expand Down
0 ...t/ReactUWP/Utils/CppWinrtLessExceptions.h → ...e/ReactUWP/Utils/CppWinrtLessExceptions.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/Helpers.h → vnext/include/ReactUWP/Utils/Helpers.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/LocalBundleReader.h → ...nclude/ReactUWP/Utils/LocalBundleReader.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/PropertyHandlerUtils.h → ...ude/ReactUWP/Utils/PropertyHandlerUtils.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/PropertyUtils.h → vnext/include/ReactUWP/Utils/PropertyUtils.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/ResourceBrushUtils.h → ...clude/ReactUWP/Utils/ResourceBrushUtils.h
View file
Open in desktop
File renamed without changes.
0 ...P/Utils/StandardControlResourceKeyNames.h → ...P/Utils/StandardControlResourceKeyNames.h
View file
Open in desktop
File renamed without changes.
0 ...t/ReactUWP/Utils/UwpPreparedScriptStore.h → ...e/ReactUWP/Utils/UwpPreparedScriptStore.h
View file
Open in desktop
File renamed without changes.
0 vnext/ReactUWP/Utils/UwpScriptStore.h → ...t/include/ReactUWP/Utils/UwpScriptStore.h
View file
Open in desktop
File renamed without changes.