Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
NLua
Commits
281961a7
Commit
281961a7
authored
May 02, 2020
by
Vinicius Jarina
Browse files
Bumped KeraLua- using PackageReference Fixed BinaryLoad tests
parent
e2419a85
Changes
158
Show whitespace changes
Inline
Side-by-side
packages/System.Reflection.Emit.ILGeneration.4.3.0/ref/wp80/_._
deleted
100755 → 0
View file @
e2419a85
packages/System.Reflection.Emit.ILGeneration.4.3.0/ref/xamarinios10/_._
deleted
100755 → 0
View file @
e2419a85
packages/System.Reflection.Emit.ILGeneration.4.3.0/ref/xamarinmac20/_._
deleted
100755 → 0
View file @
e2419a85
packages/System.Reflection.Emit.ILGeneration.4.3.0/ref/xamarintvos10/_._
deleted
100755 → 0
View file @
e2419a85
packages/System.Reflection.Emit.ILGeneration.4.3.0/ref/xamarinwatchos10/_._
deleted
100755 → 0
View file @
e2419a85
packages/System.Reflection.Emit.ILGeneration.4.3.0/runtimes/aot/lib/netcore50/_._
deleted
100755 → 0
View file @
e2419a85
tests/build/net45/NLuaTest.csproj
View file @
281961a7
...
...
@@ -47,9 +47,6 @@
<Reference
Include=
"System.Numerics"
/>
<Reference
Include=
"System.Xml.Linq"
/>
<Reference
Include=
"System.Xml"
/>
<Reference
Include=
"KeraLua"
>
<HintPath>
..\..\..\packages\KeraLua.1.0.30-lua54-build5\lib\net45\KeraLua.dll
</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include=
"..\..\..\build\net45\NLua.csproj"
>
...
...
@@ -58,7 +55,9 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None
Include=
"packages.config"
/>
<PackageReference
Include=
"KeraLua"
>
<Version>
1.0.30-lua54-build5
</Version>
</PackageReference>
</ItemGroup>
<Import
Project=
"..\..\src\NLuaTest.Shared.projitems"
Label=
"Shared"
/>
<Import
Project=
"..\..\src\NLuaTest.Shared.Scripts.projitems"
Label=
"Shared"
/>
...
...
tests/build/net45/packages.config
deleted
100644 → 0
View file @
e2419a85
<?
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
tests/build/netcore/NLuaTest.Core.csproj
View file @
281961a7
...
...
@@ -73,14 +73,18 @@
<Link>scripts\test.lua</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\scripts\test_32.luac">
<Link>scripts\test_32.luac</Link>
<None Include="..\..\scripts\test
.win
_32.luac">
<Link>scripts\test
.win
_32.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\scripts\test_64.luac">
<Link>scripts\test_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\scripts\test.win_64.luac">
<Link>scripts\test.win_64.luac</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\build\netcore\NLua.NetCore.csproj" />
...
...
tests/build/xamarinios/NLuaTest.XamariniOS.csproj
View file @
281961a7
...
...
@@ -126,9 +126,6 @@
<MtouchExtraArgs>
--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true --interpreter
</MtouchExtraArgs>
</PropertyGroup>
<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.Xml"
/>
<Reference
Include=
"System.Core"
/>
...
...
@@ -143,7 +140,6 @@
<None
Include=
"Info.plist"
/>
<None
Include=
"Entitlements.plist"
/>
<None
Include=
"tools\Touch.Server.exe"
/>
<None
Include=
"packages.config"
/>
</ItemGroup>
<ItemGroup>
<Compile
Include=
"Main.cs"
/>
...
...
@@ -162,9 +158,6 @@
<BundleResource
Include=
"..\..\scripts\test.lua"
>
<Link>
Resources\scripts\test.lua
</Link>
</BundleResource>
<BundleResource
Include=
"..\..\scripts\test_32.luac"
>
<Link>
Resources\scripts\test_32.luac
</Link>
</BundleResource>
<BundleResource
Include=
"..\..\scripts\test_64.luac"
>
<Link>
Resources\scripts\test_64.luac
</Link>
</BundleResource>
...
...
@@ -196,6 +189,11 @@
<Link>
Resources\scripts\core\sort.lua
</Link>
</BundleResource>
</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=
"$(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')"
/>
...
...
tests/build/xamarinios/packages.config
deleted
100644 → 0
View file @
e2419a85
<?
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
tests/build/xamarintvos/NLuaTest.XamarinTVOS.csproj
View file @
281961a7
...
...
@@ -91,9 +91,6 @@
<MtouchExtraArgs>
--setenv=NUNIT_ENABLE_XML_OUTPUT=true --setenv=NUNIT_SKIP_LOG_HEADER=true
</MtouchExtraArgs>
</PropertyGroup>
<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.Xml"
/>
<Reference
Include=
"System.Core"
/>
...
...
@@ -165,7 +162,6 @@
<None
Include=
"Info.plist"
/>
<None
Include=
"Entitlements.plist"
/>
<None
Include=
"tools\Touch.Server.exe"
/>
<None
Include=
"packages.config"
/>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include=
"..\..\..\build\TVOS\NLua.TVOS.csproj"
>
...
...
@@ -187,9 +183,6 @@
<BundleResource
Include=
"..\..\scripts\test.lua"
>
<Link>
Resources\scripts\test.lua
</Link>
</BundleResource>
<BundleResource
Include=
"..\..\scripts\test_32.luac"
>
<Link>
Resources\scripts\test_32.luac
</Link>
</BundleResource>
<BundleResource
Include=
"..\..\scripts\test_64.luac"
>
<Link>
Resources\scripts\test_64.luac
</Link>
</BundleResource>
...
...
@@ -221,6 +214,11 @@
<Link>
Resources\scripts\core\sort.lua
</Link>
</BundleResource>
</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=
"$(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')"
/>
...
...
tests/build/xamarintvos/packages.config
deleted
100644 → 0
View file @
e2419a85
<?
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
tests/scripts/test_32.luac
→
tests/scripts/test
.win
_32.luac
View file @
281961a7
File moved
tests/scripts/test.win_64.luac
0 → 100644
View file @
281961a7
File added
tests/scripts/test_64.luac
View file @
281961a7
No preview for this file type
tests/src/LoadFileTests.cs
View file @
281961a7
...
...
@@ -70,10 +70,16 @@ namespace LoadFileTests
lua
.
LoadCLRPackage
();
if
(
IntPtr
.
Size
==
4
)
file
=
GetScriptsPath
(
"test_32.luac"
);
file
=
GetScriptsPath
(
"test.win_32.luac"
);
else
{
if
(
Environment
.
OSVersion
.
Platform
==
PlatformID
.
Win32NT
)
file
=
GetScriptsPath
(
"test.win_64.luac"
);
else
file
=
GetScriptsPath
(
"test_64.luac"
);
}
lua
.
DoFile
(
file
);
int
width
=
(
int
)(
double
)
lua
[
"width"
];
...
...
tests/src/NLuaTest.Shared.Scripts.projitems
View file @
281961a7
...
...
@@ -49,8 +49,16 @@
<Link>
scripts\test.lua
</Link>
<CopyToOutputDirectory>
PreserveNewest
</CopyToOutputDirectory>
</None>
<None
Include=
"$(MSBuildThisFileDirectory)..\scripts\test_32.luac"
>
<Link>
scripts\test_32.luac
</Link>
<None
Include=
"$(MSBuildThisFileDirectory)..\scripts\test.win_32.luac"
>
<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>
</None>
<None
Include=
"$(MSBuildThisFileDirectory)..\scripts\test_64.luac"
>
...
...
Prev
1
…
4
5
6
7
8
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment