Skip to content

Commit

Permalink
chore(Yoga): upgrade Facebook.Yoga to 1.1.0.23-pre (#1029)
Browse files Browse the repository at this point in the history
  • Loading branch information
rozele committed Mar 6, 2017
1 parent bee97a3 commit d1c1261
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 42 deletions.
6 changes: 3 additions & 3 deletions ReactWindows/Playground.Net46/Playground.Net46.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Facebook.Yoga, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Facebook.Yoga.1.1.0.18-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<HintPath>..\packages\Facebook.Yoga.1.1.0.23-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down Expand Up @@ -179,12 +179,12 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets')" />
<Import Project="..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets'))" />
<Error Condition="!Exists('..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion ReactWindows/Playground.Net46/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Facebook.Yoga" version="1.1.0.18-pre" targetFramework="net46" />
<package id="Facebook.Yoga" version="1.1.0.23-pre" targetFramework="net46" />
</packages>
9 changes: 0 additions & 9 deletions ReactWindows/Playground/Playground.nuget.targets

This file was deleted.

2 changes: 1 addition & 1 deletion ReactWindows/Playground/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Facebook.Yoga": "1.1.0.18-pre",
"Facebook.Yoga": "1.1.0.23-pre",
"Microsoft.ApplicationInsights": "2.2.0",
"Microsoft.ApplicationInsights.PersistenceChannel": "1.2.3",
"Microsoft.ApplicationInsights.WindowsApps": "1.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Facebook.Yoga, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Facebook.Yoga.1.1.0.18-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<HintPath>..\packages\Facebook.Yoga.1.1.0.23-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
Expand Down Expand Up @@ -148,11 +148,11 @@
</ItemGroup>
<Import Project="..\ReactNative.Shared.Tests\ReactNative.Shared.Tests.projitems" Label="Shared" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets'))" />
<Error Condition="!Exists('..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets'))" />
</Target>
<Import Project="..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets')" />
</Project>
2 changes: 1 addition & 1 deletion ReactWindows/ReactNative.Net46.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Facebook.Yoga" version="1.1.0.18-pre" targetFramework="net46" />
<package id="Facebook.Yoga" version="1.1.0.23-pre" targetFramework="net46" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
<package id="NMock3" version="3.5.44" targetFramework="net46" />
<package id="NUnit" version="3.5.0" targetFramework="net46" />
Expand Down
7 changes: 4 additions & 3 deletions ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Facebook.Yoga, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>$(SolutionDir)\packages\Facebook.Yoga.1.1.0.18-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<HintPath>$(SolutionDir)\packages\Facebook.Yoga.1.1.0.23-pre\lib\net45\Facebook.Yoga.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
Expand Down Expand Up @@ -215,14 +215,15 @@
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Facebook.Yoga.1.1.0.18-pre\build\net45\Facebook.Yoga.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\Microsoft.ChakraCore.1.4.1\build\netstandard1.0\Microsoft.ChakraCore.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\Microsoft.ChakraCore.1.4.1\build\netstandard1.0\Microsoft.ChakraCore.props'))" />
</Target>
<Import Project="$(SolutionDir)\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets" Condition="Exists('$(SolutionDir)\packages\Facebook.Yoga.1.1.0.23-pre\build\net45\Facebook.Yoga.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion ReactWindows/ReactNative.Net46/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Facebook.Yoga" version="1.1.0.18-pre" targetFramework="net46" />
<package id="Facebook.Yoga" version="1.1.0.23-pre" targetFramework="net46" />
<package id="Microsoft.ChakraCore" version="1.4.1" targetFramework="net46" developmentDependency="true" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
<package id="PCLStorage" version="1.0.2" targetFramework="net46" />
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion ReactWindows/ReactNative.Tests/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Facebook.Yoga": "1.1.0.18-pre",
"Facebook.Yoga": "1.1.0.23-pre",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"NUnit": "3.5.0",
"NUnit3TestAdapter": "3.5.0"
Expand Down
9 changes: 0 additions & 9 deletions ReactWindows/ReactNative/ReactNative.nuget.targets

This file was deleted.

2 changes: 1 addition & 1 deletion ReactWindows/ReactNative/project.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Facebook.Yoga": "1.1.0.18-pre",
"Facebook.Yoga": "1.1.0.23-pre",
"Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
"Microsoft.Toolkit.Uwp.UI": "1.3.1",
"Newtonsoft.Json": "9.0.1",
Expand Down

0 comments on commit d1c1261

Please sign in to comment.