Moving to .NET 6

NLua · Nov 10, 2021 · 1396aea · 1396aea
1 parent ca31062
commit 1396aea
Show file tree

Hide file tree

Showing 13 changed files with 116 additions and 43 deletions.
diff --git a/KeraLua.Symbol.nuspec b/KeraLua.Symbol.nuspec
@@ -23,8 +23,8 @@
   <files>
     <file src="lib\Release\MonoAndroid\KeraLua.dll" target="lib\MonoAndroid" />
     <file src="lib\Release\MonoAndroid\KeraLua.pdb" target="lib\MonoAndroid" />
-    <file src="lib\Release\net5.0\net5.0\KeraLua.dll" target="lib\net5.0" />
-    <file src="lib\Release\net5.0\net5.0\KeraLua.pdb" target="lib\net5.0" />
+    <file src="lib\Release\net6.0\net6.0\KeraLua.dll" target="lib\net6.0" />
+    <file src="lib\Release\net6.0\net6.0\KeraLua.pdb" target="lib\net6.0" />
     <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\KeraLua.dll" target="lib\netcoreapp3.1" />
     <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\KeraLua.pdb" target="lib\netcoreapp3.1" />
     <file src="lib\Release\net46\KeraLua.dll" target="lib\net46" />

diff --git a/KeraLua.net5.0.sln → KeraLua.net6.0.sln b/KeraLua.net5.0.sln → KeraLua.net6.0.sln
@@ -7,11 +7,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "KeraLua", "KeraLua", "{4A43
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "KeraLua.Shared", "src\KeraLua.Shared.shproj", "{BD205AD6-760E-48F3-BAB2-21447396BD17}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeraLua.net5.0", "build\net5.0\KeraLua.net5.0.csproj", "{078D8C1B-0CD3-4500-9400-687609C1299C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeraLua.net6.0", "build\net6.0\KeraLua.net6.0.csproj", "{078D8C1B-0CD3-4500-9400-687609C1299C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2AF69FF8-83DC-4BBF-8C13-C034C23B0EBA}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeraLuaTest.net5.0", "tests\build\net5.0\KeraLuaTest.net5.0.csproj", "{B915B26F-5B5B-441A-A9BF-565B67891F2F}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeraLuaTest.net6.0", "tests\build\net6.0\KeraLuaTest.net6.0.csproj", "{B915B26F-5B5B-441A-A9BF-565B67891F2F}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution

diff --git a/KeraLua.nuspec b/KeraLua.nuspec
@@ -20,8 +20,8 @@
   <files>
     <file src="lib\Release\MonoAndroid\KeraLua.dll" target="lib\MonoAndroid" />
     <file src="lib\Release\MonoAndroid\KeraLua.xml" target="lib\MonoAndroid" />
-    <file src="lib\Release\net5.0\net5.0\KeraLua.dll" target="lib\net5.0" />
-    <file src="lib\Release\net5.0\net5.0\KeraLua.xml" target="lib\net5.0" />
+    <file src="lib\Release\net6.0\net6.0\KeraLua.dll" target="lib\net6.0" />
+    <file src="lib\Release\net6.0\net6.0\KeraLua.xml" target="lib\net6.0" />
     <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\KeraLua.dll" target="lib\netcoreapp3.1" />
     <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\KeraLua.xml" target="lib\netcoreapp3.1" />
     <file src="lib\Release\net46\KeraLua.dll" target="lib\net46" />
@@ -45,8 +45,14 @@
     <file src="runtimes\win-x86\native\lua54.dll" target="runtimes\win10-x86\nativeassets\uap10.0\lua54.dll" />
     <file src="runtimes\win-x64\native\lua54.dll" target="runtimes\win-x64\native\lua54.dll" />
     <file src="runtimes\win-x86\native\lua54.dll" target="runtimes\win-x86\native\lua54.dll" />
+    <file src="runtimes\win-arm\native\lua54.dll" target="runtimes\win-arm\native\lua54.dll" />
+    <file src="runtimes\win-arm64\native\lua54.dll" target="runtimes\win-arm64\native\lua54.dll" />
     <file src="runtimes\osx\native\liblua54.dylib" target="runtimes\osx\native\liblua54.dylib" />
     <file src="runtimes\linux-x64\native\liblua54.so" target="runtimes\linux-x64\native\liblua54.so" />
+    <file src="runtimes\android-arm\native\liblua54.so" target="runtimes\android-arm\native\liblua54.so" />
+    <file src="runtimes\android-arm64\native\liblua54.so" target="runtimes\android-arm64\native\liblua54.so" />
+    <file src="runtimes\android-x86\native\liblua54.so" target="runtimes\android-x86\native\liblua54.so" />
+    <file src="runtimes\android-x64\native\liblua54.so" target="runtimes\android-x64\native\liblua54.so" />
     <file src="build\targets\KeraLua.targets" target="build\net46\KeraLua.targets" />
     <file src="LICENSE" target="LICENSE" />
   </files>

diff --git a/build/Android/KeraLua.Android.csproj b/build/Android/KeraLua.Android.csproj
@@ -46,16 +46,16 @@
     <Reference Include="Mono.Android" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedNativeLibrary Include="..\..\runtimes\android\libs\arm64-v8a\liblua54.so">
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-arm64\native\liblua54.so">
       <Link>libs\arm64-v8a\liblua54.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="..\..\runtimes\android\libs\armeabi-v7a\liblua54.so">
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-arm\native\liblua54.so">
       <Link>libs\armeabi-v7a\liblua54.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="..\..\runtimes\android\libs\x86\liblua54.so">
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-x86\native\liblua54.so">
       <Link>libs\x86\liblua54.so</Link>
     </EmbeddedNativeLibrary>
-    <EmbeddedNativeLibrary Include="..\..\runtimes\android\libs\x86_64\liblua54.so">
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-x64\native\liblua54.so">
       <Link>libs\x86_64\liblua54.so</Link>
     </EmbeddedNativeLibrary>
   </ItemGroup>

diff --git a/build/Android/KeraLua.net6.0-android.csproj b/build/Android/KeraLua.net6.0-android.csproj
@@ -0,0 +1,65 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\targets\BuildLua.Common.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <OutputType>Library</OutputType>
+    <RootNamespace>KeraLua.Android</RootNamespace>
+    <AssemblyName>KeraLua</AssemblyName>
+    <TargetFramework>net6.0-android</TargetFramework>
+    <RuntimeIdentifiers>android-x86;android-x64;android-arm;android-arm64</RuntimeIdentifiers>
+    <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\lib\Debug\</OutputPath>
+    <DefineConstants>DEBUG;__MOBILE__;__ANDROID__</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <JavaMaximumHeapSize>
+    </JavaMaximumHeapSize>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <Optimize>true</Optimize>
+    <DebugType>portable</DebugType>
+    <OutputPath>..\..\lib\Release\</OutputPath>
+    <DefineConstants>__MOBILE__;__ANDROID__</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <JavaMaximumHeapSize>
+    </JavaMaximumHeapSize>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DocumentationFile>..\..\lib\Release\net6.0-android\KeraLua.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-arm64\native\liblua54.so">
+      <Link>libs\arm64-v8a\liblua54.so</Link>
+    </EmbeddedNativeLibrary>
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-arm\native\liblua54.so">
+      <Link>libs\armeabi-v7a\liblua54.so</Link>
+    </EmbeddedNativeLibrary>
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-x86\native\liblua54.so">
+      <Link>libs\x86\liblua54.so</Link>
+    </EmbeddedNativeLibrary>
+    <EmbeddedNativeLibrary Include="$(OutputRuntimeDir)\android-x64\native\liblua54.so">
+      <Link>libs\x86_64\liblua54.so</Link>
+    </EmbeddedNativeLibrary>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <Import Project="..\targets\BuildLua.XamarinAndroid.targets" />
+  <Import Project="..\..\src\KeraLua.Core.projitems" Label="Shared" Condition="Exists('..\..\src\KeraLua.Core.projitems')" />
+  <Import Project="..\targets\KeraLua.Sign.targets" />
+</Project>
diff --git a/build/net5.0/KeraLua.net5.0.csproj → build/net6.0/KeraLua.net6.0.csproj b/build/net5.0/KeraLua.net5.0.csproj → build/net6.0/KeraLua.net6.0.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\targets\BuildLua.Common.props" />
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>KeraLua</RootNamespace>
     <AssemblyName>KeraLua</AssemblyName>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DebugType>portable</DebugType>
     <Optimize>true</Optimize>
-    <DocumentationFile>..\..\lib\Release\net5.0\KeraLua.xml</DocumentationFile>
-    <OutputPath>..\..\lib\Release\net5.0\</OutputPath>
+    <DocumentationFile>..\..\lib\Release\net6.0\KeraLua.xml</DocumentationFile>
+    <OutputPath>..\..\lib\Release\net6.0\</OutputPath>
     <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\lib\Debug\net5.0\</OutputPath>
+    <OutputPath>..\..\lib\Debug\net6.0\</OutputPath>
   </PropertyGroup>
   <Import Project="..\..\src\KeraLua.Core.projitems" Label="Shared" Condition="Exists('..\..\src\KeraLua.Core.projitems')" />
   <Import Project="..\targets\BuildLua.Windows.targets" />

diff --git a/build/targets/BuildLua.Common.props b/build/targets/BuildLua.Common.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <ExternalLuaPath>$(SolutionDir)external\lua</ExternalLuaPath>
-    <OutputRuntimeDir>$(SolutionDir)runtimes</OutputRuntimeDir>
+    <ExternalLuaPath>$(MSBuildThisFileDirectory)..\..\external\lua</ExternalLuaPath>
+    <OutputRuntimeDir>$(MSBuildThisFileDirectory)..\..\runtimes</OutputRuntimeDir>
   </PropertyGroup>
 </Project>
diff --git a/build/targets/BuildLua.Windows.targets b/build/targets/BuildLua.Windows.targets
@@ -31,6 +31,8 @@
 
     <Copy SourceFiles="$(ExternalLuaPath)\$(Win32BuildDir)\$(BinaryLibraryPath32)" DestinationFolder="$(OutputRuntimeDir)\$(Win32BuildDir)\native" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(ExternalLuaPath)\$(Win64BuildDir)\$(BinaryLibraryPath64)" DestinationFolder="$(OutputRuntimeDir)\$(Win64BuildDir)\native" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ExternalLuaPath)\$(WinArm64BuildDir)\$(BinaryLibraryPath64)" DestinationFolder="$(OutputRuntimeDir)\$(WinArm64BuildDir)\native" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(ExternalLuaPath)\$(WinArmBuildDir)\$(BinaryLibraryPath32)" DestinationFolder="$(OutputRuntimeDir)\$(WinArmBuildDir)\native" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(ExternalLuaPath)\$(WinArm64BuildDir)\$(BinaryLibraryPath64)" DestinationFolder="$(OutputRuntimeDir)\$(WinArm64BuildDir)\nativeassets" SkipUnchangedFiles="true" />
     <Copy SourceFiles="$(ExternalLuaPath)\$(WinArmBuildDir)\$(BinaryLibraryPath32)" DestinationFolder="$(OutputRuntimeDir)\$(WinArmBuildDir)\nativeassets" SkipUnchangedFiles="true" />
   </Target>

diff --git a/build/targets/BuildLua.XamarinAndroid.targets b/build/targets/BuildLua.XamarinAndroid.targets
@@ -1,51 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
     <PropertyGroup>
         <AndroidBuildDir>android_build</AndroidBuildDir>
         <AndroidOutputDir>android</AndroidOutputDir>
-        <LibsDirectory>libs</LibsDirectory>
         <LibraryFileName>liblua54.so</LibraryFileName>
-        <Arch1>arm64-v8a</Arch1>
-        <Arch2>armeabi-v7a</Arch2>
+        <Arch1>arm</Arch1>
+        <Arch2>arm64</Arch2>
         <Arch3>x86</Arch3>
-        <Arch4>x86_64</Arch4>
+        <Arch4>x64</Arch4>
     </PropertyGroup>
     <Target Name="BuildLuaXamarinAndroid" AfterTargets="_ResolveMonoAndroidSdks" >
         <Message Text="Building Android Lua library (armeabi-v7a arm64-v8a x86 x86_64) [NDK: $(_AndroidNdkDirectory)] " />
         <Error Text="******* Could not locate Android NDK. $(_AndroidNdkDirectory)ndk-build ********** " Condition="!Exists ('$(_AndroidNdkDirectory)')" />
         <Exec Command="$(_AndroidNdkDirectory)ndk-build" WorkingDirectory="$(ExternalLuaPath)\$(AndroidBuildDir)"/>
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)" />
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)" />
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch1)" />
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch2)" />
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch3)" />
-        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch4)" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch1)" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch1)\native" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch2)" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch2)\native" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch3)" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch3)\native" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch4)" />
+        <MakeDir Directories="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch4)\native" />
         <Copy
-            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\$(LibsDirectory)\$(Arch1)\$(LibraryFileName)"
-            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch1)"
+            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\libs\armeabi-v7a\$(LibraryFileName)"
+            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch1)\native"
             SkipUnchangedFiles="true"
         />
         <Copy
-            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\$(LibsDirectory)\$(Arch2)\$(LibraryFileName)"
-            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch2)"
+            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\libs\arm64-v8a\$(LibraryFileName)"
+            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch2)\native"
             SkipUnchangedFiles="true"
         />
         <Copy
-            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\$(LibsDirectory)\$(Arch3)\$(LibraryFileName)"
-            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch3)"
+            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\libs\x86\$(LibraryFileName)"
+            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch3)\native"
             SkipUnchangedFiles="true"
         />
         <Copy
-            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\$(LibsDirectory)\$(Arch4)\$(LibraryFileName)"
-            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)\$(LibsDirectory)\$(Arch4)"
+            SourceFiles="$(ExternalLuaPath)\$(AndroidBuildDir)\libs\x86_64\$(LibraryFileName)"
+            DestinationFolder="$(OutputRuntimeDir)\$(AndroidOutputDir)-$(Arch4)\native"
             SkipUnchangedFiles="true"
         />
     </Target>
     <Target Name="CleanLuaXamarinAndroid" AfterTargets="Clean" >
         <Message Text="Cleaning Lua library (Android)" />
         <RemoveDir Directories="
-        $(ExternalLuaPath)\$(AndroidBuildDir)\$(LibsDirectory); 
+        $(ExternalLuaPath)\$(AndroidBuildDir)\libs; 
         $(OutputRuntimeDir)\$(AndroidOutputDir) " />
     </Target>
 </Project>

diff --git a/build/targets/KeraLua.Sign.targets b/build/targets/KeraLua.Sign.targets
@@ -4,7 +4,7 @@
         <SignAssembly>true</SignAssembly>
         <PublicSign Condition="  '$(OS)' !='Windows_NT' and '$(PublicSign)' == '' and '$(SignAssembly)' == 'true'">true</PublicSign>
         <KeyFileName Condition=" '$(KeyFileName)' == '' ">NLua.snk</KeyFileName>
-        <AssemblyOriginatorKeyFile>$(SolutionDir)$(KeyFileName)</AssemblyOriginatorKeyFile>
+        <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\..\$(KeyFileName)</AssemblyOriginatorKeyFile>
     </PropertyGroup>
     <Target Name="_SignAssembly" AfterTargets="CoreCompile" Condition="'$(SignAssembly)' == 'true' and '$(OS)'!='Windows_NT' ">
         <Exec Command="sn -q -R @(IntermediateAssembly -> '&quot;%(Identity)&quot;') &quot;$(AssemblyOriginatorKeyFile)&quot;" />

diff --git a/build/targets/KeraLua.targets b/build/targets/KeraLua.targets
@@ -9,7 +9,7 @@
 
     <!-- get the preferred architecture -->
     <PropertyGroup>
-        <!-- handle x86/x64 specifically -->
+        <!-- handle x86/x64/ARM/ARM64 specifically -->
         <PreferredNativeLua Condition=" '$(PreferredNativeLua)' == '' and ( '$(PlatformTarget)' == 'x64' or '$(PlatformTarget)' == 'x86' ) ">$(PlatformTarget)</PreferredNativeLua> 
         <!-- handle Any CPU, considering Prefer32Bit -->
         <PreferredNativeLua Condition=" '$(PreferredNativeLua)' == '' and '$(Prefer32Bit)' == 'False' ">x64</PreferredNativeLua>  

diff --git a/devops/azure-devops.yml b/devops/azure-devops.yml
@@ -183,7 +183,7 @@ jobs:
   - task: NuGetCommand@2
     displayName: 'NuGet restore'
     inputs:
-      restoreSolution: KeraLua.net5.0.sln
+      restoreSolution: KeraLua.net6.0.sln
 
   - task: NuGetCommand@2
     displayName: 'NuGet restore Android solution'
@@ -226,15 +226,15 @@ jobs:
   - task: MSBuild@1
     displayName: 'Build .NET 5'
     inputs:
-      solution: KeraLua.net5.0.sln
+      solution: KeraLua.net6.0.sln
       configuration: Release
 
   - task: DotNetCoreCLI@2
     displayName: 'dotnet vstest'
     inputs:
       command: custom
       custom: vstest
-      arguments: '.\tests\build\net5.0\bin\Release\net5.0\KeraLuaTest.net5.0.dll'
+      arguments: '.\tests\build\net6.0\bin\Release\net6.0\KeraLuaTest.net6.0.dll'
 
   - task: MSBuild@1
     displayName: 'Build Android'

diff --git a/tests/build/net5.0/KeraLuaTest.net5.0.csproj → tests/build/net6.0/KeraLuaTest.net6.0.csproj b/tests/build/net5.0/KeraLuaTest.net5.0.csproj → tests/build/net6.0/KeraLuaTest.net6.0.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -92,6 +92,6 @@
     <Folder Include="LuaTests\core\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\build\net5.0\KeraLua.net5.0.csproj" />
+    <ProjectReference Include="..\..\..\build\net6.0\KeraLua.net6.0.csproj" />
   </ItemGroup>
 </Project>