Unverified Commit 4183a06d authored by ayrton97's avatar ayrton97 Committed by GitHub
Browse files

User/ayrton97/netstandard2.0 rollback (#417)



* Check the the type to be numeric rather than a number. The side effect of IsNumber check causes numeric strings to be treated as numbers which leads to wrong overloaded method identification

* Adding UT

* Add netstandard2.0 support back

* Fix NUnit reference
Co-authored-by: default avatarVlad Soroka <vladiso@microsoft.com>
parent 7d6a3fed
......@@ -15,7 +15,7 @@
<copyright>Copyright © NLua 2021</copyright>
<tags>lua nlua</tags>
<dependencies>
<dependency id="KeraLua" version="1.2.13" />
<dependency id="KeraLua" version="1.2.14" />
</dependencies>
<packageTypes>
<packageType name="SymbolsPackage" />
......@@ -33,6 +33,8 @@
<file src="lib\Release\net5.0\net5.0\NLua.pdb" target="lib\net5.0" />
<file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" />
<file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.pdb" target="lib\netcoreapp3.1" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" />
<file src="lib\Release\netstandard2.0\NLua.pdb" target="lib\netstandard2.0" />
<file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" />
<file src="lib\Release\xamarinios\NLua.pdb" target="lib\xamarinios" />
<file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" />
......

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
# Visual Studio Version 16
VisualStudioVersion = 16.0.31205.134
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLua", "NLua", "{4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}"
EndProject
......@@ -11,6 +11,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.netcoreapp3.1", "build\netcoreapp3.1\NLua.netcoreapp3.1.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.netstandard2.0", "build\netstandard2.0\NLua.netstandard2.0.csproj", "{6784E262-4845-4B08-8AD1-6319E76AF579}"
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLuaTest.netcoreapp3.1", "tests\build\netcoreapp3.1\NLuaTest.netcoreapp3.1.csproj", "{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}"
......@@ -22,8 +24,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\NLua.Shared.projitems*{6784e262-4845-4b08-8ad1-6319e76af579}*SharedItemsImports = 5
tests\src\NLuaTest.Shared.projitems*{7279d001-6f21-4ff3-a0ee-3a1d12004ba3}*SharedItemsImports = 13
src\NLua.Shared.projitems*{a1944148-0ad8-4def-a245-60c7a8ae8aa7}*SharedItemsImports = 5
src\NLua.Shared.projitems*{bd205ad6-760e-48f3-bab2-21447396bd17}*SharedItemsImports = 13
tests\src\NLuaTest.Shared.projitems*{c3b8fc88-e476-4d34-874e-a0fe67fa0cbc}*SharedItemsImports = 5
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -34,6 +39,10 @@ Global
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.Build.0 = Release|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Release|Any CPU.Build.0 = Release|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
......
......@@ -15,7 +15,7 @@
<copyright>Copyright © NLua 2021</copyright>
<tags>lua nlua</tags>
<dependencies>
<dependency id="KeraLua" version="1.2.13" />
<dependency id="KeraLua" version="1.2.14" />
</dependencies>
<repository type="git" url="https://github.com/nlua/nlua" commit="708ba30e982deccb1248d099806bc00e362fbda4" />
</metadata>
......@@ -26,6 +26,7 @@
<file src="lib\Release\uap10.0\NLua.pri" target="lib\uap10.0" />
<file src="lib\Release\net5.0\net5.0\NLua.dll" target="lib\net5.0" />
<file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" />
<file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" />
<file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" />
<file src="lib\Release\xamarintvos\NLua.dll" target="lib\xamarintvos" />
......
......@@ -50,7 +50,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -57,7 +57,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -55,7 +55,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -70,7 +70,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -61,7 +61,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -45,7 +45,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -29,7 +29,7 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
......
......@@ -29,7 +29,7 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
......
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\lib\Debug\</OutputPath>
<DefineConstants>TRACE;NETSTANDARD</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>true</Optimize>
<DebugType>portable</DebugType>
<OutputPath>..\..\lib\Release\</OutputPath>
<DefineConstants>TRACE;NETSTANDARD</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="NUnit" Version="3.13.1" />
</ItemGroup>
<Import Project="..\targets\NLua.Sign.targets" />
</Project>
\ No newline at end of file
......@@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
......
......@@ -51,7 +51,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.13.1</Version>
......
......@@ -25,7 +25,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.2.13">
<PackageReference Include="KeraLua" Version="1.2.14">
</PackageReference>
<PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
......
......@@ -191,7 +191,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="Codefoco.Touch.Server">
<Version>1.0.27</Version>
......
......@@ -216,7 +216,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.2.13</Version>
<Version>1.2.14</Version>
</PackageReference>
<PackageReference Include="Codefoco.Touch.Server">
<Version>1.0.27</Version>
......
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