Commit 61e8aad4 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Update `KeraLua` nuget .NET Core

parent d975f8e9
......@@ -9,7 +9,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Sha
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844-3BD3-436C-AB8A-8E78C810A710}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "build\net45\NLua.csproj", "{C45805A8-6436-4738-BD9F-4632EEA63BBC}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "build\net45\NLua.csproj", "{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}"
EndProject
......@@ -29,17 +29,17 @@ Global
tests\src\NLuaTest.Shared.projitems*{7279d001-6f21-4ff3-a0ee-3a1d12004ba3}*SharedItemsImports = 13
tests\src\NLuaTest.Shared.Scripts.projitems*{9e2a0bc0-5c10-4a85-9ca1-2beb751128b7}*SharedItemsImports = 13
src\NLua.Shared.projitems*{bd205ad6-760e-48f3-bab2-21447396bd17}*SharedItemsImports = 13
src\NLua.Shared.projitems*{c45805a8-6436-4738-bd9f-4632eea63bbc}*SharedItemsImports = 4
src\NLua.Shared.projitems*{d5b6902e-37cd-44db-8ac5-bfaeee663633}*SharedItemsImports = 4
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C45805A8-6436-4738-BD9F-4632EEA63BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C45805A8-6436-4738-BD9F-4632EEA63BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C45805A8-6436-4738-BD9F-4632EEA63BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C45805A8-6436-4738-BD9F-4632EEA63BBC}.Release|Any CPU.Build.0 = Release|Any CPU
{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}.Release|Any CPU.Build.0 = Release|Any CPU
{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
......@@ -50,7 +50,7 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BD205AD6-760E-48F3-BAB2-21447396BD17} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{C45805A8-6436-4738-BD9F-4632EEA63BBC} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{D5B6902E-37CD-44DB-8AC5-BFAEEE663633} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{7279D001-6F21-4FF3-A0EE-3A1D12004BA3} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710}
{9E2A0BC0-5C10-4A85-9CA1-2BEB751128B7} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710}
{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710}
......
......@@ -32,8 +32,8 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.19.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.19\lib\net45\KeraLua.dll</HintPath>
<Reference Include="KeraLua, Version=1.0.21.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.21\lib\net45\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>
......@@ -43,11 +43,11 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\targets\NLua.Sign.targets" />
<Import Project="..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets" Condition="Exists('..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets')" />
<Import Project="..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets" Condition="Exists('..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets'))" />
<Error Condition="!Exists('..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets'))" />
</Target>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.19" targetFramework="net45" />
<package id="KeraLua" version="1.0.21" targetFramework="net45" />
</packages>
\ No newline at end of file
......@@ -20,7 +20,7 @@
</PropertyGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.19" />
<PackageReference Include="KeraLua" Version="1.0.21" />
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" />
</ItemGroup>
......
......@@ -24,7 +24,7 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.19" />
<PackageReference Include="KeraLua" Version="1.0.21" />
<PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup>
......
......@@ -38,8 +38,8 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.19.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\KeraLua.1.0.19\lib\net45\KeraLua.dll</HintPath>
<Reference Include="KeraLua, Version=1.0.21.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\KeraLua.1.0.21\lib\net45\KeraLua.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\NUnit.3.12.0\lib\net45\nunit.framework.dll</HintPath>
......@@ -68,7 +68,7 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\NUnit.3.12.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
<Error Condition="!Exists('..\..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets'))" />
<Error Condition="!Exists('..\..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets'))" />
</Target>
<Import Project="..\..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets" Condition="Exists('..\..\..\packages\KeraLua.1.0.19\build\net45\KeraLua.targets')" />
<Import Project="..\..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets" Condition="Exists('..\..\..\packages\KeraLua.1.0.21\build\net45\KeraLua.targets')" />
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.19" targetFramework="net45" />
<package id="KeraLua" version="1.0.21" targetFramework="net45" />
<package id="NUnit" version="3.12.0" targetFramework="net45" />
<package id="NUnit.ConsoleRunner" version="3.10.0" targetFramework="net45" />
<package id="NUnit3TestAdapter" version="3.14.0" targetFramework="net45" />
......
......@@ -25,9 +25,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.19" />
<PackageReference Include="KeraLua" Version="1.0.21" />
<PackageReference Include="nunit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.14.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
</ItemGroup>
<ItemGroup>
......
......@@ -2036,7 +2036,7 @@ namespace NLuaTest
sw.Start();
try
{
for(int i = 0; i < 500; i++)
for(int i = 0; i < 1000; i++)
lua.DoString($" v:Lengthx{i}() ");
}
catch (Exception e)
......@@ -2050,7 +2050,7 @@ namespace NLuaTest
sw2.Start();
try
{
for (int i = 0; i < 500; i++)
for (int i = 0; i < 1000; i++)
lua.DoString($" v:Lengthx{i}() ");
}
catch (Exception e)
......
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