Skip to content

Commit eef71c1

Browse files
Yajur-GroverYajur-Grover
committed
test props and targets import changes
1 parent dd5b0fb commit eef71c1

File tree

2 files changed

+35
-26
lines changed

2 files changed

+35
-26
lines changed

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,13 @@
9191
<ImportGroup Label="PropertySheets" Condition="'$(UseFabric)'!='true'">
9292
<Import Project="PropertySheet.props" />
9393
</ImportGroup>
94-
<ImportGroup Label="ReactNativeWindowsPropertySheets">
94+
<ImportGroup Label="ReactNativeWindowsPropertySheets" Condition="'$(ReactNativeWindowsCanary)'!='true' And '$([MSBuild]::VersionLessThan($(ReactNativeWindowsMinor), 76))'">
9595
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\external\Microsoft.ReactNative.Uwp.CppLib.props" Condition="'$(UseFabric)'!='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.props')" />
9696
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props" Condition="'$(UseFabric)'=='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props')" />
9797
</ImportGroup>
98+
<ImportGroup Label="ReactNativeWindowsPropertySheets" Condition="'$(ReactNativeWindowsCanary)'=='true' Or '$([MSBuild]::VersionGreaterThanOrEquals($(ReactNativeWindowsMinor), 76))'">
99+
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props')" />
100+
</ImportGroup>
98101
<ItemDefinitionGroup>
99102
<ClCompile>
100103
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -161,10 +164,13 @@
161164
<Midl Include="..\code\ReactPackageProvider.idl" />
162165
</ItemGroup>
163166
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
164-
<ImportGroup Label="ReactNativeWindowsTargets">
167+
<ImportGroup Label="ReactNativeWindowsTargets" Condition="'$(ReactNativeWindowsCanary)'!='true' And '$([MSBuild]::VersionLessThan($(ReactNativeWindowsMinor), 76))'">
165168
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets" Condition="'$(UseFabric)'!='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" />
166169
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets" Condition="'$(UseFabric)'=='true' And Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets')" />
167170
</ImportGroup>
171+
<ImportGroup Label="ReactNativeWindowsTargets" Condition="'$(ReactNativeWindowsCanary)'=='true' Or '$([MSBuild]::VersionGreaterThanOrEquals($(ReactNativeWindowsMinor), 76))'">
172+
<Import Project="$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets" Condition="Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets')" />
173+
</ImportGroup>
168174
<ItemGroup>
169175
</ItemGroup>
170176
<Target Name="EnsureReactNativeWindowsTargets" BeforeTargets="PrepareForBuild">
@@ -175,5 +181,7 @@
175181
<Error Condition="'$(UseFabric)'!='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppLib.targets'))" />
176182
<Error Condition="'$(UseFabric)'=='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.props'))" />
177183
<Error Condition="'$(UseFabric)'=='true' And !Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Composition.CppLib.targets'))" />
184+
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.props'))" />
185+
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.CppLib.targets'))" />
178186
</Target>
179187
</Project>

‎yarn.lock

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5579,11 +5579,11 @@ __metadata:
55795579
languageName: node
55805580
linkType: hard
55815581

5582-
"@react-native-windows/cli@npm:0.75.3":
5583-
version: 0.75.3
5584-
resolution: "@react-native-windows/cli@npm:0.75.3"
5582+
"@react-native-windows/cli@npm:0.75.4":
5583+
version: 0.75.4
5584+
resolution: "@react-native-windows/cli@npm:0.75.4"
55855585
dependencies:
5586-
"@react-native-windows/codegen": "npm:0.75.1"
5586+
"@react-native-windows/codegen": "npm:0.75.2"
55875587
"@react-native-windows/fs": "npm:0.75.0"
55885588
"@react-native-windows/package-utils": "npm:0.75.0"
55895589
"@react-native-windows/telemetry": "npm:0.75.1"
@@ -5606,13 +5606,13 @@ __metadata:
56065606
xpath: "npm:^0.0.27"
56075607
peerDependencies:
56085608
react-native: "*"
5609-
checksum: 10c0/bce01859f8943ca98fde01c6f2d8f1b16a8155ff93b4a2585a239829194ea5e2baef85176f06be58a71d07bf945ef7a5831b6b705a8abda69541ec71607ca78a
5609+
checksum: 10c0/95ff332d2077412268cd8bfd2aaf9591f6bc73cc76d215698d7deb3a5f24bbd33a34782e5bc461e53a48b71c7c76c328c9ba92c37e06bf6c1fa5842be7b9d471
56105610
languageName: node
56115611
linkType: hard
56125612

5613-
"@react-native-windows/codegen@npm:0.75.1":
5614-
version: 0.75.1
5615-
resolution: "@react-native-windows/codegen@npm:0.75.1"
5613+
"@react-native-windows/codegen@npm:0.75.2":
5614+
version: 0.75.2
5615+
resolution: "@react-native-windows/codegen@npm:0.75.2"
56165616
dependencies:
56175617
"@react-native-windows/fs": "npm:0.75.0"
56185618
chalk: "npm:^4.1.0"
@@ -5624,7 +5624,7 @@ __metadata:
56245624
react-native: "*"
56255625
bin:
56265626
react-native-windows-codegen: bin.js
5627-
checksum: 10c0/ba025dc70013811e0c2bbb723057c6fbe67d6a59c5739d263b68c2143f7fb8320c1a1dcea02e06efe6eed90379606b2ced390d6e9d0911695324e388220b032f
5627+
checksum: 10c0/f594707a5f2b431a2a89536cf8bde78bc81897b48b5b47205bc2ab6547c812b243660c2ae797ead4ea0ac078924577e828102a8d7db095b785a72426322f0050
56285628
languageName: node
56295629
linkType: hard
56305630

@@ -20356,28 +20356,29 @@ __metadata:
2035620356
linkType: hard
2035720357

2035820358
"react-native-windows@npm:^0.75.0":
20359-
version: 0.75.3
20360-
resolution: "react-native-windows@npm:0.75.3"
20359+
version: 0.75.5
20360+
resolution: "react-native-windows@npm:0.75.5"
2036120361
dependencies:
2036220362
"@babel/runtime": "npm:^7.0.0"
2036320363
"@jest/create-cache-key-function": "npm:^29.6.3"
20364-
"@react-native-community/cli": "npm:14.0.0"
20365-
"@react-native-community/cli-platform-android": "npm:14.0.0"
20366-
"@react-native-community/cli-platform-ios": "npm:14.0.0"
20367-
"@react-native-windows/cli": "npm:0.75.3"
20364+
"@react-native-community/cli": "npm:14.1.0"
20365+
"@react-native-community/cli-platform-android": "npm:14.1.0"
20366+
"@react-native-community/cli-platform-ios": "npm:14.1.0"
20367+
"@react-native-windows/cli": "npm:0.75.4"
2036820368
"@react-native/assets": "npm:1.0.0"
20369-
"@react-native/assets-registry": "npm:0.75.2"
20370-
"@react-native/codegen": "npm:0.75.2"
20371-
"@react-native/community-cli-plugin": "npm:0.75.2"
20372-
"@react-native/gradle-plugin": "npm:0.75.2"
20373-
"@react-native/js-polyfills": "npm:0.75.2"
20374-
"@react-native/normalize-colors": "npm:0.75.2"
20375-
"@react-native/virtualized-lists": "npm:0.75.2"
20369+
"@react-native/assets-registry": "npm:0.75.3"
20370+
"@react-native/codegen": "npm:0.75.3"
20371+
"@react-native/community-cli-plugin": "npm:0.75.3"
20372+
"@react-native/gradle-plugin": "npm:0.75.3"
20373+
"@react-native/js-polyfills": "npm:0.75.3"
20374+
"@react-native/normalize-colors": "npm:0.75.3"
20375+
"@react-native/virtualized-lists": "npm:0.75.3"
2037620376
abort-controller: "npm:^3.0.0"
2037720377
anser: "npm:^1.4.9"
2037820378
ansi-regex: "npm:^5.0.0"
2037920379
base64-js: "npm:^1.5.1"
2038020380
chalk: "npm:^4.0.0"
20381+
commander: "npm:^9.4.1"
2038120382
event-target-shim: "npm:^5.0.1"
2038220383
flow-enums-runtime: "npm:^0.0.6"
2038320384
glob: "npm:^7.1.1"
@@ -20405,8 +20406,8 @@ __metadata:
2040520406
peerDependencies:
2040620407
"@types/react": ^18.2.6
2040720408
react: ^18.2.0
20408-
react-native: ^0.75.2
20409-
checksum: 10c0/fe394d7a642e198aa9789cf3a60682a4db8fd23cd708a3e7934d64aeb9006ba2bed8a2ba0ba8614ebd20e6fe8f9fee15a756333c21045515c0491c2d0641385f
20409+
react-native: ^0.75.3
20410+
checksum: 10c0/4de9bacbd4c9a5ae2c1e1e8219f6becc95a078dabf0e4582ad35c3e1ba5303cc8ff41a47d4e6b89b8f32a88f7218dee678a21dafa87eb5957bf9630f03488d8f
2041020411
languageName: node
2041120412
linkType: hard
2041220413

0 commit comments

Comments
 (0)