Skip to content

Commit

Permalink
fix(windows): declare support for react-native-windows 0.71 (#1254)
Browse files Browse the repository at this point in the history
  • Loading branch information
tido64 committed Jan 20, 2023
1 parent 42e062b commit 908d452
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 274 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion example/windows/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*.sln.docstates

# Build results
ARM/
ARM64/
AppPackages/
[Bb]in/
Expand Down
31 changes: 1 addition & 30 deletions example/windows/ReactTestAppTests/ReactTestAppTests.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
Expand Down Expand Up @@ -70,28 +62,7 @@
<ReactTestAppDir Condition="'$(ReactTestAppDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\react-native-test-app\package.json'))\node_modules\react-native-test-app\windows\ReactTestApp\</ReactTestAppDir>
<ReactTestAppProjectDir Condition="'$(ReactTestAppProjectDir)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(SolutionDir), 'node_modules\.generated\windows\ReactTestApp\ReactTestApp.vcxproj'))\node_modules\.generated\windows\ReactTestApp\</ReactTestAppProjectDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PropertyGroup>
<IncludePath>$(ReactTestAppDir);$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down
1 change: 0 additions & 1 deletion windows/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
*.sln.docstates

# Build results
ARM/
ARM64/
AppPackages/
[Bb]in/
Expand Down
200 changes: 0 additions & 200 deletions windows/ReactTestApp.sln

This file was deleted.

0 comments on commit 908d452

Please sign in to comment.