Skip to content

Commit 71c5c52

Browse files
authored
chore(windows): fix windows build (#686)
1 parent e547e8d commit 71c5c52

File tree

5 files changed

+47
-46
lines changed

5 files changed

+47
-46
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: macos-latest
1111
steps:
1212
- name: Set up Node.js
13-
uses: actions/setup-node@v1
13+
uses: actions/setup-node@v2.4.1
1414
with:
1515
node-version: 14
1616
- name: Checkout
@@ -38,11 +38,11 @@ jobs:
3838
runs-on: windows-latest
3939
steps:
4040
- name: Set up MSBuild
41-
uses: microsoft/[email protected].2
41+
uses: microsoft/[email protected].3
4242
- name: Setup VSTest.console.exe
4343
uses: darenm/Setup-VSTest@v1
4444
- name: Set up Node.js
45-
uses: actions/setup-node@v1
45+
uses: actions/setup-node@v2.4.1
4646
with:
4747
node-version: 14
4848
- name: Checkout

example/.gitignore

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ build/
3030
local.properties
3131
*.iml
3232

33+
# Visual Studio
34+
#
35+
/windows/AppPackages
36+
/windows/ExperimentalFeatures.props
37+
/windows/NuGet.Config
38+
3339
# node.js
3440
#
3541
node_modules/
@@ -42,17 +48,6 @@ buck-out/
4248
*.keystore
4349
!android/debug.keystore
4450

45-
# fastlane
46-
#
47-
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
48-
# screenshots whenever they are needed.
49-
# For more information about the recommended setup visit:
50-
# https://docs.fastlane.tools/best-practices/source-control/
51-
52-
*/fastlane/report.xml
53-
*/fastlane/Preview.html
54-
*/fastlane/screenshots
55-
5651
# Bundle artifact
5752
*.jsbundle
5853

example/windows/ReactTestApp.sln

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,22 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\node_modules\r
3535
EndProject
3636
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\..\node_modules\react-native-windows\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}"
3737
EndProject
38+
3839
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactNativeAsyncStorage", "..\..\windows\ReactNativeAsyncStorage\ReactNativeAsyncStorage.vcxproj", "{4855D892-E16C-404D-8286-0089E0F7F9C4}"
3940
EndProject
4041
Global
4142
GlobalSection(SharedMSBuildProjectFiles) = preSolution
42-
..\..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9
43-
..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
44-
..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
45-
..\..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4
46-
..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
47-
..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
48-
..\..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
49-
..\..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
50-
..\..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51-
..\..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
52-
..\..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
43+
..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9
44+
..\node_modules\react-native-windows\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9
45+
..\node_modules\react-native-windows\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9
46+
..\node_modules\react-native-windows\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4
47+
..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{c38970c0-5fbf-4d69-90d8-cbac225ae895}*SharedItemsImports = 9
48+
..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{da8b35b3-da00-4b02-bde6-6a397b3fd46b}*SharedItemsImports = 9
49+
..\node_modules\react-native-windows\include\Include.vcxitems*{ef074ba1-2d54-4d49-a28e-5e040b47cd2e}*SharedItemsImports = 9
50+
..\node_modules\react-native-windows\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
51+
..\node_modules\react-native-windows\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
52+
..\node_modules\react-native-windows\Mso\Mso.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
53+
..\node_modules\react-native-windows\Shared\Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4
5354
EndGlobalSection
5455
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5556
Debug|ARM = Debug|ARM

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@
8888
"react-native": "0.63.4",
8989
"react-native-builder-bob": "^0.18.0",
9090
"react-native-macos": "^0.63.4",
91-
"react-native-test-app": "^0.7.1",
91+
"react-native-test-app": "^0.9.0",
9292
"react-native-web": "~0.12.0",
93-
"react-native-windows": "^0.63.18",
93+
"react-native-windows": "^0.63.41",
9494
"react-test-renderer": "16.13.1",
9595
"semantic-release": "^17.2.1"
9696
},

yarn.lock

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2248,12 +2248,13 @@
22482248
resolved "https://registry.yarnpkg.com/@react-native-community/eslint-plugin/-/eslint-plugin-1.1.0.tgz#e42b1bef12d2415411519fd528e64b593b1363dc"
22492249
integrity sha512-W/J0fNYVO01tioHjvYWQ9m6RgndVtbElzYozBq1ZPrHO/iCzlqoySHl4gO/fpCl9QEFjvJfjPgtPMTMlsoq5DQ==
22502250

2251-
"@react-native-windows/[email protected].12":
2252-
version "0.63.12"
2253-
resolved "https://registry.yarnpkg.com/@react-native-windows/cli/-/cli-0.63.12.tgz#fff41cb8e0e039e133a8e3a29a25927fe77d5856"
2254-
integrity sha512-N8cD2SpDqJl8H4z+IvlYIibMEBlcA+KO/2fT80Qz3c303FibPJjxcz2OAYoXMwYXhSsfzJf5mSrCOrmFXTbw0g==
2251+
"@react-native-windows/[email protected].14":
2252+
version "0.63.14"
2253+
resolved "https://registry.yarnpkg.com/@react-native-windows/cli/-/cli-0.63.14.tgz#b077f2d090f2d63f2defa71926c4de77b0041ea8"
2254+
integrity sha512-RqKnAwrsA2aKqP4gYLktOrqorqvIiUMXUhe07GPh/GDzoizVgSjcgRD4x8hoxNXbU66fYFm+whvCBgfn88Ffpg==
22552255
dependencies:
22562256
"@react-native-windows/telemetry" "^0.63.5"
2257+
"@xmldom/xmldom" "^0.7.5"
22572258
chalk "^3.0.0"
22582259
cli-spinners "^2.2.0"
22592260
envinfo "^7.5.0"
@@ -2268,7 +2269,6 @@
22682269
username "^5.1.0"
22692270
uuid "^3.3.2"
22702271
xml-parser "^1.2.1"
2271-
xmldom "^0.5.0"
22722272
xpath "^0.0.27"
22732273

22742274
"@react-native-windows/telemetry@^0.63.5":
@@ -2794,6 +2794,11 @@
27942794
"@webassemblyjs/wast-parser" "1.9.0"
27952795
"@xtuc/long" "4.2.2"
27962796

2797+
"@xmldom/xmldom@^0.7.5":
2798+
version "0.7.5"
2799+
resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.5.tgz#09fa51e356d07d0be200642b0e4f91d8e6dd408d"
2800+
integrity sha512-V3BIhmY36fXZ1OtVcI9W+FxQqxVLsPKcNjWigIaa81dLC9IolJl5Mt4Cvhmr0flUnjSpTdrbMTSbXqYqV5dT6A==
2801+
27972802
"@xtuc/ieee754@^1.2.0":
27982803
version "1.2.0"
27992804
resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
@@ -11830,10 +11835,10 @@ react-native-safe-area-context@~3.0.7:
1183011835
resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-3.0.7.tgz#0f53de7a30d626d82936000f3f6db374ecc4b800"
1183111836
integrity sha512-dqhRTlIFe5+P1yxitj0C9XVUxLqOmjomeqzUSSY8sNOWVjtIhEY/fl4ZKYpAVnktd8dt3zl13XmJTmRmy3d0uA==
1183211837

11833-
react-native-test-app@^0.7.1:
11834-
version "0.7.1"
11835-
resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-0.7.1.tgz#b645500b4d028d284e47ce67f24f374f66681a8e"
11836-
integrity sha512-8atrCOP3NGPxZdE291PkBe+CXIX+NLFCERPXeGBMDg/9uDtgjwqKZAHElX2zl92c628FlVzQwImiSab3fyOJ0g==
11838+
react-native-test-app@^0.9.0:
11839+
version "0.9.0"
11840+
resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-0.9.0.tgz#fd8669fd34703a02bfdab9ba7a98268002cc2fa4"
11841+
integrity sha512-HMI15lJqWZEOA1O5VvzxYG7mEzuKhkztxarWqVibUhcgOsK3U8fidq2+b18E1BiFpaDI+4zppkib/+/5LTjReQ==
1183711842
dependencies:
1183811843
chalk "^4.1.0"
1183911844
prompts "^2.4.0"
@@ -11857,13 +11862,13 @@ react-native-web@~0.12.0:
1185711862
prop-types "^15.6.0"
1185811863
react-timer-mixin "^0.13.4"
1185911864

11860-
react-native-windows@^0.63.18:
11861-
version "0.63.36"
11862-
resolved "https://registry.yarnpkg.com/react-native-windows/-/react-native-windows-0.63.36.tgz#ae0ed33c89c9e09dfd982da18bb1ecba35381841"
11863-
integrity sha512-Av7edpOu+YdKosMlpCWTGe8eXXNk0M4cd9zLKgeSiCOsTia/3qJM/xs/dZcP5gmjH6EWlAMSgtRC8frljPJnNQ==
11865+
react-native-windows@^0.63.41:
11866+
version "0.63.41"
11867+
resolved "https://registry.yarnpkg.com/react-native-windows/-/react-native-windows-0.63.41.tgz#96f59bc24749b6c167cb4f35fd74b66f78f4a4bb"
11868+
integrity sha512-AhLQP0dzX4jhtv9AsR5KF+BIlccKKPzTSmivg3ZUirqQxXwDDMjtIGwgFnp1WyH8cFoUEvpuyNnHsU3f7LxEyg==
1186411869
dependencies:
1186511870
"@babel/runtime" "^7.8.4"
11866-
"@react-native-windows/cli" "0.63.12"
11871+
"@react-native-windows/cli" "0.63.14"
1186711872
abort-controller "^3.0.0"
1186811873
anser "^1.4.9"
1186911874
base64-js "^1.1.2"
@@ -14711,16 +14716,16 @@ xmldoc@^1.1.2:
1471114716
dependencies:
1471214717
sax "^1.2.1"
1471314718

14714-
xmldom@^0.5.0, xmldom@~0.5.0:
14715-
version "0.5.0"
14716-
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
14717-
integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
14718-
1471914719
xmldom@^0.6.0:
1472014720
version "0.6.0"
1472114721
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
1472214722
integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==
1472314723

14724+
xmldom@~0.5.0:
14725+
version "0.5.0"
14726+
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
14727+
integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
14728+
1472414729
xpath@^0.0.27:
1472514730
version "0.0.27"
1472614731
resolved "https://registry.yarnpkg.com/xpath/-/xpath-0.0.27.tgz#dd3421fbdcc5646ac32c48531b4d7e9d0c2cfa92"

0 commit comments

Comments
 (0)