Commit 281961a7 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Bumped KeraLua- using PackageReference Fixed BinaryLoad tests

parent e2419a85
......@@ -39,22 +39,19 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.29\lib\MonoAndroid\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="monoandroid81" />
</packages>
\ No newline at end of file
......@@ -46,16 +46,19 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.29\lib\xamarintvos\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.TVOS" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\TVOS\Xamarin.TVOS.CSharp.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="xamarintvos10" />
</packages>
\ No newline at end of file
......@@ -44,22 +44,19 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.29\lib\xamarinwatchos\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.WatchOS" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\WatchOS\Xamarin.WatchOS.CSharp.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="xamarinwatchos10" />
</packages>
\ No newline at end of file
......@@ -57,9 +57,6 @@
<AOTMode>None</AOTMode>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.29\lib\xamarinmac\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.Mac" />
......@@ -67,14 +64,14 @@
<ItemGroup>
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="xamarinmac20" />
</packages>
\ No newline at end of file
......@@ -50,22 +50,19 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="KeraLua, Version=1.0.29.0, Culture=neutral, PublicKeyToken=6a194c04b9c89217, processorArchitecture=MSIL">
<HintPath>..\..\packages\KeraLua.1.0.29\lib\xamarinios\KeraLua.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="xamarinios10" />
</packages>
\ No newline at end of file
......@@ -35,9 +35,6 @@
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="KeraLua" version="1.0.29" targetFramework="net45" />
</packages>
\ No newline at end of file
......@@ -28,7 +28,9 @@
</ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.29" />
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
</ItemGroup>
......
......@@ -33,7 +33,9 @@
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup>
<PackageReference Include="KeraLua" Version="1.0.29" />
<PackageReference Include="KeraLua">
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
<PackageReference Include="NUnit" Version="3.12.0" />
</ItemGroup>
......
......@@ -44,7 +44,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="KeraLua">
<Version>1.0.29</Version>
<Version>1.0.30-lua54-build5</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version>
......
MIT License
Copyright (c) 2020 Codefoco
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TouchServerExe Condition=" '$(TouchServerExe)' == '' ">$(MSBuildProjectDirectory)/tools/Touch.Server.exe</TouchServerExe>
<MLaunch Condition=" '$(MLaunch)' == '' ">/Library/Frameworks/Xamarin.iOS.framework/Versions/Current/bin/mlaunch</MLaunch>
<TargetFrameworkIdentifier Condition=" '$(TargetFrameworkIdentifier)' == ''">Xamarin.iOS</TargetFrameworkIdentifier>
<DeviceKind Condition=" '$(TargetFrameworkIdentifier)' == 'Xamarin.iOS'">iPhone</DeviceKind>
<DeviceKind Condition=" '$(TargetFrameworkIdentifier)' == 'Xamarin.TVOS'">Apple TV</DeviceKind>
<DevicesXmlFile>$(MSBuildProjectDirectory)/$(OutputPath)/DevicesXmlFile.xml</DevicesXmlFile>
<TestResultName Condition=" '$(TestResultName)' == '' ">TEST-Result-$(TargetFrameworkIdentifier)</TestResultName>
<TestResult Condition=" '$(TestResult)' == '' ">$(TestResultName).xml</TestResult>
</PropertyGroup>
<Target Name="FetchDeviceSpecs" Condition="'$(OS)'=='Unix' and Exists('/usr/lib/libc.dylib')" DependsOnTargets="_DetectSdkLocations;GetAppBundleDir" >
<Message Text="Reading available devices" />
<Exec Command="$(MLaunch) --listsim=$(DevicesXmlFile)" Condition="!Exists('$(DevicesXmlFile)')" />
<XmlPeek
XmlInputPath="$(DevicesXmlFile)"
Query="//MTouch/Simulator/AvailableDevices/SimDevice[contains(@Name,&quot;$(DeviceKind)&quot;)][last()]/SimRuntime/text()">
<Output TaskParameter="Result" ItemName="SimRuntime" />
</XmlPeek>
<XmlPeek
XmlInputPath="$(DevicesXmlFile)"
Query="//MTouch/Simulator/AvailableDevices/SimDevice[contains(@Name,&quot;$(DeviceKind)&quot;)][last()]/SimDeviceType/text()">
<Output TaskParameter="Result" ItemName="SimDeviceType" />
</XmlPeek>
</Target>
<Target Name="RunSimulatorTests" Condition="'$(OS)'=='Unix' and Exists('/usr/lib/libc.dylib')" DependsOnTargets="FetchDeviceSpecs" >
<Message Text="Running Simulator tests [@(SimRuntime):@(SimDeviceType)]" />
<Exec Command="mono $(TouchServerExe) --launchsim &quot;$(AppBundleDir)&quot; --logfile=result.xml -autoexit -skipheader --verbose --mtouch-argument=&quot;--sdkroot=$(_SdkDevPath) --sdk=$(MtouchSdkVersion)&quot; --device=&quot;:v2:runtime=@(SimRuntime),devicetype=@(SimDeviceType)&quot;" />
<!-- This deserver some explanation:
There are two bug on NUnitLite.
=============================
* Even if you set NUNIT_ENABLE_XML_OUTPUT and NUNIT_SKIP_LOG_HEADER NUnitLite will print to log header in the XML
* Sometimes NUnitLite write some gibberish in the last line "test-results"ffff
* The following bash commands will remove the header and the gibberish from the end of the file
-->
<Exec Command="tail -n +2 result.xml | tail -n +2 | sed -e &apos;$ d&apos; > $(TestResult)" />
<Exec Command="echo &quot;&lt;/test-results&gt;&quot; >> $(TestResult)" />
<XmlPoke
XmlInputPath="$(TestResult)"
Value="$(TestResultName)"
Query="/test-results/@name"
/>
</Target>
</Project>
\ No newline at end of file
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