use .NET Core 3.1 LTS for tests (instead of 2.0)

use .NET Core 3.1 LTS for tests (instead of 2.0) · pythonnet/pythonnet@9aa51b1

5 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@ python:`
`8`	`8`
`9`	`9`	`env:`
`10`	`10`	`matrix:`
`11`		`- - BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/`
	`11`	`+ - BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp3.1_publish/ PERF_TESTS_PATH=net461/`
`12`	`12`	`- BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""`
`13`		`- - PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp2.0_publish/ PERF_TESTS_PATH=net461/`
	`13`	`+ - PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS=--xplat NUNIT_PATH="~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe" RUN_TESTS=dotnet EMBED_TESTS_PATH=netcoreapp3.1_publish/ PERF_TESTS_PATH=net461/`
`14`	`14`	`- PYTHONNET_SHUTDOWN_MODE="Soft" BUILD_OPTS="" NUNIT_PATH="./packages/NUnit.*/tools/nunit3-console.exe" RUN_TESTS="mono $NUNIT_PATH" EMBED_TESTS_PATH="" PERF_TESTS_PATH=""`
`15`	`15`
`16`	`16`	`global:`

Original file line number	Diff line number	Diff line change
`@@ -99,12 +99,12 @@ if ($XPLAT){`
`99`	`99`	`$DOTNET_CMD = "c:\Program Files (x86)\dotnet\dotnet"`
`100`	`100`	`}`
`101`	`101`
`102`		`-# Run Embedded tests for netcoreapp2.0 (OpenCover currently does not supports dotnet core)`
`103`		`-Write-Host ("Starting embedded tests for netcoreapp2.0") -ForegroundColor "Green"`
`104`		`-&$DOTNET_CMD ".\src\embed_tests\bin\netcoreapp2.0_publish\Python.EmbeddingTest.dll"`
	`102`	`+# Run Embedded tests for netcoreapp3.1 (OpenCover currently does not supports dotnet core)`
	`103`	`+Write-Host ("Starting embedded tests for netcoreapp3.1") -ForegroundColor "Green"`
	`104`	`+&$DOTNET_CMD ".\src\embed_tests\bin\netcoreapp3.1_publish\Python.EmbeddingTest.dll"`
`105`	`105`	`$CS_STATUS = $LastExitCode`
`106`	`106`	`if ($CS_STATUS -ne 0) {`
`107`		`-Write-Host "Embedded tests for netcoreapp2.0 failed" -ForegroundColor "Red"`
	`107`	`+Write-Host "Embedded tests for netcoreapp3.1 failed" -ForegroundColor "Red"`
`108`	`108`	`ReportTime ""`
`109`	`109`	`} else {`
`110`	`110`	`ReportTime ".NET Core 2.0 tests completed"`

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ def build_extension(self, ext):`
`351`	`351`	`cmd`
`352`	`352`	`+ [`
`353`	`353`	`'"/t:Console_15:publish;Python_EmbeddingTest_15:publish"',`
`354`		`-"/p:TargetFramework=netcoreapp2.0",`
	`354`	`+"/p:TargetFramework=netcoreapp3.1",`
`355`	`355`	`]`
`356`	`356`	`),`
`357`	`357`	`shell=use_shell,`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<Project>`
`2`	`2`	`<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />`
`3`	`3`	`<PropertyGroup>`
`4`		`-<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>`
	`4`	`+<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>`
`5`	`5`	`<Platforms>x64;x86</Platforms>`
`6`	`6`	`<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>`
`7`	`7`	`<OutputType>Exe</OutputType>`

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />`
`3`	`3`
`4`	`4`	`<PropertyGroup>`
`5`		`-<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>`
	`5`	`+<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>`
`6`	`6`	`<Platforms>x64;x86</Platforms>`
`7`	`7`	`<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>`
`8`	`8`	`<OutputType Condition="'$(TargetFramework)' != 'net40' OR '$(PYTHONNET_VS_ENV)' == 'true'">Exe</OutputType>`
`@@ -28,7 +28,7 @@`
`28`	`28`	`<CustomDefineConstants Condition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants>`
`29`	`29`	`<BaseDefineConstants>XPLAT</BaseDefineConstants>`
`30`	`30`	`<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>`
`31`		`-<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);NETCOREAPP</DefineConstants>`
	`31`	`+<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp3.1'">$(DefineConstants);NETCOREAPP</DefineConstants>`
`32`	`32`	`<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>`
`33`	`33`	`<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>`
`34`	`34`	`<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>`
`@@ -87,7 +87,7 @@`
`87`	`87`	`</PackageReference>`
`88`	`88`	`<PackageReference Include="NUnitLite" Version="3.12.0" />`
`89`	`89`	`</ItemGroup>`
`90`		`-<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">`
	`90`	`+<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">`
`91`	`91`	`<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />`
`92`	`92`	`</ItemGroup>`
`93`	`93`	`<ItemGroup>`