Skip to content

Commit

Permalink
fix: dynamic pathing for windows, fixes #357 (#608)
Browse files Browse the repository at this point in the history
@mikehardy, 

## Description

This is the required change that is necessary for windows to resolve the reference path in different environments (outside of visual studio which automatically resolves references).

## Compatibility

| OS      | Implemented |
| ------- | :---------: |
| iOS     |    ❌     |
| Android |    ❌     |
| Windows |    ✅     |

## Checklist

<!-- Check completed item: [X] -->

* [ ] I have tested this on a device/simulator for each compatible OS
* [ ] I added the documentation in `README.md`
* [x] I mentioned this change in `CHANGELOG.md`
* [ ] I updated the typings files (`deviceinfo.d.ts`, `deviceinfo.js.flow`)
* [ ] I updated the web polyfill (`web/index.js`)
  • Loading branch information
Brynjulf authored and mikehardy committed Mar 28, 2019
1 parent 018bb99 commit 10fc5f8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* fix: Use API-specific permissions to get phone number (https://github.com/react-native-community/react-native-device-info/pull/269)
* fix: Add OnePlus A6010 to devicesWithNothc list (https://github.com/react-native-community/react-native-device-info/pull/604)
* fix: use reactContext vs getApplicationContext() (https://github.com/react-native-community/react-native-device-info/pull/382)
* fix: dynamic reference path on windows depending on environment (https://github.com/react-native-community/react-native-device-info/pull/608)

### 1.1.0
* Add `supportedABIs()` (https://github.com/react-native-community/react-native-device-info/pull/598)
Expand Down
6 changes: 5 additions & 1 deletion windows/RNDeviceInfo/RNDeviceInfo.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReactWindowsRoot>..\..\node_modules</ReactWindowsRoot>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' != 'Development'">
<ReactWindowsRoot>..\..\..</ReactWindowsRoot>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -117,7 +121,7 @@
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\react-native-windows\ReactWindows\ReactNative\ReactNative.csproj">
<ProjectReference Include="$(ReactWindowsRoot)\react-native-windows\ReactWindows\ReactNative\ReactNative.csproj">
<Project>{c7673ad5-e3aa-468c-a5fd-fa38154e205c}</Project>
<Name>ReactNative</Name>
</ProjectReference>
Expand Down

0 comments on commit 10fc5f8

Please sign in to comment.