Commit 07024da9 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Update Year and NuGets

parent c7353487
Copyright (c) 2019 Vinicius Jarina (viniciusjarina@gmail.com) Copyright (c) 2020 Vinicius Jarina (viniciusjarina@gmail.com)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal of this software and associated documentation files (the "Software"), to deal
......
...@@ -12,23 +12,23 @@ ...@@ -12,23 +12,23 @@
<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>
<releaseNotes>Release: 2bffe65</releaseNotes> <releaseNotes>Release: 2bffe65</releaseNotes>
<copyright>Copyright © NLua 2019</copyright> <copyright>Copyright © NLua 2020</copyright>
<tags>lua nlua</tags> <tags>lua nlua</tags>
<dependencies> <dependencies>
<dependency id="KeraLua" version="1.0.22" /> <dependency id="KeraLua" version="1.0.24" />
</dependencies> </dependencies>
</metadata> </metadata>
<files> <files>
<file src="lib\Release\MonoAndroid\NLua.dll" target="lib\MonoAndroid" /> <file src="lib\Release\MonoAndroid\NLua.dll" target="lib\MonoAndroid" />
<file src="lib\Release\net45\NLua.dll" target="lib\net45" /> <file src="lib\Release\net45\NLua.dll" target="lib\net45" />
<file src="lib\Release\netcore\netcoreapp2.0\NLua.dll" target="lib\netcoreapp2.0" /> <file src="lib\Release\netcore\netcoreapp3.0\NLua.dll" target="lib\netcoreapp3.0" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" /> <file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" />
<file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" /> <file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" />
<file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" /> <file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" />
<file src="lib\Release\xamarintvos\NLua.dll" target="lib\xamarintvos" /> <file src="lib\Release\xamarintvos\NLua.dll" target="lib\xamarintvos" />
<file src="lib\Release\xamarinwatchos\NLua.dll" target="lib\xamarinwatchos" /> <file src="lib\Release\xamarinwatchos\NLua.dll" target="lib\xamarinwatchos" />
<!-- <file src="lib\Release\netstandard2.0\NLua.xml" target="lib\netstandard2.0" /> <!-- <file src="lib\Release\netstandard2.0\NLua.xml" target="lib\netstandard2.0" />
<file src="lib\Release\netcore\netcoreapp2.0\NLua.xml" target="lib\netcoreapp2.0" /> <file src="lib\Release\netcore\netcoreapp3.0\NLua.xml" target="lib\netcoreapp3.0" />
<file src="lib\Release\MonoAndroid\NLua.xml" target="lib\MonoAndroid" /> <file src="lib\Release\MonoAndroid\NLua.xml" target="lib\MonoAndroid" />
<file src="lib\Release\net45\NLua.xml" target="lib\xamarinmac" /> <file src="lib\Release\net45\NLua.xml" target="lib\xamarinmac" />
<file src="lib\Release\net45\NLua.xml" target="lib\xamarintvos" /> <file src="lib\Release\net45\NLua.xml" target="lib\xamarintvos" />
......
...@@ -220,7 +220,7 @@ You can re-write the `import` function before load the user script and if the us ...@@ -220,7 +220,7 @@ You can re-write the `import` function before load the user script and if the us
[Lua-Sandbox user-list](http://lua-users.org/wiki/SandBoxes) [Lua-Sandbox user-list](http://lua-users.org/wiki/SandBoxes)
Copyright (c) 2019 Vinicius Jarina (viniciusjarina@gmail.com) Copyright (c) 2020 Vinicius Jarina (viniciusjarina@gmail.com)
NLua 1.4.x NLua 1.4.x
---------- ----------
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Mono.Android" /> <Reference Include="Mono.Android" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\MonoAndroid\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\MonoAndroid\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="monoandroid81" /> <package id="KeraLua" version="1.0.24" targetFramework="monoandroid81" />
</packages> </packages>
\ No newline at end of file
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" /> <Reference Include="Xamarin.TVOS" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\xamarintvos\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\xamarintvos\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="xamarintvos10" /> <package id="KeraLua" version="1.0.24" targetFramework="xamarintvos10" />
</packages> </packages>
\ No newline at end of file
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.WatchOS" /> <Reference Include="Xamarin.WatchOS" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\xamarinwatchos\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\xamarinwatchos\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="xamarinwatchos10" /> <package id="KeraLua" version="1.0.24" targetFramework="xamarinwatchos10" />
</packages> </packages>
\ No newline at end of file
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" /> <Reference Include="Xamarin.Mac" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\xamarinmac\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\xamarinmac\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="xamarinmac20" /> <package id="KeraLua" version="1.0.24" targetFramework="xamarinmac20" />
</packages> </packages>
\ No newline at end of file
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" /> <Reference Include="Xamarin.iOS" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\xamarinios\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\xamarinios\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="xamarinios10" /> <package id="KeraLua" version="1.0.24" targetFramework="xamarinios10" />
</packages> </packages>
\ No newline at end of file
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="KeraLua"> <Reference Include="KeraLua">
<HintPath>..\..\packages\KeraLua.1.0.22\lib\net45\KeraLua.dll</HintPath> <HintPath>..\..\packages\KeraLua.1.0.24\lib\net45\KeraLua.dll</HintPath>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
...@@ -43,5 +43,5 @@ ...@@ -43,5 +43,5 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" /> <Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="..\targets\NLua.Sign.targets" /> <Import Project="..\targets\NLua.Sign.targets" />
<Import Project="..\..\packages\KeraLua.1.0.22\build\net45\KeraLua.targets" Condition="Exists('..\..\packages\KeraLua.1.0.22\build\net45\KeraLua.targets')" /> <Import Project="..\..\packages\KeraLua.1.0.24\build\net45\KeraLua.targets" Condition="Exists('..\..\packages\KeraLua.1.0.24\build\net45\KeraLua.targets')" />
</Project> </Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="KeraLua" version="1.0.22" targetFramework="net45" /> <package id="KeraLua" version="1.0.24" targetFramework="net45" />
</packages> </packages>
\ No newline at end of file
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
<RootNamespace>NLua</RootNamespace> <RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName> <AssemblyName>NLua</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
</PropertyGroup> </PropertyGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" /> <Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.22" /> <PackageReference Include="KeraLua" Version="1.0.24" />
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" /> <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.3.0" /> <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
</ItemGroup> </ItemGroup>
<Import Project="..\targets\NLua.Sign.targets" /> <Import Project="..\targets\NLua.Sign.targets" />
</Project> </Project>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" /> <Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.22" /> <PackageReference Include="KeraLua" Version="1.0.24" />
<PackageReference Include="NUnit" Version="3.12.0" /> <PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup> </ItemGroup>
......
...@@ -272,6 +272,6 @@ function Update-Ensure-Git-Not-Detached () ...@@ -272,6 +272,6 @@ function Update-Ensure-Git-Not-Detached ()
return return
} }
$currentTag = Get-Git-Current-Tag $currentTag = Get-Git-Current-Tag
& git checkout -B $currentTag $result = [string](& git checkout -B $currentTag)
# We are using -B because maybe the branch alrady exist # We are using -B because maybe the branch alrady exist
} }
pool:
name: Hosted Ubuntu 1604
demands: msbuild
steps:
- checkout: self
- task: UseDotNet@2
displayName: 'Install .NET Core 3.0.102'
inputs:
packageType: sdk
version: '3.0.102'
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: NuGetToolInstaller@1
displayName: 'Use NuGet 5.4.0'
inputs:
versionSpec: 5.4.0
- task: NuGetCommand@2
displayName: 'NuGet restore'
inputs:
restoreSolution: NLua.Core.sln
- task: MSBuild@1
displayName: 'Build .NET Core'
inputs:
solution: NLua.Core.sln
configuration: Release
msbuildArguments: /restore
- task: DotNetCoreCLI@2
displayName: 'dotnet vstest'
inputs:
command: custom
custom: vstest
arguments: '.\tests\build\netcore\bin\Release\netcoreapp3.0\KeraLuaTest.Core.dll'
- task: SendTelegramNotification@0
condition: in(variables['Agent.JobStatus'], 'SucceededWithIssues')
inputs:
botToken: '$(botToken)'
chats: '$(chatId)'
taskStatus: false
message: |
⚠️ <b>Warning!</b> <a href="$(Build.Repository.Uri)">$(Build.DefinitionName)</a> (<code>$(Build.SourceBranchName)</code>)
<pre>$(Build.SourceVersion)</pre>
$(Build.SourceVersionMessage) by $(Build.QueuedBy)
- task: SendTelegramNotification@0
condition: in(variables['Agent.JobStatus'], 'Failed')
inputs:
botToken: '$(botToken)'
chats: '$(chatId)'
taskStatus: false
buildQueuedBy: false
message: |
❌ <b>Fail!</b> <a href="$(Build.Repository.Uri)">$(Build.DefinitionName)</a> (<code>$(Build.SourceBranchName)</code>)
<pre>$(Build.SourceVersion)</pre>
$(Build.SourceVersionMessage) by $(Build.QueuedBy)
- task: SendTelegramNotification@0
condition: in(variables['Agent.JobStatus'], 'Succeeded')
inputs:
botToken: '$(botToken)'
chats: '$(chatId)'
taskStatus: false
buildQueuedBy: false
message: |
✅ <b>Success!</b> <a href="$(Build.Repository.Uri)">$(Build.DefinitionName)</a> (<code>$(Build.SourceBranchName)</code>)
<pre>$(Build.SourceVersion)</pre>
$(Build.SourceVersionMessage) by $(Build.QueuedBy)
#
\ No newline at end of file
pool: pool:
name: Hosted VS2017 vmImage: 'windows-2019'
demands: demands:
- msbuild - msbuild
- visualstudio - visualstudio
- vstest - vstest
steps: steps:
- task: UseDotNet@2
displayName: 'Install .NET Core 3.0.102'
inputs:
packageType: sdk
version: '3.0.102'
installationPath: $(Agent.ToolsDirectory)/dotnet
- task: NuGetToolInstaller@1 - task: NuGetToolInstaller@1
displayName: 'Use NuGet 4.7.3' displayName: 'Use NuGet 5.4.0'
inputs: inputs:
versionSpec: 4.7.3 versionSpec: 5.4.0
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: 'NuGet restore' displayName: 'NuGet restore'
...@@ -30,9 +37,10 @@ steps: ...@@ -30,9 +37,10 @@ steps:
- task: PowerShell@2 - task: PowerShell@2
displayName: 'PreBuild Script' displayName: 'PreBuild Script'
inputs: inputs:
targetType: filePath filePath: './devops/PreBuild.ps1'
filePath: ./devops/PreBuild.ps1
arguments: 'NLua NLua.nuspec' arguments: 'NLua NLua.nuspec'
errorActionPreference: 'silentlyContinue'
pwsh: true
- task: MSBuild@1 - task: MSBuild@1
displayName: 'Build solution NLua.sln' displayName: 'Build solution NLua.sln'
...@@ -52,7 +60,7 @@ steps: ...@@ -52,7 +60,7 @@ steps:
inputs: inputs:
command: custom command: custom
custom: vstest custom: vstest
arguments: '.\tests\build\netcore\bin\Release\netcoreapp2.0\NLuaTest.dll' arguments: '.\tests\build\netcore\bin\Release\netcoreapp3.0\NLuaTest.dll'
- task: MSBuild@1 - task: MSBuild@1
displayName: 'Build Android' displayName: 'Build Android'
......
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