Commit 281961a7 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Bumped KeraLua- using PackageReference Fixed BinaryLoad tests

parent e2419a85
...@@ -47,9 +47,6 @@ ...@@ -47,9 +47,6 @@
<Reference Include="System.Numerics" /> <Reference Include="System.Numerics" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="KeraLua">
<HintPath>..\..\..\packages\KeraLua.1.0.30-lua54-build5\lib\net45\KeraLua.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\build\net45\NLua.csproj"> <ProjectReference Include="..\..\..\build\net45\NLua.csproj">
...@@ -58,7 +55,9 @@ ...@@ -58,7 +55,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" /> <PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" /> <Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" />
<Import Project="..\..\src\NLuaTest.Shared.Scripts.projitems" Label="Shared" /> <Import Project="..\..\src\NLuaTest.Shared.Scripts.projitems" Label="Shared" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.30-lua54-build5" targetFramework="net45" />
<package id="NUnit" version="3.12.0" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.11.1" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.16.1" targetFramework="net45" developmentDependency="true" />
</packages>
\ No newline at end of file
...@@ -73,14 +73,18 @@ ...@@ -73,14 +73,18 @@
<Link>scripts\test.lua</Link> <Link>scripts\test.lua</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="..\..\scripts\test_32.luac"> <None Include="..\..\scripts\test.win_32.luac">
<Link>scripts\test_32.luac</Link> <Link>scripts\test.win_32.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="..\..\scripts\test_64.luac"> <None Include="..\..\scripts\test_64.luac">
<Link>scripts\test_64.luac</Link> <Link>scripts\test_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="..\..\scripts\test.win_64.luac">
<Link>scripts\test.win_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\build\netcore\NLua.NetCore.csproj" /> <ProjectReference Include="..\..\..\build\netcore\NLua.NetCore.csproj" />
......
...@@ -126,9 +126,6 @@ ...@@ -126,9 +126,6 @@
<MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter</MtouchExtraArgs> <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter</MtouchExtraArgs>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\KeraLua.1.0.29\lib\xamarinios\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
...@@ -143,7 +140,6 @@ ...@@ -143,7 +140,6 @@
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.plist" /> <None Include="Entitlements.plist" />
<None Include="tools\Touch.Server.exe" /> <None Include="tools\Touch.Server.exe" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Main.cs" /> <Compile Include="Main.cs" />
...@@ -162,9 +158,6 @@ ...@@ -162,9 +158,6 @@
<BundleResource Include="..\..\scripts\test.lua"> <BundleResource Include="..\..\scripts\test.lua">
<Link>Resources\scripts\test.lua</Link> <Link>Resources\scripts\test.lua</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\..\scripts\test_32.luac">
<Link>Resources\scripts\test_32.luac</Link>
</BundleResource>
<BundleResource Include="..\..\scripts\test_64.luac"> <BundleResource Include="..\..\scripts\test_64.luac">
<Link>Resources\scripts\test_64.luac</Link> <Link>Resources\scripts\test_64.luac</Link>
</BundleResource> </BundleResource>
...@@ -196,6 +189,11 @@ ...@@ -196,6 +189,11 @@
<Link>Resources\scripts\core\sort.lua</Link> <Link>Resources\scripts\core\sort.lua</Link>
</BundleResource> </BundleResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLuaTest.Shared.projitems')" /> <Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLuaTest.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets" Condition="Exists('..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets')" /> <Import Project="..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets" Condition="Exists('..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets')" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Codefoco.Touch.Server" version="1.0.19" targetFramework="xamarinios10" developmentDependency="true" />
<package id="KeraLua" version="1.0.29" targetFramework="xamarinios10" />
</packages>
\ No newline at end of file
...@@ -91,9 +91,6 @@ ...@@ -91,9 +91,6 @@
<MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs> <MtouchExtraArgs>--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true</MtouchExtraArgs>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\KeraLua.1.0.29\lib\xamarintvos\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
...@@ -165,7 +162,6 @@ ...@@ -165,7 +162,6 @@
<None Include="Info.plist" /> <None Include="Info.plist" />
<None Include="Entitlements.plist" /> <None Include="Entitlements.plist" />
<None Include="tools\Touch.Server.exe" /> <None Include="tools\Touch.Server.exe" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\build\TVOS\NLua.TVOS.csproj"> <ProjectReference Include="..\..\..\build\TVOS\NLua.TVOS.csproj">
...@@ -187,9 +183,6 @@ ...@@ -187,9 +183,6 @@
<BundleResource Include="..\..\scripts\test.lua"> <BundleResource Include="..\..\scripts\test.lua">
<Link>Resources\scripts\test.lua</Link> <Link>Resources\scripts\test.lua</Link>
</BundleResource> </BundleResource>
<BundleResource Include="..\..\scripts\test_32.luac">
<Link>Resources\scripts\test_32.luac</Link>
</BundleResource>
<BundleResource Include="..\..\scripts\test_64.luac"> <BundleResource Include="..\..\scripts\test_64.luac">
<Link>Resources\scripts\test_64.luac</Link> <Link>Resources\scripts\test_64.luac</Link>
</BundleResource> </BundleResource>
...@@ -221,6 +214,11 @@ ...@@ -221,6 +214,11 @@
<Link>Resources\scripts\core\sort.lua</Link> <Link>Resources\scripts\core\sort.lua</Link>
</BundleResource> </BundleResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLuaTest.Shared.projitems')" /> <Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLuaTest.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
<Import Project="..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets" Condition="Exists('..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets')" /> <Import Project="..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets" Condition="Exists('..\..\..\packages\Codefoco.Touch.Server.1.0.19\build\Codefoco.Touch.Server.targets')" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Codefoco.Touch.Server" version="1.0.19" targetFramework="xamarintvos10" developmentDependency="true" />
<package id="KeraLua" version="1.0.29" targetFramework="xamarintvos10" />
</packages>
\ No newline at end of file
...@@ -70,9 +70,15 @@ namespace LoadFileTests ...@@ -70,9 +70,15 @@ namespace LoadFileTests
lua.LoadCLRPackage(); lua.LoadCLRPackage();
if (IntPtr.Size == 4) if (IntPtr.Size == 4)
file = GetScriptsPath("test_32.luac"); file = GetScriptsPath("test.win_32.luac");
else else
file = GetScriptsPath("test_64.luac"); {
if (Environment.OSVersion.Platform == PlatformID.Win32NT)
file = GetScriptsPath("test.win_64.luac");
else
file = GetScriptsPath("test_64.luac");
}
lua.DoFile(file); lua.DoFile(file);
......
...@@ -49,8 +49,16 @@ ...@@ -49,8 +49,16 @@
<Link>scripts\test.lua</Link> <Link>scripts\test.lua</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)..\scripts\test_32.luac"> <None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_32.luac">
<Link>scripts\test_32.luac</Link> <Link>scripts\test.win_32.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_64.luac">
<Link>scripts\test.win_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(MSBuildThisFileDirectory)..\scripts\test.win_64.luac">
<Link>scripts\test.win_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Include="$(MSBuildThisFileDirectory)..\scripts\test_64.luac"> <None Include="$(MSBuildThisFileDirectory)..\scripts\test_64.luac">
......
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