Skip to content

Commit

Permalink
Added .NET Core support through new Conari 1.4:
Browse files Browse the repository at this point in the history
Up to SDK based type + vsSolutionBuildEvent 1.14 + hMSBuild 2.2 + GetNuTool 1.7

+updated build scripts.
  • Loading branch information
3F committed Dec 19, 2019
1 parent b22839d commit 71c433d
Show file tree
Hide file tree
Showing 18 changed files with 929 additions and 457 deletions.
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

# Our batch files requires CRLF for correct work.
# https://github.com/3F/hMSBuild/issues/2

*.bat text eol=crlf
*.cmd text eol=crlf
*.tpl text eol=crlf
3 changes: 1 addition & 2 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# ~

github: 3F
custom: https://3F.github.com/Donation/
patreon: GitHub3F
ko_fi: github3f
custom: https://3F.github.com/Donation/
258 changes: 194 additions & 64 deletions .vssbe

Large diffs are not rendered by default.

33 changes: 33 additions & 0 deletions 3rd-party.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
LuNari https://github.com/3F/LuNari
- - - - - - - - - - - - - - - - - - - -

# Third-party software components


## LuNari and its various packages may* include or reference:
(*- specific target platforms or some complex archives)

* Conari
https://github.com/3F/Conari

* hMSBuild
https://github.com/3F/hMSBuild

* GetNuTool
https://github.com/3F/GetNuTool


## Dev Dependencies includes the following tools for src:

* vsSolutionBuildEvent
https://github.com/3F/vsSolutionBuildEvent

* MSTest Framework
https://github.com/microsoft/testfx

* hMSBuild
https://github.com/3F/hMSBuild

* GetNuTool
https://github.com/3F/GetNuTool

49 changes: 0 additions & 49 deletions LuNari.nuspec

This file was deleted.

30 changes: 16 additions & 14 deletions LuNari.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuNari", "LuNari\LuNari.csproj", "{359A216F-1B6D-4A82-B75A-09509A23830A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuNari", "LuNari\LuNari.csproj", "{359A216F-1B6D-4A82-B75A-09509A23830A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuNariTest", "LuNariTest\LuNariTest.csproj", "{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LuNariTest", "LuNariTest\LuNariTest.csproj", "{BC464A8F-DA52-4F2B-87FC-F79D130A15FF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{F23EF90C-E980-4827-8107-6FAC6F1B24EF}"
ProjectSection(SolutionItems) = preProject
Expand All @@ -15,7 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{F23EF90C-E
changelog.txt = changelog.txt
gnt.core = gnt.core
LICENSE = LICENSE
LuNari.nuspec = LuNari.nuspec
packages.config = packages.config
Readme.md = Readme.md
EndProjectSection
Expand All @@ -33,14 +32,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "root", "root", "{21C4CA5C-B
Conari\Readme.md = Conari\Readme.md
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Conari", "Conari\Conari\Conari.csproj", "{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Conari", "Conari\Conari\Conari.csproj", "{27152FD4-7B94-4AF0-A7ED-BE7E7A196D57}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConariTest", "Conari\ConariTest\ConariTest.csproj", "{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConariTest", "Conari\ConariTest\ConariTest.csproj", "{0AEEC49E-07A5-4A55-9673-9346C3A7BC03}"
ProjectSection(ProjectDependencies) = postProject
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B} = {CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenDelegates", "Conari\GenDelegates\GenDelegates.csproj", "{40CCC613-93D0-4F80-A99B-36112BD5D815}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenDelegates", "Conari\GenDelegates\GenDelegates.csproj", "{40CCC613-93D0-4F80-A99B-36112BD5D815}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Conari", "Conari", "{B8FABCD7-D14E-4105-AE53-F861D8F09A2E}"
EndProject
Expand Down Expand Up @@ -151,20 +150,20 @@ Global
{40CCC613-93D0-4F80-A99B-36112BD5D815}.Release|x64.Build.0 = Release|Any CPU
{40CCC613-93D0-4F80-A99B-36112BD5D815}.Release|x86.ActiveCfg = Release|Any CPU
{40CCC613-93D0-4F80-A99B-36112BD5D815}.Release|x86.Build.0 = Release|Any CPU
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|Any CPU.ActiveCfg = Debug|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|Any CPU.Build.0 = Debug|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|Any CPU.ActiveCfg = Debug|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|Any CPU.Build.0 = Debug|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|x64.ActiveCfg = Debug|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|x64.Build.0 = Debug|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|x86.ActiveCfg = Debug|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Debug|x86.Build.0 = Debug|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|Any CPU.ActiveCfg = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|Any CPU.Build.0 = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|Any CPU.ActiveCfg = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|Any CPU.Build.0 = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|x64.ActiveCfg = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|x64.Build.0 = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|x86.ActiveCfg = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.PublicRelease|x86.Build.0 = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|Any CPU.ActiveCfg = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|Any CPU.Build.0 = Release|Win32
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|Any CPU.ActiveCfg = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|Any CPU.Build.0 = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|x64.ActiveCfg = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|x64.Build.0 = Release|x64
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B}.Release|x86.ActiveCfg = Release|Win32
Expand All @@ -183,4 +182,7 @@ Global
{40CCC613-93D0-4F80-A99B-36112BD5D815} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
{CC2B5ECA-0D15-4BC8-A779-C6013FA0A11B} = {B8FABCD7-D14E-4105-AE53-F861D8F09A2E}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {66E62E71-C101-4100-A4DF-A2427E9B830F}
EndGlobalSection
EndGlobal
2 changes: 1 addition & 1 deletion LuNari/API/Lua53/LuaH.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected LuaH() { }
public const int LUA_OPIDIV = 6;

/// <summary>
/// performs bitwise AND (&)
/// performs bitwise AND (&amp;)
/// </summary>
public const int LUA_OPBAND = 7;

Expand Down
13 changes: 13 additions & 0 deletions LuNari/InternalsVisibleTo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

[assembly: InternalsVisibleTo
(
"LuNariTest, PublicKey=002400000480000094000000060200000024000052534131000400000100010013224edc96bef3" +
"a150fcff282af16abf503647200e69724148c64f6d6b7ae8b2251052892dd5a0a5d41c6f9f161a" +
"f799e9e94db8bbfa07440c7ada5f0f31de3e7b3d9374bc48839d39592d7c33c8813114f9a467d4" +
"77af6a3eb99fbc5a66084c667046ceac3b962add0a4e87a916fea3c6977ed0e51df496eb3caba8" +
"dc32cd92"
)]

[assembly: Guid("7D9B802F-C175-47A8-AEB4-606EC6B44CC2")]
158 changes: 81 additions & 77 deletions LuNari/LuNari.csproj
Original file line number Diff line number Diff line change
@@ -1,100 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{359A216F-1B6D-4A82-B75A-09509A23830A}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<Version>1.5.1</Version>
<BuildInfoVSSBE></BuildInfoVSSBE>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net40;net472;netstandard2.0</TargetFrameworks>
<RootNamespace>net.r_eg.LuNari</RootNamespace>
<AssemblyName>LuNari</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>LuNari</PackageId>
<Copyright>Copyright (c) 2016,2017,2019 Denis Kuzmin &lt; [email protected] &gt; GitHub/3F</Copyright>
<Title>[ LuNari ] Lua for .NET: Lua 5.4, 5.3, 5.2, 5.1, ...</Title>
<PackageIcon>LuNari.png</PackageIcon>
<IconUrl>https://raw.githubusercontent.com/3F/LuNari/master/LuNari/Resources/LuNari.png</IconUrl>
<Description>

Lua for .NET on Conari engine
Provides support* for all popular versions, like: 5.4, 5.3, 5.2, 5.1, ...

* There are several methods to use LuNari:
API-layer and binding at runtime (DLR, Lambda expressions) with any Lua functions;
_ _ _ _ _ _

using(var l = new Lua&lt;ILua53&gt;("Lua.dll")) { /* ILua51, ILua52, ILua53, ... */ }
_ _ _ _ _ _
Source code and all details here: https://github.com/3F/LuNari

=======================================
gnt /p:ngpackages="LuNari/$(Version)"
================== https://github.com/3F/GetNuTool

Build info:

$(BuildInfoVSSBE)
</Description>
<PackageOwners>reg</PackageOwners>
<PackageProjectUrl>https://github.com/3F/LuNari</PackageProjectUrl>
<RepositoryUrl>https://github.com/3F/LuNari</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>Lua API dll Lua54 Lua53 Lua52 Lua51 LuNari LunaRoad KeraLua NLua LuaInterface Conari API dll dotnet</PackageTags>
<PackageReleaseNotes>changelog: https://github.com/3F/LuNari/blob/master/changelog.txt </PackageReleaseNotes>
<Authors>github.com/3F/LuNari</Authors>
<DocumentationFile>$(OutputPath)$(AssemblyName).xml</DocumentationFile>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<NoWarn>1701;1702;CS1591;IDE1006</NoWarn>
<LangVersion>latest</LangVersion>
<PackageIconUrl>https://raw.githubusercontent.com/3F/LuNari/master/LuNari/Resources/LuNari.png</PackageIconUrl>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

<PropertyGroup>
<IsNetCoreFamilyTarget>false</IsNetCoreFamilyTarget>
<IsNetCoreFamilyTarget Condition="$(TargetFramework.StartsWith('nets')) Or $(TargetFramework.StartsWith('netc'))">true</IsNetCoreFamilyTarget>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>CS1591,IDE1006</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

<PropertyGroup Condition=" '$(Configuration)' == 'Release' Or '$(Configuration)' == 'PublicRelease' ">
<DefineConstants />
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>
</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Release\LuNari.XML</DocumentationFile>
<NoWarn>CS1591,IDE1006</NoWarn>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>

<PropertyGroup Condition="'$(IsNetCoreFamilyTarget)' == 'true'">
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Reference Include="System.Core" />
<None Include="..\LICENSE" Pack="true" PackagePath="" />
<None Include="..\Readme.md" Pack="true" PackagePath="" />
<None Include="..\3rd-party.txt" Pack="true" PackagePath="" />
<None Include="..\changelog.txt" Pack="true" PackagePath="" />
<None Include="..\.version" Pack="true" PackagePath="" />
<!-- NuGet bug when naming with 'build' keyword: https://github.com/NuGet/Home/issues/8810 -->
<None Include="obj\release-info.txt" Condition="Exists('obj\release-info.txt')" Pack="true" PackagePath="" />
<None Include="Resources\LuNari.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<Compile Include="API\Binder.cs" />
<Compile Include="API\IAPI.cs" />
<Compile Include="API\Lua51\LuaH.cs" />
<Compile Include="API\Lua52\LuaH.cs" />
<Compile Include="API\Lua53\LuaH.cs" />
<Compile Include="API\LuaImplN.cs" />
<Compile Include="API\LuaFuncN.cs" />
<Compile Include="API\ILuaN.cs" />
<Compile Include="API\ILuaCommon.cs" />
<Compile Include="API\ILevel.cs" />
<Compile Include="API\Bridge.cs" />
<Compile Include="API\IBinder.cs" />
<Compile Include="API\Lua52\Impl52.cs" />
<Compile Include="API\Lua53\Impl53.cs" />
<Compile Include="API\LuaX.cs" />
<Compile Include="API\Lua51\Impl51.cs" />
<Compile Include="API\Lua53\Func53.cs" />
<Compile Include="API\Lua53\ILua53.cs" />
<Compile Include="API\Lua52\ILua52.cs" />
<Compile Include="API\Lua52\Func52.cs" />
<Compile Include="API\LuaVersion.cs" />
<Compile Include="LuaConfig.cs" />
<Compile Include="LuNariVersion.cs" />
<Compile Include="API\Lua51\Func51.cs" />
<Compile Include="API\Lua51\ILua51.cs" />
<Compile Include="LuaState.cs" />
<Compile Include="LuaCFunction.cs" />
<Compile Include="Exceptions\CommonException.cs" />
<Compile Include="ILua.cs" />
<Compile Include="Lua.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Types\LuaInteger.cs" />
<Compile Include="_\LuaState.cs" />
<Compile Include="Types\LuaNumber.cs" />
<None Include="..\tools\hMSBuild.bat" Pack="true" PackagePath="tools\" />
<None Include="..\tools\gnt.bat" Pack="true" PackagePath="tools\" />
</ItemGroup>
<ItemGroup>
<None Include="key.snk" />
<None Include="Resources\License.md" />
<None Include="Resources\LuNari.png" />

<ItemGroup Condition="'$(IsNetCoreFamilyTarget)' != 'true'">
<Reference Include="System.Core" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Conari\Conari\Conari.csproj">
<Project>{27152fd4-7b94-4af0-a7ed-be7e7a196d57}</Project>
<Name>Conari</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

</Project>
4 changes: 2 additions & 2 deletions LuNari/LuNariVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public struct LuNariVersion
public const string BRANCH_NAME = "-";
public const string BRANCH_REVC = "-";

internal const string S_INFO = S_NUM_REV + " [ " + BRANCH_SHA1 + " ]";
internal const string S_INFO_FULL = S_INFO + " /'" + BRANCH_NAME + "':" + BRANCH_REVC;
internal const string S_INFO = S_NUM_REV + "+" + BRANCH_SHA1;
internal const string S_INFO_FULL = S_INFO + ":" + BRANCH_NAME + "-" + BRANCH_REVC;
}
}
Loading

0 comments on commit 71c433d

Please sign in to comment.