Commit 817c1a5f authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Rename `master` -> `main`

parent 3b9802f2
...@@ -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 master branch # Only watch the main branch
branches: branches:
only: only:
- master - main
# Notify if needed # Notify if needed
notifications: notifications:
......
...@@ -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/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/nlua/NLua/blob/main/LICENSE</licenseUrl>
<projectUrl>https://github.com/nlua/NLua</projectUrl> <projectUrl>https://github.com/nlua/NLua</projectUrl>
<iconUrl>https://raw.githubusercontent.com/nlua/NLua/master/NLua.png</iconUrl> <iconUrl>https://raw.githubusercontent.com/nlua/NLua/main/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>
......
...@@ -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/master/LICENSE</licenseUrl> <licenseUrl>https://github.com/nlua/NLua/blob/main/LICENSE</licenseUrl>
<projectUrl>https://github.com/nlua/NLua</projectUrl> <projectUrl>https://github.com/nlua/NLua</projectUrl>
<iconUrl>https://raw.githubusercontent.com/nlua/NLua/master/NLua.png</iconUrl> <iconUrl>https://raw.githubusercontent.com/nlua/NLua/main/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>
......
...@@ -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) | [![Linux](https://travis-ci.org/NLua/NLua.svg?branch=master)](https://travis-ci.org/NLua/NLua) | | ![linux](https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=travis&label&color=orange) | [![Linux](https://travis-ci.org/NLua/NLua.svg?branch=main)](https://travis-ci.org/NLua/NLua) |
| ![win](https://badgen.net/badge/icon/Windows?icon=windows&label&color=blue) | [![Build status](https://ci.appveyor.com/api/projects/status/jkqcy9m9k35jwolx?svg=true)](https://ci.appveyor.com/project/viniciusjarina/NLua)| | ![win](https://badgen.net/badge/icon/Windows?icon=windows&label&color=blue) | [![Build status](https://ci.appveyor.com/api/projects/status/jkqcy9m9k35jwolx?svg=true)](https://ci.appveyor.com/project/viniciusjarina/NLua)|
| ![mac](https://badgen.net/badge/icon/macOS,iOS,tvOS,watchOS?icon=apple&label&color=purple&list=1) | [![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=master&jobName=Mac)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=master) | | ![mac](https://badgen.net/badge/icon/macOS,iOS,tvOS,watchOS?icon=apple&label&color=purple&list=1) | [![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=main&jobName=Mac)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=main) |
|![win](https://badgen.net/badge/icon/Windows,.NET%20Core?icon=windows&label&list=1) |[![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=master&jobName=Windows)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=master) | |![win](https://badgen.net/badge/icon/Windows,.NET%20Core?icon=windows&label&list=1) |[![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=main&jobName=Windows)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=main) |
|![linuxnet](https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=terminal&label&list=1) |[![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=master&jobName=Linux)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=master) | |![linuxnet](https://badgen.net/badge/icon/Ubuntu%20Linux%20x64?icon=terminal&label&list=1) |[![Build Status](https://dev.azure.com/codefoco/NuGets/_apis/build/status/NLua?branchName=main&jobName=Linux)](https://dev.azure.com/codefoco/NuGets/_build/latest?definitionId=65&branchName=main) |
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.
[![Cmd](https://raw.github.com/NLua/NLua/master/extras/screenshot/NLuaCommand.gif)]() [![Cmd](https://raw.github.com/NLua/NLua/main/extras/screenshot/NLuaCommand.gif)]()
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).
......
...@@ -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.12.0" /> <PackageReference Include="NUnit" Version="3.13.0" />
</ItemGroup> </ItemGroup>
<Import Project="..\targets\NLua.Sign.targets" /> <Import Project="..\targets\NLua.Sign.targets" />
......
...@@ -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 "master") { if ($branchName -ne "main") {
return $branchName return $branchName
} }
return "beta" return "beta"
......
...@@ -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.master.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0")] [assembly: AssemblyInformationalVersion("1.0.7+Branch.main.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0")]
[assembly: AssemblyFileVersion("1.4.1.0")] [assembly: AssemblyFileVersion("1.4.1.0")]
...@@ -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.12.0</Version> <Version>3.13.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NUnit3TestAdapter"> <PackageReference Include="NUnit3TestAdapter">
<Version>3.17.0</Version> <Version>3.17.0</Version>
......
...@@ -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.12.0" /> <PackageReference Include="nunit" Version="3.13.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>
......
...@@ -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.25</Version> <Version>1.0.26</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>
......
...@@ -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.25</Version> <Version>1.0.26</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>
......
...@@ -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.master.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0")] [assembly: AssemblyInformationalVersion("1.0.7+Branch.main.Sha.80a328a64f12ed9032a0f14a75e6ecad967514d0")]
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