Commit ea506a73 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Bump KeraLua + net6 -> net7

parent 9df4990c
......@@ -40,6 +40,6 @@ tests/build/xamarintvos/TEST-Result-Xamarin.TVOS.xml
tests/build/xamarinios/result.xml
tests/build/xamarinios/TEST-Result-Xamarin.iOS.xml
tests/build/xamarintvos/result.xml
build/net6.0/obj
tests/build/net6.0/obj/
tests/build/net6.0/bin/
build/net7.0/obj
tests/build/net7.0/obj/
tests/build/net7.0/bin/
......@@ -15,7 +15,7 @@
<copyright>Copyright © NLua 2023</copyright>
<tags>lua nlua</tags>
<dependencies>
<dependency id="KeraLua" version="1.3.3" />
<dependency id="KeraLua" version="1.3.4" />
</dependencies>
<packageTypes>
<packageType name="SymbolsPackage" />
......@@ -29,18 +29,18 @@
<file src="lib\Release\net46\NLua.pdb" target="lib\net46" />
<file src="lib\Release\uap10.0\NLua.dll" target="lib\uap10.0" />
<file src="lib\Release\uap10.0\NLua.pdb" target="lib\uap10.0" />
<file src="lib\Release\net6.0\NLua.dll" target="lib\net6.0" />
<file src="lib\Release\net6.0\NLua.pdb" target="lib\net6.0" />
<file src="lib\Release\net6.0-android\NLua.dll" target="lib\net6.0-android28" />
<file src="lib\Release\net6.0-android\NLua.pdb" target="lib\net6.0-android28" />
<file src="lib\Release\net6.0-ios\NLua.dll" target="lib\net6.0-ios11.0" />
<file src="lib\Release\net6.0-ios\NLua.pdb" target="lib\net6.0-ios11.0" />
<file src="lib\Release\net6.0-maccatalyst\NLua.dll" target="lib\net6.0-maccatalyst13.0" />
<file src="lib\Release\net6.0-maccatalyst\NLua.pdb" target="lib\net6.0-maccatalyst13.0" />
<file src="lib\Release\net6.0-tvos\NLua.dll" target="lib\net6.0-tvos11.0" />
<file src="lib\Release\net6.0-tvos\NLua.pdb" target="lib\net6.0-tvos11.0" />
<file src="lib\Release\net6.0-macos\NLua.dll" target="lib\net6.0-macos10.13" />
<file src="lib\Release\net6.0-macos\NLua.pdb" target="lib\net6.0-macos10.13" />
<file src="lib\Release\net7.0\NLua.dll" target="lib\net7.0" />
<file src="lib\Release\net7.0\NLua.pdb" target="lib\net7.0" />
<file src="lib\Release\net7.0-android\NLua.dll" target="lib\net7.0-android28" />
<file src="lib\Release\net7.0-android\NLua.pdb" target="lib\net7.0-android28" />
<file src="lib\Release\net7.0-ios\NLua.dll" target="lib\net7.0-ios11.0" />
<file src="lib\Release\net7.0-ios\NLua.pdb" target="lib\net7.0-ios11.0" />
<file src="lib\Release\net7.0-maccatalyst\NLua.dll" target="lib\net7.0-maccatalyst13.0" />
<file src="lib\Release\net7.0-maccatalyst\NLua.pdb" target="lib\net7.0-maccatalyst13.0" />
<file src="lib\Release\net7.0-tvos\NLua.dll" target="lib\net7.0-tvos11.0" />
<file src="lib\Release\net7.0-tvos\NLua.pdb" target="lib\net7.0-tvos11.0" />
<file src="lib\Release\net7.0-macos\NLua.dll" target="lib\net7.0-macos10.13" />
<file src="lib\Release\net7.0-macos\NLua.pdb" target="lib\net7.0-macos10.13" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" />
<file src="lib\Release\netstandard2.0\NLua.pdb" target="lib\netstandard2.0" />
<file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" />
......
......@@ -7,14 +7,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLua", "NLua", "{4A43DAAC-F
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Shared.shproj", "{BD205AD6-760E-48F3-BAB2-21447396BD17}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.net6.0", "build\net6.0\NLua.net6.0.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.net7.0", "build\net7.0\NLua.net7.0.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D432F663-23CC-48B1-A413-935E5393493C}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest.net6.0", "tests\build\net6.0\NLuaTest.net6.0.csproj", "{3E63EFA4-AEBA-4F9E-B87A-47EEF4510031}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest.net7.0", "tests\build\net7.0\NLuaTest.net7.0.csproj", "{3E63EFA4-AEBA-4F9E-B87A-47EEF4510031}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
......
......@@ -15,7 +15,7 @@
<copyright>Copyright © NLua 2023</copyright>
<tags>lua nlua</tags>
<dependencies>
<dependency id="KeraLua" version="1.3.3" />
<dependency id="KeraLua" version="1.3.4" />
</dependencies>
<repository type="git" url="https://github.com/nlua/nlua" commit="708ba30e982deccb1248d099806bc00e362fbda4" />
</metadata>
......@@ -25,12 +25,12 @@
<file src="lib\Release\net46\NLua.dll" target="lib\net46" />
<file src="lib\Release\uap10.0\NLua.dll" target="lib\uap10.0" />
<file src="lib\Release\uap10.0\NLua.pri" target="lib\uap10.0" />
<file src="lib\Release\net6.0\NLua.dll" target="lib\net6.0" />
<file src="lib\Release\net6.0-android\NLua.dll" target="lib\net6.0-android28" />
<file src="lib\Release\net6.0-ios\NLua.dll" target="lib\net6.0-ios11.0" />
<file src="lib\Release\net6.0-maccatalyst\NLua.dll" target="lib\net6.0-maccatalyst13.0" />
<file src="lib\Release\net6.0-tvos\NLua.dll" target="lib\net6.0-tvos11.0" />
<file src="lib\Release\net6.0-macos\NLua.dll" target="lib\net6.0-macos10.13" />
<file src="lib\Release\net7.0\NLua.dll" target="lib\net7.0" />
<file src="lib\Release\net7.0-android\NLua.dll" target="lib\net7.0-android28" />
<file src="lib\Release\net7.0-ios\NLua.dll" target="lib\net7.0-ios11.0" />
<file src="lib\Release\net7.0-maccatalyst\NLua.dll" target="lib\net7.0-maccatalyst13.0" />
<file src="lib\Release\net7.0-tvos\NLua.dll" target="lib\net7.0-tvos11.0" />
<file src="lib\Release\net7.0-macos\NLua.dll" target="lib\net7.0-macos10.13" />
<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.pdb" target="lib\xamarinios" />
......
......@@ -50,7 +50,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net6.0-android</TargetFramework>
<TargetFramework>net7.0-android</TargetFramework>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......@@ -42,7 +42,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -57,7 +57,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net6.0-tvos</TargetFramework>
<TargetFramework>net7.0-tvos</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......@@ -50,7 +50,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
......@@ -61,7 +61,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net6.0-ios</TargetFramework>
<TargetFramework>net7.0-ios</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......@@ -55,7 +55,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua" Version="1.3.3">
<PackageReference Include="KeraLua" Version="1.3.4">
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net6.0-maccatalyst</TargetFramework>
<TargetFramework>net7.0-maccatalyst</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......@@ -54,7 +54,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -70,7 +70,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net6.0-macos</TargetFramework>
<TargetFramework>net7.0-macos</TargetFramework>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......@@ -62,7 +62,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
......@@ -45,7 +45,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
......
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
......@@ -29,7 +29,7 @@
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.3.3">
<PackageReference Include="KeraLua" Version="1.3.4">
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
......
......@@ -33,7 +33,7 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.3.3">
<PackageReference Include="KeraLua" Version="1.3.4">
</PackageReference>
</ItemGroup>
......
......@@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.13</Version>
......
......@@ -40,18 +40,18 @@ stages:
- checkout: self
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.net6.0.sln'
displayName: 'dotnet build NLua.net7.0.sln'
inputs:
command: custom
custom: build
arguments: '.\NLua.net6.0.sln /p:Configuration=Release'
arguments: '.\NLua.net7.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet vstest'
inputs:
command: custom
custom: vstest
arguments: 'tests/build/net6.0/bin/Release/net6.0/NLuaTest.dll'
arguments: 'tests/build/net7.0/bin/Release/net7.0/NLuaTest.dll'
- template: send-telegram.yml@templates
......@@ -104,10 +104,15 @@ stages:
solution: NLua.Mac.sln
configuration: Release
- script: 'dotnet test ./tests/build/net46/bin/Release/NLuaTest.dll -l:trx;'
- script: 'nuget install NUnit.ConsoleRunner -Version 3.16.3 -source "https://api.nuget.org/v3/index.json" -OutputDirectory .'
workingDirectory: ./
displayName: 'nuget install NUnit.ConsoleRunner'
# reverted back to use NUnit.ConsoleRunner because Microsoft keeps breaking .NET
- script: 'mono NUnit.ConsoleRunner.3.16.3/tools/nunit3-console.exe ./tests/build/net46/bin/Release/NLuaTest.dll'
displayName: 'Run OSX tests'
- script: 'mv TestResults/*.trx ./TEST-Result-Mac.xml'
- script: 'mv TestResult.xml ./TEST-Result-Mac.xml'
displayName: 'Rename Test result'
- task: PublishTestResults@2
......@@ -162,32 +167,32 @@ stages:
publishLocation: 'pipeline'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/iOS/NLua.net6.0-ios.csproj'
displayName: 'dotnet build ./build/iOS/NLua.net7.0-ios.csproj'
inputs:
command: custom
custom: build
arguments: './build/iOS/NLua.net6.0-ios.csproj /p:Configuration=Release'
arguments: './build/iOS/NLua.net7.0-ios.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/iOS/NLua.net6.0-maccatalyst.csproj'
displayName: 'dotnet build ./build/iOS/NLua.net7.0-maccatalyst.csproj'
inputs:
command: custom
custom: build
arguments: './build/iOS/NLua.net6.0-maccatalyst.csproj /p:Configuration=Release'
arguments: './build/iOS/NLua.net7.0-maccatalyst.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/macOS/NLua.net6.0-macos.csproj'
displayName: 'dotnet build ./build/macOS/NLua.net7.0-macos.csproj'
inputs:
command: custom
custom: build
arguments: './build/macOS/NLua.net6.0-macos.csproj /p:Configuration=Release'
arguments: './build/macOS/NLua.net7.0-macos.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/TVOS/NLua.net6.0-tvos.csproj'
displayName: 'dotnet build ./build/TVOS/NLua.net7.0-tvos.csproj'
inputs:
command: custom
custom: build
arguments: './build/TVOS/NLua.net6.0-tvos.csproj /p:Configuration=Release'
arguments: './build/TVOS/NLua.net7.0-tvos.csproj /p:Configuration=Release'
- task: PublishPipelineArtifact@1
displayName: 'Publish Pipeline Artifact: libs.mac'
......@@ -264,11 +269,11 @@ stages:
msbuildArguments: /restore
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.net6.0.sln'
displayName: 'dotnet build NLua.net7.0.sln'
inputs:
command: custom
custom: build
arguments: '.\NLua.net6.0.sln /p:Configuration=Release'
arguments: '.\NLua.net7.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.netstandard2.0.sln'
......@@ -278,18 +283,18 @@ stages:
arguments: '.\NLua.netstandard2.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/Android/NLua.net6.0-android.csproj'
displayName: 'dotnet build ./build/Android/NLua.net7.0-android.csproj'
inputs:
command: custom
custom: build
arguments: './build/Android/NLua.net6.0-android.csproj /p:Configuration=Release'
arguments: './build/Android/NLua.net7.0-android.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet vstest'
inputs:
command: custom
custom: vstest
arguments: '.\tests\build\net6.0\bin\Release\net6.0\NLuaTest.dll'
arguments: '.\tests\build\net7.0\bin\Release\net7.0\NLuaTest.dll'
- script: 'dotnet test .\tests\build\net46\bin\Release\NLuaTest.dll -l:trx --Platform:x64'
displayName: 'Run Windows Tests'
......
......@@ -10,7 +10,7 @@ namespace NLua.Exceptions
public class LuaScriptException : LuaException
{
/// <summary>
/// Returns true if the exception has occured as the result of a .NET exception in user code
/// Returns true if the exception has occurred as the result of a .NET exception in user code
/// </summary>
public bool IsNetException { get; }
......@@ -37,7 +37,7 @@ namespace NLua.Exceptions
/// <param name="innerException">The .NET exception triggered by user-code.</param>
/// <param name="source">The position in the script where the exception was triggered.</param>
public LuaScriptException(Exception innerException, string source)
: base("A .NET exception occured in user-code", innerException)
: base("A .NET exception occurred in user-code", innerException)
{
_source = source;
IsNetException = true;
......
......@@ -51,7 +51,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.3.3</Version>
<Version>1.3.4</Version>
</PackageReference>
<PackageReference Include="NUnit">
<Version>3.13.2</Version>
......
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