From 908d4524710a68adb5c28c6e9b3a82f9686af47d Mon Sep 17 00:00:00 2001 From: Tommy Nguyen <4123478+tido64@users.noreply.github.com> Date: Fri, 20 Jan 2023 10:33:40 +0100 Subject: [PATCH] fix(windows): declare support for react-native-windows 0.71 (#1254) --- CONTRIBUTING.md | 2 +- example/package.json | 2 +- example/windows/.gitignore | 1 - .../ReactTestAppTests.vcxproj | 31 +-- package.json | 4 +- windows/.gitignore | 1 - windows/ReactTestApp.sln | 200 ------------------ windows/ReactTestApp/ReactTestApp.vcxproj | 35 +-- .../ReactTestApp/ReactTestApp.vcxproj.filters | 8 +- yarn.lock | 4 +- 10 files changed, 14 insertions(+), 274 deletions(-) delete mode 100644 windows/ReactTestApp.sln diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9c0034b24..d0b327609 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -155,7 +155,7 @@ start windows/Example.sln ``` If you choose to use Visual Studio, remember to first set the target platform to -`x64`. It is set to `ARM` by default. +`x64`. It may be set to `ARM64` by default. > **Note:** If you made changes to `app.json` or any other assets, you should > re-run `install-windows-test-app` to make sure that the changes are included diff --git a/example/package.json b/example/package.json index 14bfddc0c..8c62db95e 100644 --- a/example/package.json +++ b/example/package.json @@ -20,7 +20,7 @@ "react": "~17.0.1 || ~18.0.0 || ~18.1.0", "react-native": "^0.0.0-0 || 0.64 - 0.71 || 1000.0.0", "react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68", - "react-native-windows": "^0.0.0-0 || 0.64 - 0.70" + "react-native-windows": "^0.0.0-0 || 0.64 - 0.71" }, "devDependencies": { "@babel/core": "^7.0.0", diff --git a/example/windows/.gitignore b/example/windows/.gitignore index 399de7693..fb81ae232 100644 --- a/example/windows/.gitignore +++ b/example/windows/.gitignore @@ -6,7 +6,6 @@ *.sln.docstates # Build results -ARM/ ARM64/ AppPackages/ [Bb]in/ diff --git a/example/windows/ReactTestAppTests/ReactTestAppTests.vcxproj b/example/windows/ReactTestAppTests/ReactTestAppTests.vcxproj index dd55ff5a6..e04190075 100644 --- a/example/windows/ReactTestAppTests/ReactTestAppTests.vcxproj +++ b/example/windows/ReactTestAppTests/ReactTestAppTests.vcxproj @@ -12,14 +12,6 @@ - - Debug - ARM - - - Release - ARM - Debug ARM64 @@ -70,28 +62,7 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-test-app\package.json'))\node_modules\react-native-test-app\windows\ReactTestApp\ $([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\.generated\windows\ReactTestApp\ReactTestApp.vcxproj'))\node_modules\.generated\windows\ReactTestApp\ - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - - $(ReactTestAppDir);$(IncludePath) - - + $(ReactTestAppDir);$(IncludePath) diff --git a/package.json b/package.json index dba75836b..36e22760b 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "/scripts/*.js", "/scripts/apply-config-plugins.mjs", "/scripts/config-plugins/**/*.mjs", - "/windows/*.{js,props,sln}", + "/windows/*.{js,props}", "/windows/ReactTestApp" ], "main": "scripts/configure.js", @@ -88,7 +88,7 @@ "react": "~17.0.1 || ~18.0.0 || ~18.1.0", "react-native": "^0.0.0-0 || 0.64 - 0.71 || 1000.0.0", "react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68", - "react-native-windows": "^0.0.0-0 || 0.64 - 0.70" + "react-native-windows": "^0.0.0-0 || 0.64 - 0.71" }, "peerDependenciesMeta": { "@expo/config-plugins": { diff --git a/windows/.gitignore b/windows/.gitignore index 8dcaf4095..fb8a69bc9 100644 --- a/windows/.gitignore +++ b/windows/.gitignore @@ -6,7 +6,6 @@ *.sln.docstates # Build results -ARM/ ARM64/ AppPackages/ [Bb]in/ diff --git a/windows/ReactTestApp.sln b/windows/ReactTestApp.sln deleted file mode 100644 index 19d9bf399..000000000 --- a/windows/ReactTestApp.sln +++ /dev/null @@ -1,200 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30204.135 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactTestApp", "$(ReactTestAppProjectPath)\ReactTestApp.vcxproj", "{B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{545EBB52-51A5-448C-A9C7-8D1E8FDD4829}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "$(ReactNativeModulePath)\Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "$(ReactNativeModulePath)\ReactCommon\ReactCommon.vcxproj", "{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "$(ReactNativeModulePath)\ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "$(ReactNativeModulePath)\Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Universal", "$(ReactNativeModulePath)\JSI\Universal\JSI.Universal.vcxproj", "{A62D504A-16B8-41D2-9F19-E2E86019E5E4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Chakra", "$(ReactNativeModulePath)\Chakra\Chakra.vcxitems", "{C38970C0-5FBF-4D69-90D8-CBAC225AE895}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JSI.Shared", "$(ReactNativeModulePath)\JSI\Shared\JSI.Shared.vcxitems", "{0CC28589-39E4-4288-B162-97B959F8B843}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative", "$(ReactNativeModulePath)\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj", "{F7D32BD0-2749-483E-9A0D-1635EF7E3136}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx", "$(ReactNativeModulePath)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems", "{DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "$(ReactNativeModulePath)\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "$(ReactNativeModulePath)\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" -EndProject -$(AdditionalProjects) -Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - $(ReactNativeModulePath)\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - $(ReactNativeModulePath)\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 - $(ReactNativeModulePath)\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 - $(ReactNativeModulePath)\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{b44cead7-fbff-4a17-95ea-ff5434bbd79d}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9 - $(ReactNativeModulePath)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9 - $(ReactNativeModulePath)\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 - $(ReactNativeModulePath)\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 - $(ReactNativeModulePath)\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 - EndGlobalSection - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM.ActiveCfg = Debug|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM.Build.0 = Debug|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM.Deploy.0 = Debug|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM64.Build.0 = Debug|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x64.ActiveCfg = Debug|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x64.Build.0 = Debug|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x64.Deploy.0 = Debug|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x86.ActiveCfg = Debug|Win32 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x86.Build.0 = Debug|Win32 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Debug|x86.Deploy.0 = Debug|Win32 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM.ActiveCfg = Release|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM.Build.0 = Release|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM.Deploy.0 = Release|ARM - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM64.ActiveCfg = Release|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM64.Build.0 = Release|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|ARM64.Deploy.0 = Release|ARM64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x64.ActiveCfg = Release|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x64.Build.0 = Release|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x64.Deploy.0 = Release|x64 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x86.ActiveCfg = Release|Win32 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x86.Build.0 = Release|Win32 - {B44CEAD7-FBFF-4A17-95EA-FF5434BBD79D}.Release|x86.Deploy.0 = Release|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.ActiveCfg = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM.Build.0 = Debug|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|ARM64.Build.0 = Debug|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.ActiveCfg = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x64.Build.0 = Debug|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.ActiveCfg = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Debug|x86.Build.0 = Debug|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.ActiveCfg = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM.Build.0 = Release|ARM - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.ActiveCfg = Release|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|ARM64.Build.0 = Release|ARM64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.ActiveCfg = Release|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x64.Build.0 = Release|x64 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.ActiveCfg = Release|Win32 - {A990658C-CE31-4BCC-976F-0FC6B1AF693D}.Release|x86.Build.0 = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.ActiveCfg = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM.Build.0 = Debug|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|ARM64.Build.0 = Debug|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.ActiveCfg = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x64.Build.0 = Debug|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.ActiveCfg = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Debug|x86.Build.0 = Debug|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.ActiveCfg = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM.Build.0 = Release|ARM - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.ActiveCfg = Release|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|ARM64.Build.0 = Release|ARM64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.ActiveCfg = Release|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x64.Build.0 = Release|x64 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.ActiveCfg = Release|Win32 - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}.Release|x86.Build.0 = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.ActiveCfg = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM.Build.0 = Debug|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|ARM64.Build.0 = Debug|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.ActiveCfg = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x64.Build.0 = Debug|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.ActiveCfg = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Debug|x86.Build.0 = Debug|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.ActiveCfg = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM.Build.0 = Release|ARM - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.ActiveCfg = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|ARM64.Build.0 = Release|ARM64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.ActiveCfg = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x64.Build.0 = Release|x64 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.ActiveCfg = Release|Win32 - {11C084A3-A57C-4296-A679-CAC17B603144}.Release|x86.Build.0 = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.ActiveCfg = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM.Build.0 = Debug|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.ActiveCfg = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x64.Build.0 = Debug|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.ActiveCfg = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|x86.Build.0 = Debug|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.ActiveCfg = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM.Build.0 = Release|ARM - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.ActiveCfg = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|ARM64.Build.0 = Release|ARM64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.ActiveCfg = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.ActiveCfg = Debug|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM.Build.0 = Debug|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|ARM64.Build.0 = Debug|ARM64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.ActiveCfg = Debug|x64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x64.Build.0 = Debug|x64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.ActiveCfg = Debug|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Debug|x86.Build.0 = Debug|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.ActiveCfg = Release|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM.Build.0 = Release|ARM - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.ActiveCfg = Release|ARM64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|ARM64.Build.0 = Release|ARM64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.ActiveCfg = Release|x64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x64.Build.0 = Release|x64 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.ActiveCfg = Release|Win32 - {A62D504A-16B8-41D2-9F19-E2E86019E5E4}.Release|x86.Build.0 = Release|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.ActiveCfg = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM.Build.0 = Debug|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|ARM64.Build.0 = Debug|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.ActiveCfg = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x64.Build.0 = Debug|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.ActiveCfg = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Debug|x86.Build.0 = Debug|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.ActiveCfg = Release|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM.Build.0 = Release|ARM - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.ActiveCfg = Release|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|ARM64.Build.0 = Release|ARM64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.ActiveCfg = Release|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x64.Build.0 = Release|x64 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.ActiveCfg = Release|Win32 - {F7D32BD0-2749-483E-9A0D-1635EF7E3136}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {11C084A3-A57C-4296-A679-CAC17B603144} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {A62D504A-16B8-41D2-9F19-E2E86019E5E4} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {C38970C0-5FBF-4D69-90D8-CBAC225AE895} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {0CC28589-39E4-4288-B162-97B959F8B843} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {F7D32BD0-2749-483E-9A0D-1635EF7E3136} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {545EBB52-51A5-448C-A9C7-8D1E8FDD4829} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {D8B5B7FD-54B9-4FB9-81E3-AEECA3EE7D83} - EndGlobalSection -EndGlobal diff --git a/windows/ReactTestApp/ReactTestApp.vcxproj b/windows/ReactTestApp/ReactTestApp.vcxproj index fd1f4b24b..a9c9514ed 100644 --- a/windows/ReactTestApp/ReactTestApp.vcxproj +++ b/windows/ReactTestApp/ReactTestApp.vcxproj @@ -33,10 +33,6 @@ - - Debug - ARM - Debug ARM64 @@ -49,10 +45,6 @@ Debug x64 - - Release - ARM - Release ARM64 @@ -93,28 +85,7 @@ - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - - $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) - - + $(ReactTestAppDir);$(ReactTestAppCommonDir);$(ReactTestAppGeneratedDir);$(IncludePath) @@ -174,12 +145,12 @@ + - - + diff --git a/windows/ReactTestApp/ReactTestApp.vcxproj.filters b/windows/ReactTestApp/ReactTestApp.vcxproj.filters index a40864317..950c3d42b 100644 --- a/windows/ReactTestApp/ReactTestApp.vcxproj.filters +++ b/windows/ReactTestApp/ReactTestApp.vcxproj.filters @@ -33,10 +33,10 @@ - + Assets - + Assets @@ -45,10 +45,10 @@ Assets - + Assets - + Assets diff --git a/yarn.lock b/yarn.lock index 0c9ad837b..843e7d0d2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5657,7 +5657,7 @@ __metadata: react: ~17.0.1 || ~18.0.0 || ~18.1.0 react-native: ^0.0.0-0 || 0.64 - 0.71 || 1000.0.0 react-native-macos: ^0.0.0-0 || 0.64 || 0.66 || 0.68 - react-native-windows: ^0.0.0-0 || 0.64 - 0.70 + react-native-windows: ^0.0.0-0 || 0.64 - 0.71 languageName: unknown linkType: soft @@ -11015,7 +11015,7 @@ fsevents@^2.3.2: react: ~17.0.1 || ~18.0.0 || ~18.1.0 react-native: ^0.0.0-0 || 0.64 - 0.71 || 1000.0.0 react-native-macos: ^0.0.0-0 || 0.64 || 0.66 || 0.68 - react-native-windows: ^0.0.0-0 || 0.64 - 0.70 + react-native-windows: ^0.0.0-0 || 0.64 - 0.71 peerDependenciesMeta: "@expo/config-plugins": optional: true