Commit 26031db6 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Bumped version to 1.3.2

parent 39c028da
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NLua</RootNamespace> <RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName> <AssemblyName>NLua</AssemblyName>
<ReleaseVersion>1.3.1</ReleaseVersion> <ReleaseVersion>1.3.2</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<AssemblyName>ConsoleTest</AssemblyName> <AssemblyName>ConsoleTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ReleaseVersion>1.3.1</ReleaseVersion> <ReleaseVersion>1.3.2</ReleaseVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget> <PlatformTarget>x86</PlatformTarget>
......
...@@ -12,6 +12,11 @@ namespace ConsoleTest ...@@ -12,6 +12,11 @@ namespace ConsoleTest
public class Program public class Program
{ {
static public void Method(int a, params int[] others) {
Console.WriteLine (a);
foreach (int val in others)
Console.WriteLine (val);
}
static void Main (string [] args) static void Main (string [] args)
{ {
...@@ -19,9 +24,7 @@ namespace ConsoleTest ...@@ -19,9 +24,7 @@ namespace ConsoleTest
l.LoadCLRPackage (); l.LoadCLRPackage ();
l.DoString (" import ('ConsoleTest') "); l.DoString (" import ('ConsoleTest') ");
l.DoString (@" l.DoString (@"
p=parameter() Program.Method (1)
r1 = testClass2.read(p) -- is not working. it is also not working if the method in base class has two parameters instead of one
r2 = testClass2.read(1) -- is working
"); ");
} }
} }
......
Subproject commit e31a48301af5c69a05766477e5d8c19928514a13 Subproject commit 49e791941da3002e0f8e117b5ea2b6d515cf452b
Subproject commit 2c66160f82469cf9aa73feb4a834dc31aa1dbc85 Subproject commit 924a574b14540a7de2133fca462ce460be00bc24
...@@ -38,7 +38,7 @@ namespace NLua.Config ...@@ -38,7 +38,7 @@ namespace NLua.Config
public const string NLuaProduct = "NLua"; public const string NLuaProduct = "NLua";
public const string NLuaCopyright = "Copyright 2003-2014 Vinicius Jarina , Fabio Mascarenhas, Kevin Hesterm and Megax"; public const string NLuaCopyright = "Copyright 2003-2014 Vinicius Jarina , Fabio Mascarenhas, Kevin Hesterm and Megax";
public const string NLuaTrademark = "MIT license"; public const string NLuaTrademark = "MIT license";
public const string NLuaVersion = "1.3.1"; public const string NLuaVersion = "1.3.2";
public const string NLuaFileVersion = "1.3.1"; public const string NLuaFileVersion = "1.3.2";
} }
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NLua</RootNamespace> <RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName> <AssemblyName>NLua</AssemblyName>
<ReleaseVersion>1.3.1</ReleaseVersion> <ReleaseVersion>1.3.2</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
...@@ -164,7 +164,7 @@ Global ...@@ -164,7 +164,7 @@ Global
$5.inheritsScope = text/plain $5.inheritsScope = text/plain
$5.scope = text/plain $5.scope = text/plain
description = NLua description = NLua
version = 1.3.1 version = 1.3.2
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<RootNamespace>NLuaTest</RootNamespace> <RootNamespace>NLuaTest</RootNamespace>
<AssemblyName>NLuaTest</AssemblyName> <AssemblyName>NLuaTest</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ReleaseVersion>1.3.1</ReleaseVersion> <ReleaseVersion>1.3.2</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
...@@ -33,6 +33,7 @@ namespace NLuaTests.Android ...@@ -33,6 +33,7 @@ namespace NLuaTests.Android
global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::NLuaTests.Android.Resource.Id.ResultFullName; global::Xamarin.Android.NUnitLite.Resource.Id.ResultFullName = global::NLuaTests.Android.Resource.Id.ResultFullName;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::NLuaTests.Android.Resource.Id.ResultMessage; global::Xamarin.Android.NUnitLite.Resource.Id.ResultMessage = global::NLuaTests.Android.Resource.Id.ResultMessage;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::NLuaTests.Android.Resource.Id.ResultResultState; global::Xamarin.Android.NUnitLite.Resource.Id.ResultResultState = global::NLuaTests.Android.Resource.Id.ResultResultState;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultRunSingleMethodTest = global::NLuaTests.Android.Resource.Id.ResultRunSingleMethodTest;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::NLuaTests.Android.Resource.Id.ResultStackTrace; global::Xamarin.Android.NUnitLite.Resource.Id.ResultStackTrace = global::NLuaTests.Android.Resource.Id.ResultStackTrace;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::NLuaTests.Android.Resource.Id.ResultsFailed; global::Xamarin.Android.NUnitLite.Resource.Id.ResultsFailed = global::NLuaTests.Android.Resource.Id.ResultsFailed;
global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::NLuaTests.Android.Resource.Id.ResultsId; global::Xamarin.Android.NUnitLite.Resource.Id.ResultsId = global::NLuaTests.Android.Resource.Id.ResultsId;
...@@ -90,20 +91,23 @@ namespace NLuaTests.Android ...@@ -90,20 +91,23 @@ namespace NLuaTests.Android
// aapt resource value: 0x7f040000 // aapt resource value: 0x7f040000
public const int OptionRemoteServer = 2130968576; public const int OptionRemoteServer = 2130968576;
// aapt resource value: 0x7f04000f // aapt resource value: 0x7f040010
public const int OptionsButton = 2130968591; public const int OptionsButton = 2130968592;
// aapt resource value: 0x7f04000a // aapt resource value: 0x7f04000b
public const int ResultFullName = 2130968586; public const int ResultFullName = 2130968587;
// aapt resource value: 0x7f04000d
public const int ResultMessage = 2130968589;
// aapt resource value: 0x7f04000c // aapt resource value: 0x7f04000c
public const int ResultMessage = 2130968588; public const int ResultResultState = 2130968588;
// aapt resource value: 0x7f04000b // aapt resource value: 0x7f04000a
public const int ResultResultState = 2130968587; public const int ResultRunSingleMethodTest = 2130968586;
// aapt resource value: 0x7f04000d // aapt resource value: 0x7f04000e
public const int ResultStackTrace = 2130968589; public const int ResultStackTrace = 2130968590;
// aapt resource value: 0x7f040006 // aapt resource value: 0x7f040006
public const int ResultsFailed = 2130968582; public const int ResultsFailed = 2130968582;
...@@ -126,11 +130,11 @@ namespace NLuaTests.Android ...@@ -126,11 +130,11 @@ namespace NLuaTests.Android
// aapt resource value: 0x7f040004 // aapt resource value: 0x7f040004
public const int ResultsResult = 2130968580; public const int ResultsResult = 2130968580;
// aapt resource value: 0x7f04000e // aapt resource value: 0x7f04000f
public const int RunTestsButton = 2130968590; public const int RunTestsButton = 2130968591;
// aapt resource value: 0x7f040010 // aapt resource value: 0x7f040011
public const int TestSuiteListView = 2130968592; public const int TestSuiteListView = 2130968593;
static Id() static Id()
{ {
......
...@@ -220,10 +220,12 @@ Copyright (c) 2014 Vinicius Jarina (viniciusjarina@gmail.com) ...@@ -220,10 +220,12 @@ Copyright (c) 2014 Vinicius Jarina (viniciusjarina@gmail.com)
NLua 1.3.2 NLua 1.3.2
---------- ----------
* Migration to unified Xamarin.iOS (iOS) * Migration to unified Xamarin.iOS (iOS)
* Added __call method to call Actions/Funcs from Lua as Lua functions. * Added __call method to call Actions/Funcs from Lua as Lua functions.
* Fixed [#116](https://github.com/NLua/NLua/issues/116) problem accessing base class method * Fixed [#116](https://github.com/NLua/NLua/issues/116) problem accessing base class method
* Fixed [#117](https://github.com/NLua/NLua/issues/117) problem with same method in class and base class * Fixed [#117](https://github.com/NLua/NLua/issues/117) problem with same method in class and base class
* Fixed [#125](https://github.com/NLua/NLua/issues/125) calling methods with params keyword.
NLua 1.3.1 NLua 1.3.1
---------- ----------
......
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