8000 Fix for CI: define NETSTANDARD in src/embed_tests · pythonnet/pythonnet@13f8b53 · GitHub
[go: up one dir, main page]

Skip to content

Commit 13f8b53

Browse files
author
Benoit Hudson
committed
Fix for CI: define NETSTANDARD in src/embed_tests
Also disable the domain reload test under either NETSTANDARD or NETCOREAPP (the former was used in the runtime, the latter in embed_tests).
1 parent 9ab7b13 commit 13f8b53

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/embed_tests/Python.EmbeddingTest.15.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<BaseDefineConstants>XPLAT</BaseDefineConstants>
3030
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
3131
<DefineConstants Condition="'$(TargetFramework)'=='netcoreapp2.0'">$(DefineConstants);NETCOREAPP</DefineConstants>
32+
<DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
3233
<DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
3334
<FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
3435
</PropertyGroup>

src/embed_tests/TestDomainReload.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
//
88
// This test case is disabled on .NET Standard because it doesn't have all the
9-
// APIs we use; .NET Core doesn't implement application domains, which is what
10-
// we're testing so there's no point trying.
9+
// APIs we use. We could work around that, but .NET Core doesn't implement
10+
// domain creation, so it's not worth it.
1111
//
1212
// Unfortunately this means no continuous integration testing for this case.
1313
//
14-
#if !NETSTANDARD
14+
#if !NETSTANDARD && !NETCOREAPP
1515
namespace Python.EmbeddingTest
1616
{
1717
class TestDomainReload

0 commit comments

Comments
 (0)
0