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

Bump .NET 7 -> .NET 8

parent dc0a0618
......@@ -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/net7.0/obj
tests/build/net7.0/obj/
tests/build/net7.0/bin/
build/net8.0/obj
tests/build/net8.0/obj/
tests/build/net8.0/bin/
......@@ -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\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\net8.0\NLua.dll" target="lib\net8.0" />
<file src="lib\Release\net8.0\NLua.pdb" target="lib\net8.0" />
<file src="lib\Release\net8.0-android\NLua.dll" target="lib\net8.0-android28" />
<file src="lib\Release\net8.0-android\NLua.pdb" target="lib\net8.0-android28" />
<file src="lib\Release\net8.0-ios\NLua.dll" target="lib\net8.0-ios11.0" />
<file src="lib\Release\net8.0-ios\NLua.pdb" target="lib\net8.0-ios11.0" />
<file src="lib\Release\net8.0-maccatalyst\NLua.dll" target="lib\net8.0-maccatalyst13.0" />
<file src="lib\Release\net8.0-maccatalyst\NLua.pdb" target="lib\net8.0-maccatalyst13.0" />
<file src="lib\Release\net8.0-tvos\NLua.dll" target="lib\net8.0-tvos11.0" />
<file src="lib\Release\net8.0-tvos\NLua.pdb" target="lib\net8.0-tvos11.0" />
<file src="lib\Release\net8.0-macos\NLua.dll" target="lib\net8.0-macos10.13" />
<file src="lib\Release\net8.0-macos\NLua.pdb" target="lib\net8.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.net7.0", "build\net7.0\NLua.net7.0.csproj", "{A1944148-0AD8-4DEF-A245-60C7A8AE8AA7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NLua.net8.0", "build\net8.0\NLua.net8.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.net7.0", "tests\build\net7.0\NLuaTest.net7.0.csproj", "{3E63EFA4-AEBA-4F9E-B87A-47EEF4510031}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NLuaTest.net8.0", "tests\build\net8.0\NLuaTest.net8.0.csproj", "{3E63EFA4-AEBA-4F9E-B87A-47EEF4510031}"
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
......
......@@ -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\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\net8.0\NLua.dll" target="lib\net8.0" />
<file src="lib\Release\net8.0-android\NLua.dll" target="lib\net8.0-android28" />
<file src="lib\Release\net8.0-ios\NLua.dll" target="lib\net8.0-ios11.0" />
<file src="lib\Release\net8.0-maccatalyst\NLua.dll" target="lib\net8.0-maccatalyst13.0" />
<file src="lib\Release\net8.0-tvos\NLua.dll" target="lib\net8.0-tvos11.0" />
<file src="lib\Release\net8.0-macos\NLua.dll" target="lib\net8.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" />
......
......@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua.Android</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
......
......@@ -5,7 +5,9 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net7.0-android</TargetFramework>
<TargetFramework>net8.0-android</TargetFramework>
<SupportedOSPlatformVersion>28.0</SupportedOSPlatformVersion>
<TargetFrameworkVersion>v13.0</TargetFrameworkVersion>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net7.0-tvos</TargetFramework>
<TargetFramework>net8.0-tvos</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net7.0-ios</TargetFramework>
<TargetFramework>net8.0-ios</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net7.0-maccatalyst</TargetFramework>
<TargetFramework>net8.0-maccatalyst</TargetFramework>
<IPhoneResourcePrefix>Resources</IPhoneResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......
......@@ -5,7 +5,7 @@
<OutputType>Library</OutputType>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<TargetFramework>net7.0-macos</TargetFramework>
<TargetFramework>net8.0-macos</TargetFramework>
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
......
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>NLua</RootNamespace>
<AssemblyName>NLua</AssemblyName>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
......
......@@ -40,18 +40,18 @@ stages:
- checkout: self
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.net7.0.sln'
displayName: 'dotnet build NLua.net8.0.sln'
inputs:
command: custom
custom: build
arguments: '.\NLua.net7.0.sln /p:Configuration=Release'
arguments: '.\NLua.net8.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet vstest'
inputs:
command: custom
custom: vstest
arguments: 'tests/build/net7.0/bin/Release/net7.0/NLuaTest.dll'
arguments: 'tests/build/net8.0/bin/Release/net8.0/NLuaTest.dll'
- template: send-telegram.yml@templates
......@@ -167,32 +167,32 @@ stages:
publishLocation: 'pipeline'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/iOS/NLua.net7.0-ios.csproj'
displayName: 'dotnet build ./build/iOS/NLua.net8.0-ios.csproj'
inputs:
command: custom
custom: build
arguments: './build/iOS/NLua.net7.0-ios.csproj /p:Configuration=Release'
arguments: './build/iOS/NLua.net8.0-ios.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/iOS/NLua.net7.0-maccatalyst.csproj'
displayName: 'dotnet build ./build/iOS/NLua.net8.0-maccatalyst.csproj'
inputs:
command: custom
custom: build
arguments: './build/iOS/NLua.net7.0-maccatalyst.csproj /p:Configuration=Release'
arguments: './build/iOS/NLua.net8.0-maccatalyst.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/macOS/NLua.net7.0-macos.csproj'
displayName: 'dotnet build ./build/macOS/NLua.net8.0-macos.csproj'
inputs:
command: custom
custom: build
arguments: './build/macOS/NLua.net7.0-macos.csproj /p:Configuration=Release'
arguments: './build/macOS/NLua.net8.0-macos.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/TVOS/NLua.net7.0-tvos.csproj'
displayName: 'dotnet build ./build/TVOS/NLua.net8.0-tvos.csproj'
inputs:
command: custom
custom: build
arguments: './build/TVOS/NLua.net7.0-tvos.csproj /p:Configuration=Release'
arguments: './build/TVOS/NLua.net8.0-tvos.csproj /p:Configuration=Release'
- task: PublishPipelineArtifact@1
displayName: 'Publish Pipeline Artifact: libs.mac'
......@@ -269,11 +269,11 @@ stages:
msbuildArguments: /restore
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.net7.0.sln'
displayName: 'dotnet build NLua.net8.0.sln'
inputs:
command: custom
custom: build
arguments: '.\NLua.net7.0.sln /p:Configuration=Release'
arguments: '.\NLua.net8.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build NLua.netstandard2.0.sln'
......@@ -283,18 +283,18 @@ stages:
arguments: '.\NLua.netstandard2.0.sln /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet build ./build/Android/NLua.net7.0-android.csproj'
displayName: 'dotnet build ./build/Android/NLua.net8.0-android.csproj'
inputs:
command: custom
custom: build
arguments: './build/Android/NLua.net7.0-android.csproj /p:Configuration=Release'
arguments: './build/Android/NLua.net8.0-android.csproj /p:Configuration=Release'
- task: DotNetCoreCLI@2
displayName: 'dotnet vstest'
inputs:
command: custom
custom: vstest
arguments: '.\tests\build\net7.0\bin\Release\net7.0\NLuaTest.dll'
arguments: '.\tests\build\net8.0\bin\Release\net8.0\NLuaTest.dll'
- script: 'nunit3-console.exe .\tests\build\net46\bin\Release\NLuaTest.dll '
displayName: 'Run Windows Tests'
......
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
......@@ -85,7 +85,7 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\build\net7.0\NLua.net7.0.csproj" />
<ProjectReference Include="..\..\..\build\net8.0\NLua.net8.0.csproj" />
</ItemGroup>
<Import Project="..\..\src\NLuaTest.Shared.projitems" Label="Shared" />
</Project>
......@@ -186,7 +186,7 @@
<Version>1.4.0</Version>
</PackageReference>
<PackageReference Include="Codefoco.Touch.Server">
<Version>1.0.29</Version>
<Version>1.0.30</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
......
......@@ -219,7 +219,7 @@
<Version>1.4.0</Version>
</PackageReference>
<PackageReference Include="Codefoco.Touch.Server">
<Version>1.0.29</Version>
<Version>1.0.30</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
......
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