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
817c1a5f
Commit
817c1a5f
authored
Jan 19, 2021
by
Vinicius Jarina
Browse files
Rename `master` -> `main`
parent
3b9802f2
Changes
12
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
817c1a5f
...
@@ -22,10 +22,10 @@ script:
...
@@ -22,10 +22,10 @@ script:
#after_script:
#after_script:
# - [run additional test commans]
# - [run additional test commans]
# Only watch the ma
ster
branch
# Only watch the ma
in
branch
branches
:
branches
:
only
:
only
:
-
ma
ster
-
ma
in
# Notify if needed
# Notify if needed
notifications
:
notifications
:
...
...
NLua.Symbol.nuspec
View file @
817c1a5f
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
<version>
1.4.11
</version>
<version>
1.4.11
</version>
<authors>
NLua
</authors>
<authors>
NLua
</authors>
<owners>
Vinicius Jarina
</owners>
<owners>
Vinicius Jarina
</owners>
<licenseUrl>
https://github.com/nlua/NLua/blob/ma
ster
/LICENSE
</licenseUrl>
<licenseUrl>
https://github.com/nlua/NLua/blob/ma
in
/LICENSE
</licenseUrl>
<projectUrl>
https://github.com/nlua/NLua
</projectUrl>
<projectUrl>
https://github.com/nlua/NLua
</projectUrl>
<iconUrl>
https://raw.githubusercontent.com/nlua/NLua/ma
ster
/NLua.png
</iconUrl>
<iconUrl>
https://raw.githubusercontent.com/nlua/NLua/ma
in
/NLua.png
</iconUrl>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<description>
NLua Package.
</description>
<description>
NLua Package.
</description>
<summary>
NLua allow use Lua from C#, using Windows, Linux, Mac, iOS , Android.
</summary>
<summary>
NLua allow use Lua from C#, using Windows, Linux, Mac, iOS , Android.
</summary>
...
...
NLua.nuspec
View file @
817c1a5f
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
<version>
1.4.11
</version>
<version>
1.4.11
</version>
<authors>
NLua
</authors>
<authors>
NLua
</authors>
<owners>
Vinicius Jarina
</owners>
<owners>
Vinicius Jarina
</owners>
<licenseUrl>
https://github.com/nlua/NLua/blob/ma
ster
/LICENSE
</licenseUrl>
<licenseUrl>
https://github.com/nlua/NLua/blob/ma
in
/LICENSE
</licenseUrl>
<projectUrl>
https://github.com/nlua/NLua
</projectUrl>
<projectUrl>
https://github.com/nlua/NLua
</projectUrl>
<iconUrl>
https://raw.githubusercontent.com/nlua/NLua/ma
ster
/NLua.png
</iconUrl>
<iconUrl>
https://raw.githubusercontent.com/nlua/NLua/ma
in
/NLua.png
</iconUrl>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<requireLicenseAcceptance>
false
</requireLicenseAcceptance>
<description>
NLua Package.
</description>
<description>
NLua Package.
</description>
<summary>
NLua allow use Lua from C#, using Windows, UWP, Linux, Android, Mac, iOS , tvOS.
</summary>
<summary>
NLua allow use Lua from C#, using Windows, UWP, Linux, Android, Mac, iOS , tvOS.
</summary>
...
...
README.md
View file @
817c1a5f
...
@@ -21,11 +21,11 @@ NLua
...
@@ -21,11 +21,11 @@ NLua
| | Status |
| | Status |
| :------ | :------: |
| :------ | :------: |
| !
[
linux
](
https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=travis&label&color=orange
)
|
[

](https://travis-ci.org/NLua/NLua) |
| !
[
linux
](
https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=travis&label&color=orange
)
|
[

](https://travis-ci.org/NLua/NLua) |
| !
[
win
](
https://badgen.net/badge/icon/Windows?icon=windows&label&color=blue
)
|
[

](https://ci.appveyor.com/project/viniciusjarina/NLua)|
| !
[
win
](
https://badgen.net/badge/icon/Windows?icon=windows&label&color=blue
)
|
[

](https://ci.appveyor.com/project/viniciusjarina/NLua)|
| !
[
mac
](
https://badgen.net/badge/icon/macOS,iOS,tvOS,watchOS?icon=apple&label&color=purple&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
ster
) |
| !
[
mac
](
https://badgen.net/badge/icon/macOS,iOS,tvOS,watchOS?icon=apple&label&color=purple&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
in
) |
|!
[
win
](
https://badgen.net/badge/icon/Windows,.NET%20Core?icon=windows&label&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
ster
) |
|!
[
win
](
https://badgen.net/badge/icon/Windows,.NET%20Core?icon=windows&label&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
in
) |
|!
[
linuxnet
](
https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=terminal&label&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
ster
) |
|!
[
linuxnet
](
https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=terminal&label&list=1
)
|
[

](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=ma
in
) |
Bridge between Lua world and the .NET (compatible with .NET Core/UWP/Mac/Linux/Android/iOS/tvOS)
Bridge between Lua world and the .NET (compatible with .NET Core/UWP/Mac/Linux/Android/iOS/tvOS)
...
@@ -40,7 +40,7 @@ Building
...
@@ -40,7 +40,7 @@ Building
NLua allows the usage of Lua from C#, on UWP, Windows, Linux, Mac, iOS , Android.
NLua allows the usage of Lua from C#, on UWP, Windows, Linux, Mac, iOS , Android.
[

]()
[

]()
NLua is a fork project of LuaInterface (from Fábio Mascarenhas/Craig Presti).
NLua is a fork project of LuaInterface (from Fábio Mascarenhas/Craig Presti).
...
...
build/netstandard2.0/NLua.netstandard2.0.csproj
View file @
817c1a5f
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
<PackageReference Include="KeraLua">
<PackageReference Include="KeraLua">
<Version>1.2.11</Version>
<Version>1.2.11</Version>
</PackageReference>
</PackageReference>
<PackageReference Include="NUnit" Version="3.1
2
.0" />
<PackageReference Include="NUnit" Version="3.1
3
.0" />
</ItemGroup>
</ItemGroup>
<Import Project="..\targets\NLua.Sign.targets" />
<Import Project="..\targets\NLua.Sign.targets" />
...
...
devops/BuildFunctions.ps1
View file @
817c1a5f
...
@@ -209,7 +209,7 @@ function Get-Prefix-Name ()
...
@@ -209,7 +209,7 @@ function Get-Prefix-Name ()
{
{
$branchName
=
Get-Current-Branch-Name
$branchName
=
Get-Current-Branch-Name
if
(
$branchName
-ne
"ma
ster
"
)
{
if
(
$branchName
-ne
"ma
in
"
)
{
return
$branchName
return
$branchName
}
}
return
"beta"
return
"beta"
...
...
src/Properties/AssemblyInfo.cs
View file @
817c1a5f
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
[
assembly
:
AssemblyVersion
(
"1.4.1.0"
)]
[
assembly
:
AssemblyVersion
(
"1.4.1.0"
)]
[
assembly
:
AssemblyInformationalVersion
(
"1.0.7+Branch.ma
ster
.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0"
)]
[
assembly
:
AssemblyInformationalVersion
(
"1.0.7+Branch.ma
in
.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0"
)]
[
assembly
:
AssemblyFileVersion
(
"1.4.1.0"
)]
[
assembly
:
AssemblyFileVersion
(
"1.4.1.0"
)]
tests/build/net45/NLuaTest.csproj
View file @
817c1a5f
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
<Version>
1.2.11
</Version>
<Version>
1.2.11
</Version>
</PackageReference>
</PackageReference>
<PackageReference
Include=
"NUnit"
>
<PackageReference
Include=
"NUnit"
>
<Version>
3.1
2
.0
</Version>
<Version>
3.1
3
.0
</Version>
</PackageReference>
</PackageReference>
<PackageReference
Include=
"NUnit3TestAdapter"
>
<PackageReference
Include=
"NUnit3TestAdapter"
>
<Version>
3.17.0
</Version>
<Version>
3.17.0
</Version>
...
...
tests/build/netcore/NLuaTest.Core.csproj
View file @
817c1a5f
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
<PackageReference Include="KeraLua">
<PackageReference Include="KeraLua">
<Version>1.2.11</Version>
<Version>1.2.11</Version>
</PackageReference>
</PackageReference>
<PackageReference Include="nunit" Version="3.1
2
.0" />
<PackageReference Include="nunit" Version="3.1
3
.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</PackageReference>
...
...
tests/build/xamarinios/NLuaTest.XamariniOS.csproj
View file @
817c1a5f
...
@@ -194,7 +194,7 @@
...
@@ -194,7 +194,7 @@
<Version>
1.2.11
</Version>
<Version>
1.2.11
</Version>
</PackageReference>
</PackageReference>
<PackageReference
Include=
"Codefoco.Touch.Server"
>
<PackageReference
Include=
"Codefoco.Touch.Server"
>
<Version>
1.0.2
5
</Version>
<Version>
1.0.2
6
</Version>
<IncludeAssets>
runtime; build; native; contentfiles; analyzers; buildtransitive
</IncludeAssets>
<IncludeAssets>
runtime; build; native; contentfiles; analyzers; buildtransitive
</IncludeAssets>
<PrivateAssets>
all
</PrivateAssets>
<PrivateAssets>
all
</PrivateAssets>
</PackageReference>
</PackageReference>
...
...
tests/build/xamarintvos/NLuaTest.XamarinTVOS.csproj
View file @
817c1a5f
...
@@ -219,7 +219,7 @@
...
@@ -219,7 +219,7 @@
<Version>
1.2.11
</Version>
<Version>
1.2.11
</Version>
</PackageReference>
</PackageReference>
<PackageReference
Include=
"Codefoco.Touch.Server"
>
<PackageReference
Include=
"Codefoco.Touch.Server"
>
<Version>
1.0.2
5
</Version>
<Version>
1.0.2
6
</Version>
<IncludeAssets>
runtime; build; native; contentfiles; analyzers; buildtransitive
</IncludeAssets>
<IncludeAssets>
runtime; build; native; contentfiles; analyzers; buildtransitive
</IncludeAssets>
<PrivateAssets>
all
</PrivateAssets>
<PrivateAssets>
all
</PrivateAssets>
</PackageReference>
</PackageReference>
...
...
tests/src/Properties/AssemblyInfo.cs
View file @
817c1a5f
...
@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
...
@@ -34,4 +34,4 @@ using System.Runtime.InteropServices;
[
assembly
:
AssemblyVersion
(
"1.0.7.0"
)]
[
assembly
:
AssemblyVersion
(
"1.0.7.0"
)]
[
assembly
:
AssemblyFileVersion
(
"1.0.7.0"
)]
[
assembly
:
AssemblyFileVersion
(
"1.0.7.0"
)]
[
assembly
:
AssemblyInformationalVersion
(
"1.0.7+Branch.ma
ster
.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0"
)]
[
assembly
:
AssemblyInformationalVersion
(
"1.0.7+Branch.ma
in
.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0"
)]
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