Skip to content

Commit 29297e1

Browse files
Alex-MSFTCedricGuillemet
Alex-MSFT
and
CedricGuillemet
authored
Update Bablyon Native and Babylon JS to take the latest fixes for NativeCamera (#455)
* Bump Babylon Native * Update Babylon.js version * Update 0.65 package.json * Update lock files * Update lock files using npm 16.13.0. * Rerun npm install on top of old lock files from master. * Windows SDK 10+ (cherry picked from commit 4106326) * CppWinRT version bump (cherry picked from commit f0d12a8) Co-authored-by: Cedric Guillemet <[email protected]>
1 parent fb054db commit 29297e1

File tree

18 files changed

+768
-152
lines changed

18 files changed

+768
-152
lines changed

‎Apps/PackageTest/0.64.0/windows/PackageTest/PackageTest.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<Import Project="$(SolutionDir)\BuildFlags.props" Condition="Exists('$(SolutionDir)\BuildFlags.props')" />
55
<PropertyGroup Label="Globals">
66
<CppWinRTOptimized>true</CppWinRTOptimized>
@@ -183,15 +183,15 @@
183183
<Error Condition="!Exists('$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(ReactNativeWindowsDir)\PropertySheets\External\Microsoft.ReactNative.Uwp.CppApp.targets'))" />
184184
</Target>
185185
<ImportGroup Label="ExtensionTargets">
186-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
186+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
187187
<Import Project="..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets" Condition="Exists('..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" />
188188
</ImportGroup>
189189
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
190190
<PropertyGroup>
191191
<ErrorText>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}.</ErrorText>
192192
</PropertyGroup>
193-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
194-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
193+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
194+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
195195
<Error Condition="!Exists('..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets'))" />
196196
</Target>
197197
</Project>

‎Apps/Playground/0.64/ios/Playground.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,7 @@
879879
COPY_PHASE_STRIP = NO;
880880
ENABLE_STRICT_OBJC_MSGSEND = YES;
881881
ENABLE_TESTABILITY = YES;
882-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
882+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
883883
GCC_C_LANGUAGE_STANDARD = gnu99;
884884
GCC_DYNAMIC_NO_PIC = NO;
885885
GCC_NO_COMMON_BLOCKS = YES;
@@ -940,7 +940,7 @@
940940
COPY_PHASE_STRIP = YES;
941941
ENABLE_NS_ASSERTIONS = NO;
942942
ENABLE_STRICT_OBJC_MSGSEND = YES;
943-
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "";
943+
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = "arm64 ";
944944
GCC_C_LANGUAGE_STANDARD = gnu99;
945945
GCC_NO_COMMON_BLOCKS = YES;
946946
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

‎Apps/Playground/0.64/ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ SPEC CHECKSUMS:
469469
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
470470
DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
471471
FBLazyVector: 7b423f9e248eae65987838148c36eec1dbfe0b53
472-
FBReactNativeSpec: e522fe79540cfc4cbe6f4ed988010ddd6aa00b20
472+
FBReactNativeSpec: bac127a452d4bf9a618ecca4bb6137bf50a020e1
473473
Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021
474474
Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
475475
Flipper-Folly: 755929a4f851b2fb2c347d533a23f191b008554c
@@ -492,7 +492,7 @@ SPEC CHECKSUMS:
492492
React-jsi: 5de8204706bd872b78ea646aee5d2561ca1214b6
493493
React-jsiexecutor: 124e8f99992490d0d13e0649d950d3e1aae06fe9
494494
React-jsinspector: 500a59626037be5b3b3d89c5151bc3baa9abf1a9
495-
react-native-babylon: 018c7aab746addac3f3549cd95bb78ca81e824f3
495+
react-native-babylon: 4792aa2ed72286bdce4103136c5499fa76e4287d
496496
react-native-slider: 98b724cd3e44c3454a6d0724e796d4e9c52189ce
497497
React-perflogger: aad6d4b4a267936b3667260d1f649b6f6069a675
498498
React-RCTActionSheet: fc376be462c9c8d6ad82c0905442fd77f82a9d2a

‎Apps/Playground/0.64/package-lock.json‎

Lines changed: 63 additions & 59 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/Playground/0.64/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"iosCmake": "node scripts/tools.js iosCMake"
1515
},
1616
"dependencies": {
17-
"@babylonjs/core": "5.6.1",
18-
"@babylonjs/loaders": "5.6.1",
17+
"@babylonjs/core": "5.17.0",
18+
"@babylonjs/loaders": "5.17.0",
1919
"@babylonjs/react-native": "file:../../../Modules/@babylonjs/react-native",
2020
"@babylonjs/react-native-iosandroid": "file:../../../Modules/@babylonjs/react-native-iosandroid",
2121
"@babylonjs/react-native-windows": "file:../../../Modules/@babylonjs/react-native-windows",

‎Apps/Playground/0.64/windows/Playground/Playground.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<PropertyGroup Label="Globals">
55
<CppWinRTOptimized>true</CppWinRTOptimized>
66
<CppWinRTRootNamespaceAutoMerge>true</CppWinRTRootNamespaceAutoMerge>
@@ -187,14 +187,14 @@
187187
</Target>
188188
<ImportGroup Label="ExtensionTargets">
189189
<Import Project="..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets" Condition="Exists('..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" />
190-
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
190+
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" />
191191
</ImportGroup>
192192
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
193193
<PropertyGroup>
194194
<ErrorText>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}.</ErrorText>
195195
</PropertyGroup>
196196
<Error Condition="!Exists('..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\$(WinUIPackageName).$(WinUIPackageVersion)\build\native\$(WinUIPackageName).targets'))" />
197-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
198-
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.201201.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
197+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.props'))" />
198+
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220110.5\build\native\Microsoft.Windows.CppWinRT.targets'))" />
199199
</Target>
200200
</Project>

‎Apps/Playground/0.64/windows/Playground/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.UI.Xaml" version="2.3.191129002" targetFramework="native" />
4-
<package id="Microsoft.Windows.CppWinRT" version="2.0.201201.7" targetFramework="native" />
4+
<package id="Microsoft.Windows.CppWinRT" version="2.0.220110.5" targetFramework="native" />
55
</packages>

0 commit comments

Comments
 (0)