From d1c126160cb3ca03539e3561b4705a7ec26b9f2e Mon Sep 17 00:00:00 2001
From: Eric Rozell <erozell@outlook.com>
Date: Thu, 23 Feb 2017 11:49:11 -0500
Subject: [PATCH] chore(Yoga): upgrade Facebook.Yoga to 1.1.0.23-pre (#1029)

---
 ReactWindows/Playground.Net46/Playground.Net46.csproj    | 6 +++---
 ReactWindows/Playground.Net46/packages.config            | 2 +-
 ReactWindows/Playground/Playground.nuget.targets         | 9 ---------
 ReactWindows/Playground/project.json                     | 2 +-
 .../ReactNative.Net46.Tests.csproj                       | 6 +++---
 ReactWindows/ReactNative.Net46.Tests/packages.config     | 2 +-
 ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj  | 7 ++++---
 ReactWindows/ReactNative.Net46/packages.config           | 2 +-
 .../ReactNative.Tests/ReactNative.Tests.nuget.targets    | 9 ---------
 ReactWindows/ReactNative.Tests/project.json              | 2 +-
 ReactWindows/ReactNative/ReactNative.nuget.targets       | 9 ---------
 ReactWindows/ReactNative/project.json                    | 2 +-
 12 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 ReactWindows/Playground/Playground.nuget.targets
 delete mode 100644 ReactWindows/ReactNative.Tests/ReactNative.Tests.nuget.targets
 delete mode 100644 ReactWindows/ReactNative/ReactNative.nuget.targets

diff --git a/ReactWindows/Playground.Net46/Playground.Net46.csproj b/ReactWindows/Playground.Net46/Playground.Net46.csproj
index b362cc7c7b0..918fe4c1ced 100644
--- a/ReactWindows/Playground.Net46/Playground.Net46.csproj
+++ b/ReactWindows/Playground.Net46/Playground.Net46.csproj
@@ -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" />
@@ -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.
diff --git a/ReactWindows/Playground.Net46/packages.config b/ReactWindows/Playground.Net46/packages.config
index b5686bb442f..facec825fbf 100644
--- a/ReactWindows/Playground.Net46/packages.config
+++ b/ReactWindows/Playground.Net46/packages.config
@@ -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>
\ No newline at end of file
diff --git a/ReactWindows/Playground/Playground.nuget.targets b/ReactWindows/Playground/Playground.nuget.targets
deleted file mode 100644
index 2209a0e5dd0..00000000000
--- a/ReactWindows/Playground/Playground.nuget.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets" Condition="Exists('$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/ReactWindows/Playground/project.json b/ReactWindows/Playground/project.json
index 0bed8b7162d..8ec5ec31e46 100644
--- a/ReactWindows/Playground/project.json
+++ b/ReactWindows/Playground/project.json
@@ -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",
diff --git a/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj b/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj
index a01244432dc..40d4bee0049 100644
--- a/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj
+++ b/ReactWindows/ReactNative.Net46.Tests/ReactNative.Net46.Tests.csproj
@@ -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">
@@ -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>
\ No newline at end of file
diff --git a/ReactWindows/ReactNative.Net46.Tests/packages.config b/ReactWindows/ReactNative.Net46.Tests/packages.config
index 17762a5ac27..5caf0bee950 100644
--- a/ReactWindows/ReactNative.Net46.Tests/packages.config
+++ b/ReactWindows/ReactNative.Net46.Tests/packages.config
@@ -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" />
diff --git a/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj b/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj
index 8a23c0ef3fa..9d9aff07740 100644
--- a/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj
+++ b/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj
@@ -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">
@@ -215,9 +215,10 @@
     <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">
@@ -225,4 +226,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/ReactWindows/ReactNative.Net46/packages.config b/ReactWindows/ReactNative.Net46/packages.config
index 9956b16f09c..1de82edd0b2 100644
--- a/ReactWindows/ReactNative.Net46/packages.config
+++ b/ReactWindows/ReactNative.Net46/packages.config
@@ -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" />
diff --git a/ReactWindows/ReactNative.Tests/ReactNative.Tests.nuget.targets b/ReactWindows/ReactNative.Tests/ReactNative.Tests.nuget.targets
deleted file mode 100644
index 2209a0e5dd0..00000000000
--- a/ReactWindows/ReactNative.Tests/ReactNative.Tests.nuget.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets" Condition="Exists('$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/ReactWindows/ReactNative.Tests/project.json b/ReactWindows/ReactNative.Tests/project.json
index e1a7699b248..c69d161645a 100644
--- a/ReactWindows/ReactNative.Tests/project.json
+++ b/ReactWindows/ReactNative.Tests/project.json
@@ -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"
diff --git a/ReactWindows/ReactNative/ReactNative.nuget.targets b/ReactWindows/ReactNative/ReactNative.nuget.targets
deleted file mode 100644
index 2209a0e5dd0..00000000000
--- a/ReactWindows/ReactNative/ReactNative.nuget.targets
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
-    <NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-  </PropertyGroup>
-  <ImportGroup>
-    <Import Project="$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets" Condition="Exists('$(NuGetPackageRoot)\Facebook.Yoga\1.1.0.18-pre\build\uap10.0\Facebook.Yoga.targets')" />
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/ReactWindows/ReactNative/project.json b/ReactWindows/ReactNative/project.json
index ba08f48c8a2..3a9fd02f987 100644
--- a/ReactWindows/ReactNative/project.json
+++ b/ReactWindows/ReactNative/project.json
@@ -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",