Commit 4f4896e4 authored by Vinicius Jarina's avatar Vinicius Jarina
Browse files

Removed `netstandard` + `net5.0`, moved `net45` -> `net46`

parent 817c1a5f
...@@ -3,7 +3,7 @@ src/bin ...@@ -3,7 +3,7 @@ src/bin
src/obj src/obj
tests/bin tests/bin
tests/obj tests/obj
build/net45/obj/ build/net46/obj/
build/netstandard1.0/bin/ build/netstandard1.0/bin/
build/netstandard1.0/obj/ build/netstandard1.0/obj/
build/netstandard1.3/bin/ build/netstandard1.3/bin/
...@@ -12,9 +12,9 @@ build/netstandard1.6/bin/ ...@@ -12,9 +12,9 @@ build/netstandard1.6/bin/
build/netstandard1.6/obj/ build/netstandard1.6/obj/
build/netstandard2.0/bin/ build/netstandard2.0/bin/
build/netstandard2.0/obj/ build/netstandard2.0/obj/
build/portable-net45+win8+wp8/obj/ build/portable-net46+win8+wp8/obj/
build/portable-net45+win8+wpa81/obj/Debug/CoreCompileInputs.cache build/portable-net46+win8+wpa81/obj/Debug/CoreCompileInputs.cache
build/portable-net45+win8+wpa81/obj/ build/portable-net46+win8+wpa81/obj/
lib/Debug/ lib/Debug/
lib/Release/ lib/Release/
.vs/ .vs/
...@@ -23,12 +23,12 @@ build/TVOS/obj/ ...@@ -23,12 +23,12 @@ build/TVOS/obj/
build/WatchOS/obj/ build/WatchOS/obj/
build/XamariniOS/obj/ build/XamariniOS/obj/
build/XamarinMac/obj/ build/XamarinMac/obj/
build/netcore/obj/ build/netcoreapp3.1/obj/
tests/build/net45/bin/Debug/KeraLua.dll tests/build/net46/bin/Debug/KeraLua.dll
tests/build/net45/bin/ tests/build/net46/bin/
tests/build/net45/obj/ tests/build/net46/obj/
tests/build/netcore/bin/ tests/build/netcoreapp3.1/bin/
tests/build/netcore/obj/ tests/build/netcoreapp3.1/obj/
*.user *.user
tests/build/xamarinios/obj/ tests/build/xamarinios/obj/
tests/build/xamarintvos/obj/ tests/build/xamarintvos/obj/
...@@ -40,3 +40,4 @@ tests/build/xamarintvos/TEST-Result-Xamarin.TVOS.xml ...@@ -40,3 +40,4 @@ tests/build/xamarintvos/TEST-Result-Xamarin.TVOS.xml
tests/build/xamarinios/result.xml tests/build/xamarinios/result.xml
tests/build/xamarinios/TEST-Result-Xamarin.iOS.xml tests/build/xamarinios/TEST-Result-Xamarin.iOS.xml
tests/build/xamarintvos/result.xml tests/build/xamarintvos/result.xml
build/net5.0/obj
...@@ -16,7 +16,7 @@ script: ...@@ -16,7 +16,7 @@ script:
- nuget restore NLua.sln - nuget restore NLua.sln
- msbuild /p:Configuration=Release /t:Restore NLua.sln - msbuild /p:Configuration=Release /t:Restore NLua.sln
- msbuild /p:Configuration=Release NLua.sln - msbuild /p:Configuration=Release NLua.sln
- dotnet test ./tests/build/net45/bin/Release/NLuaTest.dll - dotnet test ./tests/build/net46/bin/Release/NLuaTest.dll
# Execute additional tests or commands # Execute additional tests or commands
#after_script: #after_script:
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<copyright>Copyright © NLua 2021</copyright> <copyright>Copyright © NLua 2021</copyright>
<tags>lua nlua</tags> <tags>lua nlua</tags>
<dependencies> <dependencies>
<dependency id="KeraLua" version="1.2.11" /> <dependency id="KeraLua" version="1.2.12" />
</dependencies> </dependencies>
<packageTypes> <packageTypes>
<packageType name="SymbolsPackage" /> <packageType name="SymbolsPackage" />
...@@ -25,14 +25,14 @@ ...@@ -25,14 +25,14 @@
<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\MonoAndroid\NLua.pdb" target="lib\MonoAndroid" /> <file src="lib\Release\MonoAndroid\NLua.pdb" target="lib\MonoAndroid" />
<file src="lib\Release\net45\NLua.dll" target="lib\net45" /> <file src="lib\Release\net46\NLua.dll" target="lib\net46" />
<file src="lib\Release\net45\NLua.pdb" target="lib\net45" /> <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.dll" target="lib\uap10.0" />
<file src="lib\Release\uap10.0\NLua.pdb" target="lib\uap10.0" /> <file src="lib\Release\uap10.0\NLua.pdb" target="lib\uap10.0" />
<file src="lib\Release\netcore\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" /> <file src="lib\Release\net5.0\net5.0\NLua.dll" target="lib\net5.0" />
<file src="lib\Release\netcore\netcoreapp3.1\NLua.pdb" target="lib\netcoreapp3.1" /> <file src="lib\Release\net5.0\net5.0\NLua.pdb" target="lib\net5.0" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" /> <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" />
<file src="lib\Release\netstandard2.0\NLua.pdb" target="lib\netstandard2.0" /> <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.pdb" target="lib\netcoreapp3.1" />
<file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" /> <file src="lib\Release\xamarinios\NLua.dll" target="lib\xamarinios" />
<file src="lib\Release\xamarinios\NLua.pdb" target="lib\xamarinios" /> <file src="lib\Release\xamarinios\NLua.pdb" target="lib\xamarinios" />
<file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" /> <file src="lib\Release\xamarinmac\NLua.dll" target="lib\xamarinmac" />
......

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NLua", "NLua", "{4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}"
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.net5.0", "build\net5.0\NLua.net5.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
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\NLua.Shared.projitems*{bd205ad6-760e-48f3-bab2-21447396bd17}*SharedItemsImports = 13
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{BD205AD6-760E-48F3-BAB2-21447396BD17} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4720E610-698B-48DD-BBD7-03AC99E9BC90}
EndGlobalSection
EndGlobal
...@@ -9,13 +9,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Sha ...@@ -9,13 +9,11 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Sha
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844-3BD3-436C-AB8A-8E78C810A710}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844-3BD3-436C-AB8A-8E78C810A710}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.NetCore", "build\netcore\NLua.NetCore.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.netcoreapp3.1", "build\netcoreapp3.1\NLua.netcoreapp3.1.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.netstandard2.0", "build\netstandard2.0\NLua.netstandard2.0.csproj", "{6784E262-4845-4B08-8AD1-6319E76AF579}"
EndProject EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}" Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLuaTest.Core", "tests\build\netcore\NLuaTest.Core.csproj", "{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLuaTest.netcoreapp3.1", "tests\build\netcoreapp3.1\NLuaTest.netcoreapp3.1.csproj", "{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D432F663-23CC-48B1-A413-935E5393493C}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D432F663-23CC-48B1-A413-935E5393493C}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
...@@ -36,10 +34,6 @@ Global ...@@ -36,10 +34,6 @@ Global
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU {A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.Build.0 = Release|Any CPU {A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}.Release|Any CPU.Build.0 = Release|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6784E262-4845-4B08-8AD1-6319E76AF579}.Release|Any CPU.Build.0 = Release|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU {C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3B8FC88-E476-4D34-874E-A0FE67FA0CBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
...@@ -51,7 +45,6 @@ Global ...@@ -51,7 +45,6 @@ Global
GlobalSection(NestedProjects) = preSolution GlobalSection(NestedProjects) = preSolution
{BD205AD6-760E-48F3-BAB2-21447396BD17} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7} {BD205AD6-760E-48F3-BAB2-21447396BD17} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7} {A1944148-0AD8-4DEF-A245-60C7A8AE8AA7} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{6784E262-4845-4B08-8AD1-6319E76AF579} = {4A43DAAC-F9FF-4EB1-BFBD-FB4655CCE1F7}
{7279D001-6F21-4FF3-A0EE-3A1D12004BA3} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710} {7279D001-6F21-4FF3-A0EE-3A1D12004BA3} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710}
{C3B8FC88-E476-4D34-874E-A0FE67FA0CBC} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710} {C3B8FC88-E476-4D34-874E-A0FE67FA0CBC} = {BDBA9844-3BD3-436C-AB8A-8E78C810A710}
EndGlobalSection EndGlobalSection
......
...@@ -15,29 +15,21 @@ ...@@ -15,29 +15,21 @@
<copyright>Copyright © NLua 2021</copyright> <copyright>Copyright © NLua 2021</copyright>
<tags>lua nlua</tags> <tags>lua nlua</tags>
<dependencies> <dependencies>
<dependency id="KeraLua" version="1.2.11" /> <dependency id="KeraLua" version="1.2.12" />
</dependencies> </dependencies>
<repository type="git" url="https://github.com/nlua/nlua" commit="708ba30e982deccb1248d099806bc00e362fbda4" /> <repository type="git" url="https://github.com/nlua/nlua" commit="708ba30e982deccb1248d099806bc00e362fbda4" />
</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\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.dll" target="lib\uap10.0" />
<file src="lib\Release\uap10.0\NLua.pri" target="lib\uap10.0" /> <file src="lib\Release\uap10.0\NLua.pri" target="lib\uap10.0" />
<file src="lib\Release\netcore\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" /> <file src="lib\Release\net5.0\net5.0\NLua.dll" target="lib\net5.0" />
<file src="lib\Release\netstandard2.0\NLua.dll" target="lib\netstandard2.0" /> <file src="lib\Release\netcoreapp3.1\netcoreapp3.1\NLua.dll" target="lib\netcoreapp3.1" />
<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\netcore\netcoreapp3.1\NLua.xml" target="lib\netcoreapp3.1" />
<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\xamarintvos" />
<file src="lib\Release\net45\NLua.xml" target="lib\net45" />
<file src="lib\Release\net45\NLua.xml" target="lib\xamarinios" />
<file src="lib\Release\net45\NLua.xml" target="lib\xamarinwatchos" /> -->
<file src="LICENSE" target="LICENSE" /> <file src="LICENSE" target="LICENSE" />
</files> </files>
</package> </package>
\ No newline at end of file
...@@ -9,7 +9,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Sha ...@@ -9,7 +9,7 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLua.Shared", "src\NLua.Sha
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844-3BD3-436C-AB8A-8E78C810A710}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BDBA9844-3BD3-436C-AB8A-8E78C810A710}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "build\net45\NLua.csproj", "{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLua", "build\net46\NLua.csproj", "{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}"
EndProject EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}" Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NLuaTest.Shared", "tests\src\NLuaTest.Shared.shproj", "{7279D001-6F21-4FF3-A0EE-3A1D12004BA3}"
EndProject EndProject
...@@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ...@@ -20,7 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig .editorconfig = .editorconfig
EndProjectSection EndProjectSection
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "tests\build\net45\NLuaTest.csproj", "{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest", "tests\build\net46\NLuaTest.csproj", "{20AE709C-FB97-48E3-89B0-A34A5C3DA1DB}"
EndProject EndProject
Global Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution GlobalSection(SharedMSBuildProjectFiles) = preSolution
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
</PropertyGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LangVersion>7.0</LangVersion>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
...@@ -8,7 +11,7 @@ ...@@ -8,7 +11,7 @@
<RootNamespace>NLua</RootNamespace> <RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName> <AssemblyName>NLua</AssemblyName>
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild> <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
</NuGetPackageImportStamp> </NuGetPackageImportStamp>
...@@ -17,7 +20,7 @@ ...@@ -17,7 +20,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\..\lib\Debug\net45\</OutputPath> <OutputPath>..\..\lib\Debug\net46\</OutputPath>
<DefineConstants>DEBUG;</DefineConstants> <DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
...@@ -27,7 +30,7 @@ ...@@ -27,7 +30,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<OutputPath>..\..\lib\Release\net45\</OutputPath> <OutputPath>..\..\lib\Release\net46\</OutputPath>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
...@@ -42,7 +45,7 @@ ...@@ -42,7 +45,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<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')" />
......
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>NLua</RootNamespace> <RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName> <AssemblyName>NLua</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\lib\Debug\</OutputPath>
<DefineConstants>TRACE;NETSTANDARD</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<OutputPath>..\..\lib\Release\</OutputPath> <DocumentationFile></DocumentationFile>
<DefineConstants>TRACE;NETSTANDARD</DefineConstants> <OutputPath>..\..\lib\Release\net5.0\</OutputPath>
<DefineConstants>TRACE;NETCOREAPP</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\lib\Debug\net5.0\</OutputPath>
<DefineConstants>TRACE;NETCOREAPP</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors /> <WarningsAsErrors />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0"> <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" Condition="Exists('..\..\src\NLua.Shared.projitems')" />
<Import Project="..\..\src\NLua.Shared.projitems" Label="Shared" />
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NUnit" Version="3.13.0" /> <PackageReference Include="System.Reflection.Emit" Version="4.7.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>
...@@ -9,13 +9,13 @@ ...@@ -9,13 +9,13 @@
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<DocumentationFile></DocumentationFile> <DocumentationFile></DocumentationFile>
<OutputPath>..\..\lib\Release\netcore\</OutputPath> <OutputPath>..\..\lib\Release\netcoreapp3.1\</OutputPath>
<DefineConstants>TRACE;NETCOREAPP</DefineConstants> <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors /> <WarningsAsErrors />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<OutputPath>..\..\lib\Debug\netcore\</OutputPath> <OutputPath>..\..\lib\Debug\netcoreapp3.1\</OutputPath>
<DefineConstants>TRACE;NETCOREAPP</DefineConstants> <DefineConstants>TRACE;NETCOREAPP</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors> <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningsAsErrors /> <WarningsAsErrors />
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<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"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" /> <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" /> <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform"> <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.2.9</Version> <Version>6.2.9</Version>
......
...@@ -52,7 +52,7 @@ jobs: ...@@ -52,7 +52,7 @@ jobs:
solution: NLua.Mac.sln solution: NLua.Mac.sln
configuration: Release configuration: Release
- script: 'dotnet test ./tests/build/net45/bin/Release/NLuaTest.dll -l:trx;' - script: 'dotnet test ./tests/build/net46/bin/Release/NLuaTest.dll -l:trx;'
displayName: 'Run OSX tests' displayName: 'Run OSX tests'
- script: 'mv TestResults/*.trx ./TEST-Result-Mac.xml' - script: 'mv TestResults/*.trx ./TEST-Result-Mac.xml'
...@@ -174,9 +174,14 @@ jobs: ...@@ -174,9 +174,14 @@ jobs:
restoreSolution: NLua.Android.sln restoreSolution: NLua.Android.sln
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: 'NuGet restore' displayName: 'NuGet restore NET Core'
inputs:
restoreSolution: NLua.netcoreapp3.1.sln
- task: NuGetCommand@2
displayName: 'NuGet restore NET 5'
inputs: inputs:
restoreSolution: NLua.Core.sln restoreSolution: NLua.net5.0.sln
- task: PowerShell@2 - task: PowerShell@2
displayName: 'PreBuild Script' displayName: 'PreBuild Script'
...@@ -202,16 +207,21 @@ jobs: ...@@ -202,16 +207,21 @@ jobs:
- task: MSBuild@1 - task: MSBuild@1
displayName: 'Build .NET Core' displayName: 'Build .NET Core'
inputs: inputs:
solution: 'NLua.Core.sln' solution: 'NLua.netcoreapp3.1.sln'
configuration: Release
- task: MSBuild@1
displayName: 'Build .NET Core'
inputs:
solution: 'NLua.net5.0.sln'
configuration: Release configuration: Release
msbuildArguments: /restore
- task: DotNetCoreCLI@2 - task: DotNetCoreCLI@2
displayName: 'dotnet vstest' displayName: 'dotnet vstest'
inputs: inputs:
command: custom command: custom
custom: vstest custom: vstest
arguments: '.\tests\build\netcore\bin\Release\netcoreapp3.1\NLuaTest.dll' arguments: '.\tests\build\netcoreapp3.1\bin\Release\netcoreapp3.1\NLuaTest.dll'
- task: MSBuild@1 - task: MSBuild@1
displayName: 'Build Android' displayName: 'Build Android'
...@@ -219,7 +229,7 @@ jobs: ...@@ -219,7 +229,7 @@ jobs:
solution: 'NLua.Android.sln' solution: 'NLua.Android.sln'
configuration: Release configuration: Release
- script: 'dotnet test .\tests\build\net45\bin\Release\NLuaTest.dll -l:trx --Platform:x64' - script: 'dotnet test .\tests\build\net46\bin\Release\NLuaTest.dll -l:trx --Platform:x64'
displayName: 'Run Windows Tests' displayName: 'Run Windows Tests'
- script: 'RENAME TestResults\*.trx NLua.Windows.xml' - script: 'RENAME TestResults\*.trx NLua.Windows.xml'
...@@ -319,20 +329,19 @@ jobs: ...@@ -319,20 +329,19 @@ jobs:
- task: NuGetCommand@2 - task: NuGetCommand@2
displayName: 'NuGet restore' displayName: 'NuGet restore'
inputs: inputs:
restoreSolution: NLua.Core.sln restoreSolution: NLua.netcoreapp3.1.sln
- task: MSBuild@1 - task: MSBuild@1
displayName: 'Build .NET Core' displayName: 'Build .NET Core'
inputs: inputs:
solution: NLua.Core.sln solution: NLua.netcoreapp3.1.sln
configuration: Release configuration: Release
msbuildArguments: /restore
- task: DotNetCoreCLI@2 - task: DotNetCoreCLI@2
displayName: 'dotnet vstest' displayName: 'dotnet vstest'
inputs: inputs:
command: custom command: custom
custom: vstest custom: vstest
arguments: 'tests/build/netcore/bin/Release/netcoreapp3.1/NLuaTest.dll' arguments: 'tests/build/netcoreapp3.1/bin/Release/netcoreapp3.1/NLuaTest.dll'
- template: send-telegram.yml@templates - template: send-telegram.yml@templates
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NLuaTest</RootNamespace> <RootNamespace>NLuaTest</RootNamespace>
<AssemblyName>NLuaTest</AssemblyName> <AssemblyName>NLuaTest</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
...@@ -44,17 +44,17 @@ ...@@ -44,17 +44,17 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\build\net45\NLua.csproj"> <ProjectReference Include="..\..\..\build\net46\NLua.csproj">
<Project>{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}</Project> <Project>{D5B6902E-37CD-44DB-8AC5-BFAEEE663633}</Project>
<Name>NLua</Name> <Name>NLua</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua">
<Version>1.2.11</Version> <Version>1.2.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NUnit"> <PackageReference Include="NUnit">
<Version>3.13.0</Version> <Version>3.13.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="NUnit3TestAdapter"> <PackageReference Include="NUnit3TestAdapter">
<Version>3.17.0</Version> <Version>3.17.0</Version>
......
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="KeraLua"> <PackageReference Include="KeraLua" Version="1.2.12">
<Version>1.2.11</Version>
</PackageReference> </PackageReference>
<PackageReference Include="nunit" Version="3.13.0" /> <PackageReference Include="nunit" Version="3.13.1" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <PackageReference Include="NUnit3TestAdapter" Version="3.16.1"><IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
...@@ -85,8 +84,7 @@ ...@@ -85,8 +84,7 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\build\netcore\NLua.NetCore.csproj" /> <ProjectReference Include="..\..\..\build\netcoreapp3.1\NLua.netcoreapp3.1.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" /> <Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" />
</Project> </Project>
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