Skip to content

Commit cb4ee8d

Browse files
Yajur-GroverYajur-Grover
committed
re-add paper dependencies
1 parent 98421a4 commit cb4ee8d

File tree

4 files changed

+44
-39
lines changed

4 files changed

+44
-39
lines changed

‎packages/default-storage/metro.config.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ const rnwPath = fs.realpathSync(
2020
const config = {
2121
//
2222
projectRoot: path.join(__dirname, "example"),
23+
watchFolders: [__dirname],
2324
resolver: {
2425
blockList: exclusionList([
2526
// This stops "react-native run-windows" from causing the metro server to crash if its already running

‎packages/default-storage/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"start:macos": "react-native run-macos --project-path example/macos --scheme AsyncStorageExample",
4747
"start:web": "expo start --web",
4848
"start:windows": "install-windows-test-app -p example/windows && react-native run-windows --root example --logging --no-packager --no-telemetry",
49+
"start:windows:fabric": "install-windows-test-app -p example/windows --use-fabric && react-native run-windows --root example --logging --no-packager --no-telemetry",
4950
"build:e2e:android": "scripts/android_e2e.sh 'build'",
5051
"build:e2e:ios": "scripts/ios_e2e.sh 'build'",
5152
"build:e2e:macos": "scripts/macos_e2e.sh 'build'",

‎packages/default-storage/windows/ReactNativeAsyncStorage/ReactNativeAsyncStorage.vcxproj

Lines changed: 38 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,39 @@
22
<!-- This project was created with react-native-windows 0.74.12 -->
33
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<Import Project="$(SolutionDir)\ExperimentalFeatures.props" Condition="Exists('$(SolutionDir)\ExperimentalFeatures.props')" />
5-
<PropertyGroup Label="Globals">
6-
<CppWinRTOptimized>true</CppWinRTOptimized>
7-
<MinimalCoreWin>true</MinimalCoreWin>
8-
<ProjectGuid>{4855D892-E16C-404D-8286-0089E0F7F9C4}</ProjectGuid>
9-
<ProjectName>ReactNativeAsyncStorage</ProjectName>
10-
<Keyword>Win32Proj</Keyword>
11-
<RootNamespace>ReactNativeAsyncStorage</RootNamespace>
12-
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
13-
<DefaultLanguage>en-US</DefaultLanguage>
14-
<MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
15-
<AppxPackage>false</AppxPackage>
16-
</PropertyGroup>
5+
<Choose>
6+
<When Condition="'$(UseFabric)'=='true'">
7+
<PropertyGroup Label="Globals">
8+
<CppWinRTOptimized>true</CppWinRTOptimized>
9+
<MinimalCoreWin>true</MinimalCoreWin>
10+
<ProjectGuid>{4855D892-E16C-404D-8286-0089E0F7F9C4}</ProjectGuid>
11+
<ProjectName>ReactNativeAsyncStorage</ProjectName>
12+
<Keyword>Win32Proj</Keyword>
13+
<RootNamespace>ReactNativeAsyncStorage</RootNamespace>
14+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
15+
<DefaultLanguage>en-US</DefaultLanguage>
16+
<MinimumVisualStudioVersion>17.0</MinimumVisualStudioVersion>
17+
<AppxPackage>false</AppxPackage>
18+
</PropertyGroup>
19+
</When>
20+
<Otherwise>
21+
<PropertyGroup Label="Globals">
22+
<CppWinRTOptimized>true</CppWinRTOptimized>
23+
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
24+
<MinimalCoreWin>true</MinimalCoreWin>
25+
<ProjectGuid>{4855D892-E16C-404D-8286-0089E0F7F9C4}</ProjectGuid>
26+
<ProjectName>ReactNativeAsyncStorage</ProjectName>
27+
<RootNamespace>ReactNativeAsyncStorage</RootNamespace>
28+
<DefaultLanguage>en-US</DefaultLanguage>
29+
<MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
30+
<AppContainerApplication>true</AppContainerApplication>
31+
<ApplicationType>Windows Store</ApplicationType>
32+
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
33+
<WindowsTargetPlatformVersion Condition=" '$(WindowsTargetPlatformVersion)' == '' ">10.0</WindowsTargetPlatformVersion>
34+
<WindowsTargetPlatformMinVersion Condition=" '$(WindowsTargetPlatformMinVersion)' == '' ">10.0.17763.0</WindowsTargetPlatformMinVersion>
35+
</PropertyGroup>
36+
</Otherwise>
37+
</Choose>
1738
<PropertyGroup Label="ReactNativeWindowsProps">
1839
<ReactNativeWindowsDir Condition="'$(ReactNativeWindowsDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'node_modules\react-native-windows\package.json'))\node_modules\react-native-windows\</ReactNativeWindowsDir>
1940
<RunAutolinkCheck>false</RunAutolinkCheck>
@@ -65,6 +86,9 @@
6586
<ImportGroup Label="PropertySheets">
6687
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6788
</ImportGroup>
89+
<ImportGroup Label="PropertySheets" Condition="'$(UseFabric)'!='true'">
90+
<Import Project="PropertySheet.props" />
91+
</ImportGroup>
6892
<ImportGroup Label="ReactNativeWindowsPropertySheets">
6993
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\external\Microsoft.ReactNative.Uwp.CppLib.props" Condition="'$(UseFabric)'!='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" />
7094
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props" Condition="'$(UseFabric)'=='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props')" />
@@ -114,8 +138,8 @@
114138
</ClInclude>
115139
<ClInclude Include="..\code\DBStorage.h" />
116140
<ClInclude Include="..\code\RNCAsyncStorage.h" />
117-
<ClInclude Include="resource.h" />
118-
<ClInclude Include="targetver.h" />
141+
<ClInclude Include="resource.h" Condition="'$(UseFabric)'=='true'" />
142+
<ClInclude Include="targetver.h" Condition="'$(UseFabric)'=='true'" />
119143
</ItemGroup>
120144
<ItemGroup>
121145
<ClCompile Include="pch.cpp">

‎packages/default-storage/windows/code/pch.h

Lines changed: 4 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,13 @@
1-
// pch.h : include file for standard system include files,
2-
// or project specific include files that are used frequently, but
3-
// are changed infrequently
4-
//
5-
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
63
#pragma once
74

8-
#include "targetver.h"
9-
10-
#define NOMINMAX 1
11-
#define WIN32_LEAN_AND_MEAN 1
12-
#define WINRT_LEAN_AND_MEAN 1
5+
#define NOMINMAX
136

14-
// Windows Header Files
15-
#include <windows.h>
16-
#undef GetCurrentTime
7+
#include <functional>
178
#include <unknwn.h>
189

19-
// WinRT Header Files
20-
#include <winrt/base.h>
21-
#include <CppWinRTIncludes.h>
2210
#include <winrt/Microsoft.ReactNative.h>
23-
24-
// C RunTime Header Files
25-
#include <malloc.h>
26-
#include <memory.h>
27-
#include <stdlib.h>
28-
#include <tchar.h>
29-
30-
// Reference additional headers your project requires here
31-
#include <functional>
3211
#include <winrt/Windows.ApplicationModel.Core.h>
3312
#include <winrt/Windows.Data.Json.h>
3413
#include <winrt/Windows.Foundation.Collections.h>

0 commit comments

Comments
 (0)