Skip to content

Commit 81b4ac1

Browse files
rozelerozele
committed
feat(Yoga): point to Yoga submodule
1 parent a122c9f commit 81b4ac1

File tree

2 files changed

+69
-3
lines changed

2 files changed

+69
-3
lines changed

‎RNTester.sln

+60-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.26730.12
3+
VisualStudioVersion = 15.0.27130.2027
44
MinimumVisualStudioVersion = 10.0.40219.1
55
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RNTesterApp", "windows\RNTester\RNTesterApp.csproj", "{283F872F-7145-45A4-8EE0-4A6DB9FB2628}"
66
EndProject
@@ -12,9 +12,20 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReactNative.Shared", "..\Re
1212
EndProject
1313
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactNativeWebViewBridge", "..\ReactWindows\ReactNativeWebViewBridge\ReactNativeWebViewBridge.csproj", "{7596216B-669C-41F8-86DA-F3637F6545C0}"
1414
EndProject
15+
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Facebook.Yoga.Shared", "..\Yoga\csharp\Facebook.Yoga\Facebook.Yoga.Shared.shproj", "{91C42D32-291D-4B72-90B4-551663D60B8B}"
16+
EndProject
17+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Facebook.Yoga.Universal", "..\Yoga\csharp\Windows\Facebook.Yoga.Universal\Facebook.Yoga.Universal.csproj", "{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}"
18+
ProjectSection(ProjectDependencies) = postProject
19+
{2EACF721-73B5-46AE-9775-4A8674D05A9C} = {2EACF721-73B5-46AE-9775-4A8674D05A9C}
20+
EndProjectSection
21+
EndProject
22+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "yoga.uwp", "..\Yoga\csharp\Yoga\Yoga.Universal.vcxproj", "{2EACF721-73B5-46AE-9775-4A8674D05A9C}"
23+
EndProject
1524
Global
1625
GlobalSection(SharedMSBuildProjectFiles) = preSolution
26+
..\Yoga\csharp\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{91c42d32-291d-4b72-90b4-551663d60b8b}*SharedItemsImports = 13
1727
..\ReactWindows\ReactNative.Shared\ReactNative.Shared.projitems*{c7673ad5-e3aa-468c-a5fd-fa38154e205c}*SharedItemsImports = 4
28+
..\Yoga\csharp\Facebook.Yoga\Facebook.Yoga.Shared.projitems*{d6477ad6-9edd-4eba-8c60-cd31f77c52c6}*SharedItemsImports = 4
1829
..\ReactWindows\ReactNative.Shared\ReactNative.Shared.projitems*{eea8b852-4d07-48e1-8294-a21ab5909fe5}*SharedItemsImports = 13
1930
EndGlobalSection
2031
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -140,6 +151,54 @@ Global
140151
{7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x64.Build.0 = Release|x64
141152
{7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.ActiveCfg = Release|x86
142153
{7596216B-669C-41F8-86DA-F3637F6545C0}.ReleaseBundle|x86.Build.0 = Release|x86
154+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.ActiveCfg = Debug|ARM
155+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|ARM.Build.0 = Debug|ARM
156+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.ActiveCfg = Debug|x64
157+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x64.Build.0 = Debug|x64
158+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.ActiveCfg = Debug|x86
159+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Debug|x86.Build.0 = Debug|x86
160+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|ARM.ActiveCfg = Debug|ARM
161+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|ARM.Build.0 = Debug|ARM
162+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|x64.ActiveCfg = Debug|x64
163+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|x64.Build.0 = Debug|x64
164+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|x86.ActiveCfg = Debug|x86
165+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.DebugBundle|x86.Build.0 = Debug|x86
166+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.ActiveCfg = Release|ARM
167+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|ARM.Build.0 = Release|ARM
168+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.ActiveCfg = Release|x64
169+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x64.Build.0 = Release|x64
170+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x86.ActiveCfg = Release|x86
171+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.Release|x86.Build.0 = Release|x86
172+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|ARM.ActiveCfg = Release|ARM
173+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|ARM.Build.0 = Release|ARM
174+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|x64.ActiveCfg = Release|x64
175+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|x64.Build.0 = Release|x64
176+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|x86.ActiveCfg = Release|x86
177+
{D6477AD6-9EDD-4EBA-8C60-CD31F77C52C6}.ReleaseBundle|x86.Build.0 = Release|x86
178+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.ActiveCfg = Debug|ARM
179+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|ARM.Build.0 = Debug|ARM
180+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.ActiveCfg = Debug|x64
181+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x64.Build.0 = Debug|x64
182+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.ActiveCfg = Debug|Win32
183+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Debug|x86.Build.0 = Debug|Win32
184+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.ActiveCfg = Debug|ARM
185+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|ARM.Build.0 = Debug|ARM
186+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.ActiveCfg = Debug|x64
187+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x64.Build.0 = Debug|x64
188+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.ActiveCfg = Debug|Win32
189+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.DebugBundle|x86.Build.0 = Debug|Win32
190+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.ActiveCfg = Release|ARM
191+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|ARM.Build.0 = Release|ARM
192+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.ActiveCfg = Release|x64
193+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x64.Build.0 = Release|x64
194+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.ActiveCfg = Release|Win32
195+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.Release|x86.Build.0 = Release|Win32
196+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.ActiveCfg = Release|ARM
197+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|ARM.Build.0 = Release|ARM
198+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.ActiveCfg = Release|x64
199+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x64.Build.0 = Release|x64
200+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.ActiveCfg = Release|Win32
201+
{2EACF721-73B5-46AE-9775-4A8674D05A9C}.ReleaseBundle|x86.Build.0 = Release|Win32
143202
EndGlobalSection
144203
GlobalSection(SolutionProperties) = preSolution
145204
HideSolutionNode = FALSE

‎windows/RNTester/RNTesterApp.csproj

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
44
<PropertyGroup>
@@ -212,6 +212,13 @@
212212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
213213
</Content>
214214
</ItemGroup>
215+
<ItemGroup>
216+
<Content Include="$(MSBuildThisFileDirectory)..\..\..\Yoga\csharp\Yoga\bin\Universal\$(Platform)\$(Configuration)\yoga.dll">
217+
<Link>%(Filename)%(Extension)</Link>
218+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
219+
<Visible>False</Visible>
220+
</Content>
221+
</ItemGroup>
215222
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
216223
<VisualStudioVersion>14.0</VisualStudioVersion>
217224
</PropertyGroup>
@@ -223,4 +230,4 @@
223230
<Target Name="AfterBuild">
224231
</Target>
225232
-->
226-
</Project>
233+
</Project>

0 commit comments

Comments
 (0)