From 9903a20cbad8965bcb27d80dffbdbd6874879b5a Mon Sep 17 00:00:00 2001 From: Andrew Forster Date: Mon, 19 Dec 2016 14:10:16 -0800 Subject: [PATCH] Move Windows related code to its own sub-folder --- .../Facebook.Yoga.Shared.projitems | 36 +++++++ .../Facebook.Yoga/Facebook.Yoga.Shared.shproj | 13 +++ .../Build/Facebook.Yoga.NativeInterop.targets | 2 +- .../Facebook.Yoga.Desktop.Tests.csproj | 6 +- .../Properties/AssemblyInfo.cs | 0 .../packages.config | 0 .../{ => Windows}/Facebook.Yoga.Desktop.sln | 57 +++++----- .../Assets/LockScreenLogo.scale-200.png | Bin 1430 -> 1430 bytes .../Assets/SplashScreen.scale-200.png | Bin 0 -> 7700 bytes .../Assets/Square150x150Logo.scale-200.png | Bin 2937 -> 2937 bytes .../Assets/Square44x44Logo.scale-200.png | Bin 1647 -> 1647 bytes ...x44Logo.targetsize-24_altform-unplated.png | Bin 1255 -> 1255 bytes .../Assets/StoreLogo.png | Bin 1451 -> 1451 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 0 -> 3204 bytes .../Facebook.Yoga.Universal.Tests.csproj | 7 +- .../Package.appxmanifest | 8 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/UnitTestApp.rd.xml | 0 .../UnitTestApp.xaml | 0 .../UnitTestApp.xaml.cs | 0 .../YogaNodeTest.cs | 0 .../project.json | 0 .../{ => Windows}/Facebook.Yoga.Universal.sln | 92 ++++++++-------- csharp/{ => Windows}/Facebook.Yoga.sln | 100 +++++++++--------- .../Facebook.Yoga/Facebook.Yoga.csproj | 24 +---- .../Facebook.Yoga/Properties/AssemblyInfo.cs | 0 .../{ => Windows}/Facebook.Yoga/project.json | 0 csharp/nuget/Facebook.Yoga.nuspec | 14 +-- .../Assets/SplashScreen.scale-200.png | Bin 7700 -> 0 bytes .../Assets/Wide310x150Logo.scale-200.png | Bin 3204 -> 0 bytes .../Facebook.Yoga.Shared.Tests.projitems | 2 +- .../Facebook.Yoga.Shared.Tests.shproj | 2 +- 32 files changed, 192 insertions(+), 175 deletions(-) create mode 100644 csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems create mode 100644 csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj rename csharp/{ => Windows}/Build/Facebook.Yoga.NativeInterop.targets (99%) rename csharp/{tests => Windows}/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj (95%) rename csharp/{tests => Windows}/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs (100%) rename csharp/{tests => Windows}/Facebook.Yoga.Desktop.Tests/packages.config (100%) rename csharp/{ => Windows}/Facebook.Yoga.Desktop.sln (75%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png (86%) create mode 100644 csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png (60%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.scale-200.png (80%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (84%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png (86%) create mode 100644 csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj (96%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Package.appxmanifest (83%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs (91%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml (100%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml (100%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs (100%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs (100%) rename csharp/{tests => Windows}/Facebook.Yoga.Universal.Tests/project.json (100%) rename csharp/{ => Windows}/Facebook.Yoga.Universal.sln (58%) rename csharp/{ => Windows}/Facebook.Yoga.sln (64%) rename csharp/{ => Windows}/Facebook.Yoga/Facebook.Yoga.csproj (84%) rename csharp/{ => Windows}/Facebook.Yoga/Properties/AssemblyInfo.cs (100%) rename csharp/{ => Windows}/Facebook.Yoga/project.json (100%) delete mode 100644 csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png delete mode 100644 csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems new file mode 100644 index 00000000..708ce7d2 --- /dev/null +++ b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.projitems @@ -0,0 +1,36 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + 91c42d32-291d-4b72-90b4-551663d60b8b + + + Facebook.Yoga.Shared + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj new file mode 100644 index 00000000..6d2da463 --- /dev/null +++ b/csharp/Facebook.Yoga/Facebook.Yoga.Shared.shproj @@ -0,0 +1,13 @@ + + + + 91c42d32-291d-4b72-90b4-551663d60b8b + 14.0 + + + + + + + + diff --git a/csharp/Build/Facebook.Yoga.NativeInterop.targets b/csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets similarity index 99% rename from csharp/Build/Facebook.Yoga.NativeInterop.targets rename to csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets index 00d0ba90..9681d324 100644 --- a/csharp/Build/Facebook.Yoga.NativeInterop.targets +++ b/csharp/Windows/Build/Facebook.Yoga.NativeInterop.targets @@ -1,7 +1,7 @@ - $(SolutionDir)Yoga\bin\ + $(SolutionDir)..\Yoga\bin\ $(NativeRootPath)x86\ $(NativeRootPath)x64\ $(NativeRootPath)ARM\ diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj similarity index 95% rename from csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj index 5f18c30a..f37faf07 100644 --- a/csharp/tests/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj +++ b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Facebook.Yoga.Desktop.Tests.csproj @@ -70,7 +70,7 @@ - ..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll + ..\packages\NUnit.2.6.4\lib\nunit.framework.dll True @@ -83,7 +83,7 @@ - + {3aace384-fdec-4d91-a3b2-eeb21b46c9ad} Facebook.Yoga @@ -91,7 +91,7 @@ - + diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs b/csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from csharp/tests/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs diff --git a/csharp/tests/Facebook.Yoga.Desktop.Tests/packages.config b/csharp/Windows/Facebook.Yoga.Desktop.Tests/packages.config similarity index 100% rename from csharp/tests/Facebook.Yoga.Desktop.Tests/packages.config rename to csharp/Windows/Facebook.Yoga.Desktop.Tests/packages.config diff --git a/csharp/Facebook.Yoga.Desktop.sln b/csharp/Windows/Facebook.Yoga.Desktop.sln similarity index 75% rename from csharp/Facebook.Yoga.Desktop.sln rename to csharp/Windows/Facebook.Yoga.Desktop.sln index 0c1fb81c..5738d062 100644 --- a/csharp/Facebook.Yoga.Desktop.sln +++ b/csharp/Windows/Facebook.Yoga.Desktop.sln @@ -3,36 +3,33 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}" ProjectSection(ProjectDependencies) = postProject {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "tests\Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}" - ProjectSection(SolutionItems) = preProject - NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec - NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets - Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets - NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec - NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13 - tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4 + ..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13 + ..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -46,7 +43,6 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64 @@ -54,7 +50,8 @@ Global {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|Win32 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32 @@ -69,21 +66,24 @@ Global {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|x86 + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86 - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|x86 - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|x86 + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86 @@ -94,8 +94,9 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2} + {91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2} - {320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45} + {4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45} EndGlobalSection EndGlobal diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png similarity index 86% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/LockScreenLogo.scale-200.png index 735f57adb5dfc01886d137b4e493d7e97cf13af3..428cabb6d4d90c813a047d943ad15481b8d875a9 100644 GIT binary patch delta 165 zcmbQnJ&k*UNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8Z$AWs*^kPPRy=Qr{mFyJ|0VE+IA8@->69141~zP^38=gl3v)r@P2g;GF;+0WPo blbK`fmws~w8qeVA>gTe~DWPfO-kU4{TFE-E delta 165 zcmbQnJ&k*UO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_tJq%#etZ z2wxwo2(s|s5su)$V9Hc&iKUuoms Gn=AlDk2ygA diff --git a/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..d1937479a72894c367fbe8c74fa7905b1cca46d0 GIT binary patch literal 7700 zcmeHM`&X0a9e)Be;w3BuWg5Hy;nHfWv>3`9Xix}51<}ze`qmT6_3RZe1uLsoUqo!u z4F^?zbn28TV7JdVVgJC+>HH;}!yCRl z&*$^~d@s-Q4Z)I`k*b)Wp1>GW7}AngG3M9Dn9mx2IeufiyzT&AWTmT87c=X*>9=6` z6(pr6G4_YwP8{9v0_^dd(y~h#3;2eP?39t7`Q;JpsL6Tv$Tz0=S;4ZYLQI}N?l z&^ryi)6hE&|A%Q<5IgI!b=;AL#ECQL9yO$7BwH67cOEL()fHuxv8*VYjP+iMZME?D z=)->_V~>mK?zXGjM|RXdYyYP&>y5;QuO1xfJ~{B@?2Z$ItLxuC^;E`g2jcUQ+ap7H z?SCBPXI%TCV^5cyW$qR6kb1Uu6>23t(9*Yd|;46xAR)1HkxX{n*n!{M(4>Rh){ ziVF{6qQM7`pEbJN^zlickGJM=BhT{wef9pA7Q{JjJRY52)$o7))8I(`v#-A^m<-ne zL^50zQpR>rF+PRvDYL6kO#kTetx;2z*KEy^u&xgdLQ?=xn*S5pQCt6mH#q>^ew?@D(%PMhSe0b``nQvxvA1IcttG zRr3Uy0?45h?)pr~Pg?@wUn-@(C6K?0;{S_7TZ3c>ZZ8Ixx&Q?bdkH_;RP7H)!#-s8 zqfqP0op8CF!vD;nT}obVk^EhDy#n%M$V>b(?(-;u>;~kMFzZD(gkq^tNreWu+)Wuv zHS>=`A$bX9?1V%69+7RJjLmeZH6$jC3=IraM);1pArS^``#l-2z@RK|AVcd?$GS0O zbUL*8l(VZu@Bs{}%v)sWxtx6Hyig5kZ5nG`1)?dV)^MpC&4{BEMQTasG#cnH#9ZEyM*5?VAL-L=d@2f$TS{ke7!+ zk~0y!FJ^%ETZgus+Ui3b=+Jp4MKMM4HWJ=t;3_)_;!lu3$+!p*f8;3irzS-W?NZW$ zQgS9>AwC^k(;ZqfE&KxTh9+_0b%zb%!o=nqPBV+xr-TRQVf%u!*DYdZmv_lSCcWY<$yyw zmF})K+$W;_+Nq=GoA4V-$tdL~M=Y?X;L2W~FmDo4S)W*0o( zweYq8B8DK{I+wa76n+d3oot&WI0v$9pGPv_b5zI-87e4Ng5Br zyE#Y_R>4a{Eg-MD)R`ZHcn|JYXM#y_2)BtqUN+U(<-KSjF#?eI49<5gPJqz|E~jg( zvLkRA6OT*`fowgMO4x}6W9o>r;e9h8 zSp@MhDV&XfOaUYp8E@;2Z9QSy&R%=?lK`Q|p%v~N>l&K1;{1cdRa^eC?VDS&uCCYn zSl8|SD_m+ZG4bS|hvuCN(COhL``IG{=UaY|T7mAy*5OWh3DPEqD?iAlwC7TBsh*vX zt;Yh5BoURWB@Hx^Y-p4g9Vlod^`#;PK-?oK0dJb-AZ+(Yx`*QIML_P6bR6%Xz~w$* zNR+r022CW9hryF^|MYm~tXjkk?dksEY3q*C0AclZQ@=EKr1vG{9D3%x|G2g3=f3!l zQ+<=!2k+M0D)CCg5MO?fhA$-z^#9vpo5_dCA6SCmG4`P%js*BWxp8;kxRrin(NE>i kPuugzhu7zGYQ!HY@uP1DG8Wf;Y3aNw?Oy8W|Ne>eA1lu8Pyhe` literal 0 HcmV?d00001 diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png similarity index 60% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Square150x150Logo.scale-200.png index af49fec1a5484db1d52a7f9b5ec90a27c7030186..eb507ab9ce4c7a3f916b4b5f0edd7f2dea44cd7a 100644 GIT binary patch delta 1097 zcmew<_ET(vNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)6l1%y^dG)UC za2-Simr}$@P@HsA936CU(M26x1VIsWP$;_TAildc(m|T(eP4dx@B4lKeog$ESk3kK zixVwzj{BlZ6E;%zc$+D;kj}COqu%1>muz}uWY^W8*%Gb#Y1`$YMh6(J7sexlZ~9m- zrf!D`rOjr8sHCnxeWogbS5nUx>P9`Tu({ymQo_zHooTvD9hZ3Ov7^d#&z1xs6Md@m z!ucq*dnI*9Y|FRwQ(aYt7||)I8>(9M8KuG#rWCXya1CfGm}sz2!~{<%NZPt#>Bs;E zu?unM+zFbxw%b*86(5+ts>xjVH4@B!uV&(h&j@0@B4u&>o1= zLm7p`Qa1@=5%5SEP|`ME5G7Sg-KZgq>-CITkJ8On$)@Q&8tYIq^e`M0HbkeQ!TkRA z@U*!YGrhr5zL2tf+TDEWd&;d}&vCk%foC}?IxVsRtNYtE?D*tF+;Mth=eT)oL z0LViW6kU@7;v)}01ltI@R>81vM)W^|D$bi2=5f_P4umI6Qbvvgk5|iiQZ@7CN)}s- zQb8k^Wyu4Xd>Gq@`Qo<0b|qm{@TAH4e6|TQb6oIrj>k%+GMv0}_b8D_-r^AKPkV?a%l0b)W7+7>Q)g(9?yrloEYcw1Vyv8>V~ zD~U5bwq?4+wGaWmfiQrOnV?Ou2|R+_w#SI?vZAU>jrw4H)U;^=9HVg_uoIft{*7xyZ-6NtG!N;o1EEkfAq#3E%~^5FxfMH zYvsYpwZ=}XGxl}$UhYL_{m+->i-Ds}eSZA)tyTJY_uZAJ;o7Y?m&S5CPOYs>jGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8Z$8=fwXAr*0NFDztaP~bVR;oyIJ{=?jby({0}yxUn^-)th0ZE!7N&B2J~jcm!h w$E12p@d(rtRzg!1iU_v`8}r|FVqV*R+3*L@mkge+elF{r5}GzUGwQGc0M1Ety8r+H delta 301 zcmXYrKTg9i7{!ASTQ9(7EXF2wT+(1Gp+YGLB!W;|iL7qorcuZrQcH2Obm0Kpg^_`o z)8q=crEmJ)r=Q+?{h%LwUhdB2T_oq#O18Wa#%)q91$ZoYDrSNw+xK7L8OG^HwuodD zKC!qeEWT$fRn*2_-bB?r&V>X^k!Gb2`|lqJvc!k4PKd)g5bNxrYs9>JUc_A<(*#a# zfTx%aD1_W`po+J0!;}vX!A#%!&k+O%M&>^JUloNfAgCGv9BXXG*uDZTwQOhXQg;Z5 z_6T1if=x`BGhqoA&9k`GZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLeNPw15D)LSXBC+k6d0Nhy!`*)rhD#|W1>pSbEmy~-^2Wb!P0?m0+@R2_=$mg k7qjjkrq|j)tqh*7elF{r5}Ir(tSWK~a#Kq-E_Pu70B|KR1ONa4 delta 138 zcmaFP`J8itO1)%>YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_tJq%#etZ z2wxwog3IG5A diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png similarity index 86% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/StoreLogo.png index 7385b56c0e4d3c6b0efe3324aa1194157d837826..8f628550d6f61aeef39eeb290f2269afe95f4fc0 100644 GIT binary patch delta 170 zcmZ3@y_$Q1NGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8Z$a8DPD9QM))Qz5F@YeY$Kep*R+Vo@rCV@iHfs)A>3VtQ&&YGO)d;mK4R1_tJq%#etZ z2wxwo2(s|s5su)$V9Hc&iKUr7O^ JX5*okEC7ITJ3IgY diff --git a/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png b/csharp/Windows/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png new file mode 100644 index 0000000000000000000000000000000000000000..6429d98629ca3d8438f6130a9bcd67df2c91bdd6 GIT binary patch literal 3204 zcmeHJe@v8R9RI#>+<G;bCG?gZ+ z3BcR>z^&3K#4**`MYRAA4v|0V+s#Mc0EiNE%%+#OzIG*;LIE2$;AyBIzGyPHUixfj z$GHT6{>fDU8=7cfPkSivKgxlSI-~_%iJ*j+ z!>wNwX6ArdnoN;e^~&n|_|UX)L@Z%INsaVm(h(M!0DnO#Fgjk&3=LhfkgS?%uCuUV ze=((dMhZUM=kytmjbCjhSK;5&$5h-nMec5NeW-h7{RvxS#j|9 zNy1c~$O?VYFfpOP-gV0E6`#bMec z(HJ0AX}rl2+I+wU%?wh|ioKI-9j|AR@6m5IPUrvfob|-MiCr9f==efd*4#TqYc1o6 zRUv!vy7M=WKw|Zvc6Um!ZS0-1wzN0#4hCAvtv+lK)^yK23;b<%wB{RadMDmrw$9Os z9Rx9D_i`3{Rkrv0VXl9P6wMUeK8xG|VE5ce<)UE(;;aKK@wcf(zGdEv+Y{%uAL2a4U{ZlLV7!g2`gAM9bAgh9J zR=yN(6VVEZwcE)+n?mPVWsgea|4FCYFJ;4|j}WFR?| z`eaK2W;Yw~1&bV!BGczmSFG3HHnns%IGIf($(>yHi^mrVw(<`HeJvhmS9jWUdY(&< zmM^Z64*EwNUYw8S-XqZ3uO%^Qqyqgl5-%pAKYaP8fBfxdg}=);MZq7t z^!R`Bg-y UcXQbQB(_cN%ozFFI`;?ZAE!g|jsO4v literal 0 HcmV?d00001 diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj b/csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj similarity index 96% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj index de5f710d..d83cf0d9 100644 --- a/csharp/tests/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj +++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Facebook.Yoga.Universal.Tests.csproj @@ -4,7 +4,7 @@ Debug x86 - {0856757B-1671-4E43-AF41-4AEA53988796} + {0C76D2FE-6767-44FE-B03D-21B2076BAA73} AppContainerExe Properties Facebook.Yoga.Universal.Tests @@ -124,14 +124,11 @@ - + {3aace384-fdec-4d91-a3b2-eeb21b46c9ad} Facebook.Yoga - - - 14.0 diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest b/csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest similarity index 83% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest index a12355dc..d4ec072f 100644 --- a/csharp/tests/Facebook.Yoga.Universal.Tests/Package.appxmanifest +++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Package.appxmanifest @@ -5,15 +5,15 @@ xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> - - + Facebook.Yoga.Universal.Tests - blue + anforste Assets\StoreLogo.png diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs similarity index 91% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs index 719f6a3c..2f35c3d3 100644 --- a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs +++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/AssemblyInfo.cs @@ -8,9 +8,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("Facebook.Yoga.Universal.Tests")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("BlueJeans")] [assembly: AssemblyProduct("Facebook.Yoga.Universal.Tests")] -[assembly: AssemblyCopyright("Copyright © 2016")] +[assembly: AssemblyCopyright("Copyright © BlueJeans 2016")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: AssemblyMetadata("TargetPlatform","UAP")] diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml b/csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml similarity index 100% rename from csharp/tests/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml rename to csharp/Windows/Facebook.Yoga.Universal.Tests/Properties/UnitTestApp.rd.xml diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml b/csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml similarity index 100% rename from csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml rename to csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs similarity index 100% rename from csharp/tests/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs rename to csharp/Windows/Facebook.Yoga.Universal.Tests/UnitTestApp.xaml.cs diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs b/csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs similarity index 100% rename from csharp/tests/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs rename to csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/project.json b/csharp/Windows/Facebook.Yoga.Universal.Tests/project.json similarity index 100% rename from csharp/tests/Facebook.Yoga.Universal.Tests/project.json rename to csharp/Windows/Facebook.Yoga.Universal.Tests/project.json diff --git a/csharp/Facebook.Yoga.Universal.sln b/csharp/Windows/Facebook.Yoga.Universal.sln similarity index 58% rename from csharp/Facebook.Yoga.Universal.sln rename to csharp/Windows/Facebook.Yoga.Universal.sln index a55c0466..6fadb752 100644 --- a/csharp/Facebook.Yoga.Universal.sln +++ b/csharp/Windows/Facebook.Yoga.Universal.sln @@ -3,35 +3,32 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}" ProjectSection(ProjectDependencies) = postProject {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" -EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}" - ProjectSection(SolutionItems) = preProject - NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec - NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets - Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets - NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec - NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4 + ..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,7 +42,6 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64 @@ -53,7 +49,8 @@ Global {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|Win32 + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM + {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.Build.0 = Release|x64 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x86.ActiveCfg = Release|Win32 @@ -68,44 +65,41 @@ Global {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.Deploy.0 = Debug|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.ActiveCfg = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Build.0 = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Deploy.0 = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.ActiveCfg = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Build.0 = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Deploy.0 = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.ActiveCfg = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Build.0 = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Deploy.0 = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Build.0 = Release|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Deploy.0 = Release|Any CPU - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.ActiveCfg = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Build.0 = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Deploy.0 = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.ActiveCfg = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Build.0 = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Deploy.0 = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.ActiveCfg = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Build.0 = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Deploy.0 = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2} + {91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2} - {320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45} - {0856757B-1671-4E43-AF41-4AEA53988796} = {5289E508-8386-45A1-A12B-258A5899CD45} + {4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} + {0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45} EndGlobalSection EndGlobal diff --git a/csharp/Facebook.Yoga.sln b/csharp/Windows/Facebook.Yoga.sln similarity index 64% rename from csharp/Facebook.Yoga.sln rename to csharp/Windows/Facebook.Yoga.sln index a9ae1dc7..5326a92a 100644 --- a/csharp/Facebook.Yoga.sln +++ b/csharp/Windows/Facebook.Yoga.sln @@ -3,38 +3,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga", "..\Yoga\Yoga.vcxproj", "{0446C86B-F47B-4C46-B673-C7AE0CFF35D5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{39A2FFDA-C093-4FA6-8143-45B5019E7DAC}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga", "Facebook.Yoga\Facebook.Yoga.csproj", "{3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}" ProjectSection(ProjectDependencies) = postProject {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{5289E508-8386-45A1-A12B-258A5899CD45}" +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{4EDC82D9-A201-4831-8FE0-98F468F8E4AE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{51A8E803-C084-431F-9130-F277481C2BB2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}" EndProject -Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared.Tests", "tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.shproj", "{320EB7B7-CE99-4382-B145-BDD49F33C7B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NETStandard", "NETStandard", "{DCF7899B-A487-49C0-BCDE-DC088B6750C2}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Desktop.Tests", "tests\Facebook.Yoga.Desktop.Tests\Facebook.Yoga.Desktop.Tests.csproj", "{AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EA552E8A-0245-4614-84D6-DFC5C582004B}" - ProjectSection(SolutionItems) = preProject - NuGet\Facebook.Yoga.Native.nuspec = NuGet\Facebook.Yoga.Native.nuspec - NuGet\Facebook.Yoga.Native.targets = NuGet\Facebook.Yoga.Native.targets - Build\Facebook.Yoga.NativeInterop.targets = Build\Facebook.Yoga.NativeInterop.targets - NuGet\Facebook.Yoga.nuspec = NuGet\Facebook.Yoga.nuspec - NuGet\Facebook.Yoga.targets = NuGet\Facebook.Yoga.targets - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "tests\Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0856757B-1671-4E43-AF41-4AEA53988796}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal.Tests", "Facebook.Yoga.Universal.Tests\Facebook.Yoga.Universal.Tests.csproj", "{0C76D2FE-6767-44FE-B03D-21B2076BAA73}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{320eb7b7-ce99-4382-b145-bdd49f33c7b2}*SharedItemsImports = 13 - tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{3aace384-fdec-4d91-a3b2-eeb21b46c9ad}*SharedItemsImports = 4 + ..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{4edc82d9-a201-4831-8fe0-98f468f8e4ae}*SharedItemsImports = 13 + ..\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13 + ..\tests\Facebook.Yoga\Facebook.Yoga.Shared.Tests.projitems*{ac23f444-5545-4196-8b9f-5c1f6b3e7fb3}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -48,7 +45,6 @@ Global EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|Any CPU.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.ActiveCfg = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|ARM.Build.0 = Debug|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x64.ActiveCfg = Debug|x64 @@ -56,7 +52,6 @@ Global {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.ActiveCfg = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Debug|x86.Build.0 = Debug|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.ActiveCfg = Release|Win32 - {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|Any CPU.Build.0 = Release|Win32 {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.ActiveCfg = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|ARM.Build.0 = Release|ARM {0446C86B-F47B-4C46-B673-C7AE0CFF35D5}.Release|x64.ActiveCfg = Release|x64 @@ -73,55 +68,58 @@ Global {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Debug|x86.Build.0 = Debug|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.ActiveCfg = Release|Any CPU {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|Any CPU.Build.0 = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|Any CPU - {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|Any CPU + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.ActiveCfg = Release|ARM + {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|ARM.Build.0 = Release|ARM {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.ActiveCfg = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x64.Build.0 = Release|x64 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.ActiveCfg = Release|x86 {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD}.Release|x86.Build.0 = Release|x86 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|x86 + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.ActiveCfg = Debug|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|ARM.Build.0 = Debug|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.ActiveCfg = Debug|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x64.Build.0 = Debug|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.ActiveCfg = Debug|x86 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Debug|x86.Build.0 = Debug|x86 - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|x86 - {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|x86 + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|Any CPU.Build.0 = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.ActiveCfg = Release|Any CPU + {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|ARM.Build.0 = Release|Any CPU {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.ActiveCfg = Release|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x64.Build.0 = Release|x64 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.ActiveCfg = Release|x86 {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3}.Release|x86.Build.0 = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|Any CPU.ActiveCfg = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.ActiveCfg = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Build.0 = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|ARM.Deploy.0 = Debug|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.ActiveCfg = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Build.0 = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x64.Deploy.0 = Debug|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.ActiveCfg = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Build.0 = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Debug|x86.Deploy.0 = Debug|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.ActiveCfg = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|Any CPU.Build.0 = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.ActiveCfg = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Build.0 = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|ARM.Deploy.0 = Release|ARM - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.ActiveCfg = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Build.0 = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x64.Deploy.0 = Release|x64 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.ActiveCfg = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Build.0 = Release|x86 - {0856757B-1671-4E43-AF41-4AEA53988796}.Release|x86.Deploy.0 = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|Any CPU.ActiveCfg = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.ActiveCfg = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Build.0 = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|ARM.Deploy.0 = Debug|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.ActiveCfg = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Build.0 = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x64.Deploy.0 = Debug|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.ActiveCfg = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Build.0 = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Debug|x86.Deploy.0 = Debug|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|Any CPU.ActiveCfg = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.ActiveCfg = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Build.0 = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|ARM.Deploy.0 = Release|ARM + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.ActiveCfg = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Build.0 = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x64.Deploy.0 = Release|x64 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.ActiveCfg = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Build.0 = Release|x86 + {0C76D2FE-6767-44FE-B03D-21B2076BAA73}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {0446C86B-F47B-4C46-B673-C7AE0CFF35D5} = {51A8E803-C084-431F-9130-F277481C2BB2} + {91C42D32-291D-4B72-90B4-551663D60B8B} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} {3AACE384-FDEC-4D91-A3B2-EEB21B46C9AD} = {DCF7899B-A487-49C0-BCDE-DC088B6750C2} - {320EB7B7-CE99-4382-B145-BDD49F33C7B2} = {5289E508-8386-45A1-A12B-258A5899CD45} + {4EDC82D9-A201-4831-8FE0-98F468F8E4AE} = {39A2FFDA-C093-4FA6-8143-45B5019E7DAC} {AC23F444-5545-4196-8B9F-5C1F6B3E7FB3} = {5289E508-8386-45A1-A12B-258A5899CD45} - {0856757B-1671-4E43-AF41-4AEA53988796} = {5289E508-8386-45A1-A12B-258A5899CD45} + {0C76D2FE-6767-44FE-B03D-21B2076BAA73} = {5289E508-8386-45A1-A12B-258A5899CD45} EndGlobalSection EndGlobal diff --git a/csharp/Facebook.Yoga/Facebook.Yoga.csproj b/csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj similarity index 84% rename from csharp/Facebook.Yoga/Facebook.Yoga.csproj rename to csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj index 2ef3d80f..1fe5a144 100644 --- a/csharp/Facebook.Yoga/Facebook.Yoga.csproj +++ b/csharp/Windows/Facebook.Yoga/Facebook.Yoga.csproj @@ -99,31 +99,9 @@ - - - - - - - - - - - - - - - - - - - - - - - + - + - - + + - - + + - - + + diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png b/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/SplashScreen.scale-200.png deleted file mode 100644 index 023e7f1feda78d5100569825acedfd213a0d84e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7700 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 diff --git a/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png b/csharp/tests/Facebook.Yoga.Universal.Tests/Assets/Wide310x150Logo.scale-200.png deleted file mode 100644 index 288995b397fdbef1fb7e85afd71445d5de1952c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3204 zcmbVPeQXow8NYmBd90>}0NP?GhXW~VaeThm=a0tV#EwJMI!)6M3}|c4_Bl3=Kd>G0 z(GHx1wl<7(tP?FsOQkTilSo*iIvF%uArExJ73~P zSv1xEy!U(Wd4A9D`FQV@W3@F^qJ@PEF$@z`Z!*BbFsS(^?B zyiAzJ+q})bkgiQHWqEb*jJD-coHYr1^iocg)l!Qa{Xqs-l~6J}p-|##ZHYofskQ3$ zI0;xzXyhazBeXhIsg5A=%ufo@f)1yy&ScKS0;HF^!r_2UE^lpZEom(+@duma3awTv zCrCL-%D_SvYWIcdHkmI}#50(fkUi)Qgx!80ju>g1za^}ff>JI8Z@^-iCiaCgg@TgF z+vtE?Q9{VQUX&MW9SYYmGcxA14%N2@7FwBTD4N<(2{nWgV8$e3?-F=L^&FrtWn~(U_Q~~^uYiyeY6-KoTnfh9AWz@ zIKje0)u!_Lw)E}G!#kEfwKVdNt(UAf9*f>tEL_(=xco-T%jTi@7YlC3hs2ik%Le0H ztj}RTeCF(5mwvi3_56>-yB?l;J>-1%!9~=fs|QcNG3J~a@JCu`4SB460s0ZO+##4fFUSGLcj_ja^fL4&BKALfb#$6$O?>P@qx2Agl^x0i&ugt zsy5Pyu=()`7HRMG3IB7F1@`_ z+-!J%#i6e^U$e#+C%Q>_qVRzWRsG^W_n+@OcX@vzI&z;mzHNb!GQ?LWA(wtpqHqTM z1OFw_{Zn?fD)p)`c`kOgv{de=v@suGRqY{N^U7gI1VF3*F=obwaXI6ob5__Yn zVTguS!%(NI09J8x#AO_aW!9W7k*UvB;IWDFC3srwftr{kHj%g)fvnAm;&h_dnl~

MY- zf+K}sCe8qU6Ujs`3ua{U0Of$R_gVQBuUA za0v=mu#vIOqiiAZOr&h*$WyOw&k-xr$;G4Ixa!#TJNr>95(h>l%)PUy4p+^SgR(uR zta%k*?ny-+nAr8spEk1fo{J4i!b^Fia`N{_F6@zidA2ZTTrjl#^5Z-2KfB@Cu}l9s z(*|Z2jc?p~vn2f)3y9i*7zJV1L{$?|&q)4oaT;uXi6>1GkRXVTOzAz(RHEmr=eFIi z`}<>-Q?K0GN8!IYxeP1XKXO+jsJbp~o^);Bc;%b7Flpe7;1`Ny@3r7ZR;?R)aJt8C ziNlEC<@3f_lIV4TwV}&e;D!Ee5_|e#g0LUh=5vmYWYm7&2h*M>QPKvGh9-)wfMMW3 z8J9b%1k7dzPzO0_NGQy92BZ^FR6R~6;^6?lqO;-QUP4BY%cG%3vEhbm#>4vIhPBh3 z-+pZGjh$x%Hp{?=FHsMp0&wNPlj00us{&`1ZOZTqs8%4X&xH=UDr*xyBW(Zp&Em94 zf)ZSfn#yg0N)>!1kWdkqJ^S*z0FF5|fj&qcE#Na|%OY0$uO>!&hP+1ywfD_WXk@4J(?MBftK7>$Nvqh@tDuarN%PrTLQ2Uzysx>UV=V zk^RrDSvdQ?0;=hY67EgII-f4`t=+i*yS=Y~!XlqIy_4x&%+OdfbKOFPXS2X5%4R{N z$SQMX^AK6(fA $(MSBuildAllProjects);$(MSBuildThisFileFullPath) true - 320eb7b7-ce99-4382-b145-bdd49f33c7b2 + 4edc82d9-a201-4831-8fe0-98f468f8e4ae Facebook.Yoga.Shared.Tests diff --git a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj index 2ec37894..75c61845 100644 --- a/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj +++ b/csharp/tests/Facebook.Yoga/Facebook.Yoga.Shared.Tests.shproj @@ -1,7 +1,7 @@  - 320eb7b7-ce99-4382-b145-bdd49f33c7b2 + 4edc82d9-a201-4831-8fe0-98f468f8e4ae 14.0