Skip to content

Commit

Permalink
NLua as NuGet dependency, updated copyright to 2014
Browse files Browse the repository at this point in the history
  • Loading branch information
Niklas Rother committed Feb 28, 2014
1 parent 9450545 commit 0b53074
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 14 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -4,3 +4,4 @@ Debug/
Release/
*.suo
TestResults/
packages/*
23 changes: 15 additions & 8 deletions DynamicLua/DynamicLua.csproj
Expand Up @@ -13,8 +13,9 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<BuildPackage>true</BuildPackage>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<BuildPackage>true</BuildPackage>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -35,9 +36,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="NLua, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="KeraLua, Version=1.3.0.0, Culture=neutral, PublicKeyToken=04d04586786c6f34, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>.\NLua.dll</HintPath>
<HintPath>..\packages\NLua.1.3.0.2\lib\net40\x86\KeraLua.dll</HintPath>
</Reference>
<Reference Include="NLua, Version=1.3.0.0, Culture=neutral, PublicKeyToken=8df2ab518030ea95, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\NLua.1.3.0.2\lib\net40\x86\NLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -64,21 +69,23 @@
<None Include="lua52.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="NLua.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Content Include="NOTICE.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Readme.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<None Include="DynamicLua.nuspec" />
<None Include="DynamicLua.nuspec" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<PropertyGroup>
<PostBuildEvent>
xcopy /s /y "D:\Code\DynamicLua\packages\NLua.1.3.0.2\lib\native\x64\*.*" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
<!-- 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">
Expand Down
7 changes: 4 additions & 3 deletions DynamicLua/DynamicLua.nuspec
Expand Up @@ -8,20 +8,21 @@
<owners>Niklas Rother</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<summary>$description$</summary>
<copyright>Copyright © Niklas Rother 2011-2013</copyright>
<copyright>Copyright © Niklas Rother 2011-2014</copyright>
<licenseUrl>http://dynamiclua.codeplex.com/license</licenseUrl>
<projectUrl>http://dynamiclua.codeplex.com/</projectUrl>
<iconUrl>http://download-codeplex.sec.s-msft.com/Download?ProjectName=dynamiclua&amp;DownloadId=292901&amp;Build=20748</iconUrl>
<description>
DynamicLua is a wrapper for NLua heavily using the .NET 4 "dynamic" Feature. (NLua is a Lua&lt;-&gt;C# Bridge)
It makes it easier and more idiomatic to use Lua in C# Code.
</description>
<dependencies>
<dependency id="NLua" version="1.3.0.2" />
</dependencies>
</metadata>
<files>
<file src="bin\$configuration$\KeraLua.dll"
target="lib\net40-Client\KeraLua.dll" />
<file src="bin\$configuration$\NLua.dll"
target="lib\net40-Client\NLua.dll" />
<file src="bin\$configuration$\lua52.dll"
target="lib\net40-Client\lua52.dll" />
</files>
Expand Down
Binary file removed DynamicLua/NLua.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions DynamicLua/NOTICE.txt
@@ -1,4 +1,4 @@
DynamicLua is developed by Niklas Rother, 2011-2013.
DynamicLua is developed by Niklas Rother, 2011-2014.
You will find his (german) Blog at niklas-rother.de and may send a mail to info (a) niklas (-) rother (.) de.

It is based on NLua and Lua, both published under the MIT License.
Expand All @@ -7,4 +7,4 @@ Documentation at http://dynamiclua.codeplex.com

I hope you enjoy this piece of software!

DynamicLua (c) 2011-2013 by Niklas Rother
DynamicLua (c) 2011-2014 by Niklas Rother
2 changes: 1 addition & 1 deletion DynamicLua/Readme.txt
Expand Up @@ -37,7 +37,7 @@ Version 1.0 beta

Licence
-------
Copyright 2011-2013 Niklas Rother
Copyright 2011-2014 Niklas Rother

DynamicLua is licensed under the Apache License, Version 2.0.
Lua and NLua are licensed under the MIT Licence.
Expand Down
4 changes: 4 additions & 0 deletions DynamicLua/packages.config
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLua" version="1.3.0.2" targetFramework="net40-Client" />
</packages>

0 comments on commit 0b53074

Please sign in to comment.