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

Commit04b539e

Browse files
authored
Merge branch 'master' into PR/Codecs
2 parentse2d3333 +22735f8 commit04b539e

File tree

6 files changed

+26
-17
lines changed

6 files changed

+26
-17
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ install:
4444

4545
script:
4646
-python -m pytest
47-
-$RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll
47+
-$RUN_TESTS src/embed_tests/bin/$EMBED_TESTS_PATH/Python.EmbeddingTest.dll --labels=All
4848
# does not work on Linux, because NuGet package for 2.3 is Windows only
4949
# - "if [[ $TRAVIS_PYTHON_VERSION == '3.5' && $PERF_TESTS_PATH != '' ]]; then mono $NUNIT_PATH src/perf_tests/bin/$PERF_TESTS_PATH/Python.PerformanceTests.dll; fi"
5050

‎ci/appveyor_run_tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if ($PYTHON_STATUS -ne 0) {
5555
# Run Embedded tests with C# coverage
5656
Write-Host ("Starting embedded tests")-ForegroundColor"Green"
5757
.$OPENCOVER-register:user-searchdirs:"$RUNTIME_DIR"-output:cs.coverage`
58-
-target:"$CS_RUNNER"-targetargs:"$CS_TESTS"`
58+
-target:"$CS_RUNNER"-targetargs:"$CS_TESTS --labels=All"`
5959
-filter:"+[*]Python.Runtime*"`
6060
-returntargetcode
6161
$CS_STATUS=$LastExitCode

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,17 @@
7777

7878

7979
<ItemGroup>
80-
<PackageReferenceInclude="NUnit"Version="3.7.1" />
81-
<PackageReferenceInclude="NUnit.ConsoleRunner"Version="3.7.0" />
82-
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.8.0" />
83-
<PackageReferenceInclude="NUnitLite"Version="3.7.2" />
8480
<PackageReferenceInclude="System.ValueTuple"Version="4.5.0" />
81+
<PackageReferenceInclude="NUnit"Version="3.12.0" />
82+
<PackageReferenceInclude="NUnit.ConsoleRunner"Version="3.11.1" />
83+
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.16.1">
84+
<PrivateAssets>all</PrivateAssets>
85+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
86+
</PackageReference>
87+
<PackageReferenceInclude="NUnitLite"Version="3.12.0" />
8588
</ItemGroup>
8689
<ItemGroupCondition="'$(TargetFramework)' == 'netcoreapp2.0'">
87-
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="15.0.0" />
90+
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="16.5.0" />
8891
</ItemGroup>
8992
<ItemGroup>
9093
<ProjectReferenceInclude="..\runtime\Python.Runtime.15.csproj" />

‎src/embed_tests/Python.EmbeddingTest.csproj

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
</PropertyGroup>
7171
<ItemGroup>
7272
<ReferenceInclude="Microsoft.CSharp" />
73-
<ReferenceInclude="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
73+
<ReferenceInclude="nunit.framework, Version=3.12.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\NUnit.3.12.0\lib\net40\nunit.framework.dll</HintPath>
7575
</Reference>
7676
<ReferenceInclude="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
7777
<HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\portable-net40+sl4+win8+wp8\System.ValueTuple.dll</HintPath>
@@ -130,4 +130,10 @@
130130
<CopySourceFiles="$(TargetAssembly)"DestinationFolder="$(PythonBuildDir)" />
131131
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
132132
</Target>
133+
<TargetName="EnsureNuGetPackageBuildImports"BeforeTargets="PrepareForBuild">
134+
<PropertyGroup>
135+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
136+
</PropertyGroup>
137+
<ErrorCondition="!Exists('..\..\packages\NUnit.3.12.0\build\NUnit.props')"Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit.3.12.0\build\NUnit.props'))" />
138+
</Target>
133139
</Project>

‎src/embed_tests/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<packageid="NUnit"version="3.7.1"targetFramework="net40" />
4-
<packageid="NUnit.ConsoleRunner"version="3.7.0"targetFramework="net40" />
3+
<packageid="NUnit"version="3.12.0"targetFramework="net40" />
4+
<packageid="NUnit.ConsoleRunner"version="3.11.1"targetFramework="net40" />
55
<packageid="System.ValueTuple"version="4.5.0"targetFramework="net40" />
6-
</packages>
6+
</packages>

‎src/perf_tests/Python.PerformanceTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReferenceInclude="BenchmarkDotNet"Version="0.11.5" />
14+
<PackageReferenceInclude="BenchmarkDotNet"Version="0.12.0" />
1515
<PackageReferenceInclude="Microsoft.NETFramework.ReferenceAssemblies"Version="1.0.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
1919
<PackageReferenceInclude="nunit"Version="3.12.0" />
20-
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.13.0" />
21-
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="16.2.0" />
22-
<PackageReferenceInclude="Microsoft.NETFramework.ReferenceAssemblies"Version="1.0.0">
20+
<PackageReferenceInclude="NUnit3TestAdapter"Version="3.16.1">
2321
<PrivateAssets>all</PrivateAssets>
24-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2523
</PackageReference>
24+
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="16.5.0" />
25+
<PackageReferenceInclude="Microsoft.NETFramework.ReferenceAssemblies"Version="1.0.0">
2626
<PackageReferenceInclude="pythonnet"Version="2.3.0"GeneratePathProperty="true">
2727
<IncludeAssets>compile</IncludeAssets>
2828
</PackageReference>

0 commit comments

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