Commit 475eeead authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Update KeraLua

parent d88ff6b0
Subproject commit f817722ab7eac04d450a6f46b93af7d1a77ad1c2 Subproject commit d41c88f316faacfa3ca15c9588af40b1b452960f
...@@ -6,7 +6,7 @@ using System.Windows.Markup; ...@@ -6,7 +6,7 @@ using System.Windows.Markup;
using System.Windows.Navigation; using System.Windows.Navigation;
using Microsoft.Phone.Controls; using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell; using Microsoft.Phone.Shell;
using NLuaTest.Resources;
namespace NLuaTest namespace NLuaTest
{ {
...@@ -193,7 +193,6 @@ namespace NLuaTest ...@@ -193,7 +193,6 @@ namespace NLuaTest
// //
// If a compiler error is hit then ResourceLanguage is missing from // If a compiler error is hit then ResourceLanguage is missing from
// the resource file. // the resource file.
RootFrame.Language = XmlLanguage.GetLanguage(AppResources.ResourceLanguage);
// Set the FlowDirection of all elements under the root frame based // Set the FlowDirection of all elements under the root frame based
// on the ResourceFlowDirection resource string for each // on the ResourceFlowDirection resource string for each
...@@ -201,8 +200,7 @@ namespace NLuaTest ...@@ -201,8 +200,7 @@ namespace NLuaTest
// //
// If a compiler error is hit then ResourceFlowDirection is missing from // If a compiler error is hit then ResourceFlowDirection is missing from
// the resource file. // the resource file.
FlowDirection flow = (FlowDirection)Enum.Parse(typeof(FlowDirection), AppResources.ResourceFlowDirection);
RootFrame.FlowDirection = flow;
} }
catch catch
{ {
......
using NLuaTest.Resources; 
namespace NLuaTest namespace NLuaTest
{ {
...@@ -7,8 +7,6 @@ namespace NLuaTest ...@@ -7,8 +7,6 @@ namespace NLuaTest
/// </summary> /// </summary>
public class LocalizedStrings public class LocalizedStrings
{ {
private static AppResources _localizedResources = new AppResources();
public AppResources LocalizedResources { get { return _localizedResources; } }
} }
} }
\ No newline at end of file
...@@ -7,7 +7,6 @@ using System.Windows.Controls; ...@@ -7,7 +7,6 @@ using System.Windows.Controls;
using System.Windows.Navigation; using System.Windows.Navigation;
using Microsoft.Phone.Controls; using Microsoft.Phone.Controls;
using Microsoft.Phone.Shell; using Microsoft.Phone.Shell;
using NLuaTest.Resources;
using System.Threading; using System.Threading;
using Microsoft.VisualStudio.TestPlatform.Core; using Microsoft.VisualStudio.TestPlatform.Core;
using vstest_executionengine_platformbridge; using vstest_executionengine_platformbridge;
......
...@@ -93,11 +93,6 @@ ...@@ -93,11 +93,6 @@
<DependentUpon>MainPage.xaml</DependentUpon> <DependentUpon>MainPage.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Resources\AppResources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>AppResources.resx</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ApplicationDefinition Include="App.xaml"> <ApplicationDefinition Include="App.xaml">
...@@ -118,7 +113,6 @@ ...@@ -118,7 +113,6 @@
<None Include="Properties\WMAppManifest.xml"> <None Include="Properties\WMAppManifest.xml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</None> </None>
<None Include="Resources\.git" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="Assets\AlignmentGrid.png" /> <Content Include="Assets\AlignmentGrid.png" />
...@@ -135,12 +129,6 @@ ...@@ -135,12 +129,6 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\AppResources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>AppResources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Core\KeraLua\external\lua\wp8_build\lua\lua52\lua52.vcxproj"> <ProjectReference Include="..\Core\KeraLua\external\lua\wp8_build\lua\lua52\lua52.vcxproj">
<Project>{ABD36435-56AD-4940-B51A-10AEECA46C01}</Project> <Project>{ABD36435-56AD-4940-B51A-10AEECA46C01}</Project>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment