Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit36bdb98

Browse files
committed
use .NET Core 3.1 LTS for tests (instead of 2.0)
1 parentd0c588b commit36bdb98

File tree

6 files changed

+13
-15
lines changed

6 files changed

+13
-15
lines changed

‎.travis.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ python:
88

99
env:
1010
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/
1212
-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/
1414
-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=""
1515

1616
global:
@@ -29,9 +29,7 @@ addons:
2929
packages:
3030
-mono-devel
3131
-ca-certificates-mono
32-
-dotnet-hostfxr-2.2
33-
-dotnet-runtime-2.2
34-
-dotnet-sdk-2.2
32+
-dotnet-sdk-3.1
3533

3634
before_install:
3735
# Set-up dll path for embedded tests

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '{branch}-{build}'
22
build:off
33

44
image:
5-
-Visual Studio2017
5+
-Visual Studio2019
66

77
platform:
88
-x86

‎ci/appveyor_run_tests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ if ($XPLAT){
9999
$DOTNET_CMD="c:\Program Files (x86)\dotnet\dotnet"
100100
}
101101

102-
# Run Embedded tests fornetcoreapp2.0 (OpenCover currently does not supports dotnet core)
103-
Write-Host ("Starting embedded tests fornetcoreapp2.0")-ForegroundColor"Green"
104-
&$DOTNET_CMD".\src\embed_tests\bin\netcoreapp2.0_publish\Python.EmbeddingTest.dll"
102+
# Run Embedded tests fornetcoreapp3.1 (OpenCover currently does not supports dotnet core)
103+
Write-Host ("Starting embedded tests fornetcoreapp3.1")-ForegroundColor"Green"
104+
&$DOTNET_CMD".\src\embed_tests\bin\netcoreapp3.1_publish\Python.EmbeddingTest.dll"
105105
$CS_STATUS=$LastExitCode
106106
if ($CS_STATUS-ne0) {
107-
Write-Host"Embedded tests fornetcoreapp2.0 failed"-ForegroundColor"Red"
107+
Write-Host"Embedded tests fornetcoreapp3.1 failed"-ForegroundColor"Red"
108108
ReportTime""
109109
}else {
110110
ReportTime".NET Core 2.0 tests completed"

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ def build_extension(self, ext):
351351
cmd
352352
+ [
353353
'"/t:Console_15:publish;Python_EmbeddingTest_15:publish"',
354-
"/p:TargetFramework=netcoreapp2.0",
354+
"/p:TargetFramework=netcoreapp3.1",
355355
]
356356
),
357357
shell=use_shell,

‎src/console/Console.15.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<ImportProject="Sdk.props"Sdk="Microsoft.NET.Sdk" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
4+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
55
<Platforms>x64;x86</Platforms>
66
<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>
77
<OutputType>Exe</OutputType>

‎src/embed_tests/Python.EmbeddingTest.15.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<ImportProject="Sdk.props"Sdk="Microsoft.NET.Sdk" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net40;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
66
<Platforms>x64;x86</Platforms>
77
<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>
88
<OutputTypeCondition="'$(TargetFramework)' != 'net40' OR '$(PYTHONNET_VS_ENV)' == 'true'">Exe</OutputType>
@@ -28,7 +28,7 @@
2828
<CustomDefineConstantsCondition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants>
2929
<BaseDefineConstants>XPLAT</BaseDefineConstants>
3030
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
31-
<DefineConstantsCondition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);NETCOREAPP</DefineConstants>
31+
<DefineConstantsCondition="'$(TargetFramework)'=='netcoreapp3.1'">$(DefineConstants);NETCOREAPP</DefineConstants>
3232
<DefineConstantsCondition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
3333
<DefineConstantsCondition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3434
<FrameworkPathOverrideCondition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
@@ -87,7 +87,7 @@
8787
</PackageReference>
8888
<PackageReferenceInclude="NUnitLite"Version="3.12.0" />
8989
</ItemGroup>
90-
<ItemGroupCondition="'$(TargetFramework)' == 'netcoreapp2.0'">
90+
<ItemGroupCondition="'$(TargetFramework)' == 'netcoreapp3.1'">
9191
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="16.5.0" />
9292
</ItemGroup>
9393
<ItemGroup>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp