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

Commit635edac

Browse files
committed
Make the tests run as netcoreapp
Even though it tests nothing.
1 parent2253ef3 commit635edac

File tree

3 files changed

+136
-95
lines changed

3 files changed

+136
-95
lines changed

‎pythonnet.15.sln

Lines changed: 53 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -390,66 +390,59 @@ Global
390390
{6FB0D091-9CEC-4DCC-8701-C40F9BFC9EDE}.ReleaseWinPY3|x64.Build.0=ReleaseWinPY3|x64
391391
{6FB0D091-9CEC-4DCC-8701-C40F9BFC9EDE}.ReleaseWinPY3|x86.ActiveCfg=ReleaseWinPY3|x86
392392
{6FB0D091-9CEC-4DCC-8701-C40F9BFC9EDE}.ReleaseWinPY3|x86.Build.0=ReleaseWinPY3|x86
393-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
394-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.Build.0=Debug|Any CPU
395-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x64.ActiveCfg=Debug|Any CPU
396-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x64.Build.0=Debug|Any CPU
397-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x86.ActiveCfg=Debug|Any CPU
398-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x86.Build.0=Debug|Any CPU
399-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|Any CPU.ActiveCfg=Debug|Any CPU
400-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|Any CPU.Build.0=Debug|Any CPU
401-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x64.ActiveCfg=Debug|Any CPU
402-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x64.Build.0=Debug|Any CPU
403-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x86.ActiveCfg=Debug|Any CPU
404-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x86.Build.0=Debug|Any CPU
405-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|Any CPU.ActiveCfg=Debug|Any CPU
406-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|Any CPU.Build.0=Debug|Any CPU
407-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x64.ActiveCfg=Debug|Any CPU
408-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x64.Build.0=Debug|Any CPU
409-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x86.ActiveCfg=Debug|Any CPU
410-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x86.Build.0=Debug|Any CPU
411-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|Any CPU.ActiveCfg=Debug|Any CPU
412-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|Any CPU.Build.0=Debug|Any CPU
413-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x64.ActiveCfg=Debug|Any CPU
414-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x64.Build.0=Debug|Any CPU
415-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x86.ActiveCfg=Debug|Any CPU
416-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x86.Build.0=Debug|Any CPU
417-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|Any CPU.ActiveCfg=Debug|Any CPU
418-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|Any CPU.Build.0=Debug|Any CPU
419-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x64.ActiveCfg=Debug|Any CPU
420-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x64.Build.0=Debug|Any CPU
421-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x86.ActiveCfg=Debug|Any CPU
422-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x86.Build.0=Debug|Any CPU
423-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|Any CPU.ActiveCfg=Release|Any CPU
424-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|Any CPU.Build.0=Release|Any CPU
425-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x64.ActiveCfg=Release|Any CPU
426-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x64.Build.0=Release|Any CPU
427-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.ActiveCfg=Release|Any CPU
428-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.Build.0=Release|Any CPU
429-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|Any CPU.ActiveCfg=Release|Any CPU
430-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|Any CPU.Build.0=Release|Any CPU
431-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x64.ActiveCfg=Release|Any CPU
432-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x64.Build.0=Release|Any CPU
433-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x86.ActiveCfg=Release|Any CPU
434-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x86.Build.0=Release|Any CPU
435-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|Any CPU.ActiveCfg=Release|Any CPU
436-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|Any CPU.Build.0=Release|Any CPU
437-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x64.ActiveCfg=Release|Any CPU
438-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x64.Build.0=Release|Any CPU
439-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x86.ActiveCfg=Release|Any CPU
440-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x86.Build.0=Release|Any CPU
441-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|Any CPU.ActiveCfg=Release|Any CPU
442-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|Any CPU.Build.0=Release|Any CPU
443-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x64.ActiveCfg=Release|Any CPU
444-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x64.Build.0=Release|Any CPU
445-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x86.ActiveCfg=Release|Any CPU
446-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x86.Build.0=Release|Any CPU
447-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|Any CPU.ActiveCfg=Release|Any CPU
448-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|Any CPU.Build.0=Release|Any CPU
449-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x64.ActiveCfg=Release|Any CPU
450-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x64.Build.0=Release|Any CPU
451-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x86.ActiveCfg=Release|Any CPU
452-
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x86.Build.0=Release|Any CPU
393+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.ActiveCfg=ReleaseWin|x86
394+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|Any CPU.Build.0=ReleaseWin|x86
395+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x64.ActiveCfg=DebugWinPY3|x64
396+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x64.Build.0=DebugWinPY3|x64
397+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x86.ActiveCfg=DebugWinPY3|x86
398+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Debug|x86.Build.0=DebugWinPY3|x86
399+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|Any CPU.ActiveCfg=DebugMono|x86
400+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x64.ActiveCfg=DebugMono|x64
401+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x64.Build.0=DebugMono|x64
402+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x86.ActiveCfg=DebugMono|x86
403+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMono|x86.Build.0=DebugMono|x86
404+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|Any CPU.ActiveCfg=DebugMonoPY3|x86
405+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x64.ActiveCfg=DebugMonoPY3|x64
406+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x64.Build.0=DebugMonoPY3|x64
407+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x86.ActiveCfg=DebugMonoPY3|x86
408+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugMonoPY3|x86.Build.0=DebugMonoPY3|x86
409+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|Any CPU.ActiveCfg=DebugWin|x86
410+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x64.ActiveCfg=DebugWin|x64
411+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x64.Build.0=DebugWin|x64
412+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x86.ActiveCfg=DebugWin|x86
413+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWin|x86.Build.0=DebugWin|x86
414+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|Any CPU.ActiveCfg=DebugWinPY3|x86
415+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x64.ActiveCfg=DebugWinPY3|x64
416+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x64.Build.0=DebugWinPY3|x64
417+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x86.ActiveCfg=DebugWinPY3|x86
418+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.DebugWinPY3|x86.Build.0=DebugWinPY3|x86
419+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|Any CPU.ActiveCfg=ReleaseWin|x86
420+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|Any CPU.Build.0=ReleaseWin|x86
421+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x64.ActiveCfg=ReleaseWinPY3|x64
422+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x64.Build.0=ReleaseWinPY3|x64
423+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.ActiveCfg=ReleaseWinPY3|x86
424+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.Release|x86.Build.0=ReleaseWinPY3|x86
425+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|Any CPU.ActiveCfg=ReleaseMono|x86
426+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x64.ActiveCfg=ReleaseMono|x64
427+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x64.Build.0=ReleaseMono|x64
428+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x86.ActiveCfg=ReleaseMono|x86
429+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMono|x86.Build.0=ReleaseMono|x86
430+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|Any CPU.ActiveCfg=ReleaseMonoPY3|x86
431+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x64.ActiveCfg=ReleaseMonoPY3|x64
432+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x64.Build.0=ReleaseMonoPY3|x64
433+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x86.ActiveCfg=ReleaseMonoPY3|x86
434+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseMonoPY3|x86.Build.0=ReleaseMonoPY3|x86
435+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|Any CPU.ActiveCfg=ReleaseWin|x86
436+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x64.ActiveCfg=ReleaseWin|x64
437+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x64.Build.0=ReleaseWin|x64
438+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x86.ActiveCfg=ReleaseWin|x86
439+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWin|x86.Build.0=ReleaseWin|x86
440+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|Any CPU.ActiveCfg=ReleaseWinPY3|x86
441+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x64.ActiveCfg=ReleaseWinPY3|x64
442+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x64.Build.0=ReleaseWinPY3|x64
443+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x86.ActiveCfg=ReleaseWinPY3|x86
444+
{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}.ReleaseWinPY3|x86.Build.0=ReleaseWinPY3|x86
445+
453446
EndGlobalSection
454447
GlobalSection(SolutionProperties) =preSolution
455448
HideSolutionNode =FALSE
Lines changed: 77 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,98 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<ProjectToolsVersion="15.0"xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<ImportProject="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project>
2+
<ImportProject="Sdk.props"Sdk="Microsoft.NET.Sdk" />
3+
44
<PropertyGroup>
5-
<ConfigurationCondition=" '$(Configuration)' == ''">Debug</Configuration>
6-
<PlatformCondition=" '$(Platform)' == ''">AnyCPU</Platform>
7-
<ProjectGuid>{F2FB6DA3-318E-4F30-9A1F-932C667E38C5}</ProjectGuid>
5+
<TargetFrameworks>net40;netcoreapp3.1</TargetFrameworks>
6+
<Platforms>x64;x86</Platforms>
7+
<Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations>
88
<OutputType>Exe</OutputType>
9-
<RootNamespace>Python.DomainReloadTests</RootNamespace>
9+
<GenerateProgramFile>false</GenerateProgramFile>
1010
<AssemblyName>Python.DomainReloadTests</AssemblyName>
11+
<RootNamespace>Python.DomainReloadTests</RootNamespace>
12+
<PackageId>Python.DomainReloadTests</PackageId>
13+
<VersionPrefix>2.5.0</VersionPrefix>
14+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
15+
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
16+
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
17+
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1118
<OutputPath>bin\</OutputPath>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
15-
<Deterministic>true</Deterministic>
19+
<AppendTargetFrameworkToOutputPathCondition="'$(TargetFramework)'=='net40'">false</AppendTargetFrameworkToOutputPath>
20+
<DocumentationFileCondition="'$(TargetFramework)'=='net40'">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
21+
<DocumentationFileCondition="'$(TargetFramework)'!='net40'">$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
22+
<NoWarn>1591</NoWarn>
23+
<SolutionDirCondition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
24+
<PythonBuildDirCondition="'$(TargetFramework)'=='net40' AND '$(PythonBuildDir)' == ''">$(SolutionDir)\bin\</PythonBuildDir>
25+
<PublishDirCondition="'$(TargetFramework)'!='net40'">$(OutputPath)\$(TargetFramework)_publish</PublishDir>
1626
<LangVersion>7.3</LangVersion>
27+
<ErrorReport>prompt</ErrorReport>
28+
<CustomDefineConstantsCondition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants>
29+
<BaseDefineConstants>XPLAT</BaseDefineConstants>
30+
<DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants>
31+
<DefineConstantsCondition="'$(TargetFramework)'=='netcoreapp3.1'">$(DefineConstants);NETCOREAPP</DefineConstants>
32+
<DefineConstantsCondition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants>
33+
<DefineConstantsCondition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants>
34+
<FrameworkPathOverrideCondition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride>
1735
</PropertyGroup>
18-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
36+
<PropertyGroupCondition=" '$(Platform)' == 'x86'">
37+
<PlatformTarget>x86</PlatformTarget>
38+
</PropertyGroup>
39+
<PropertyGroupCondition=" '$(Platform)' == 'x64'">
40+
<PlatformTarget>x64</PlatformTarget>
41+
</PropertyGroup>
42+
43+
<PropertyGroupCondition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
2244
<Optimize>false</Optimize>
23-
<DefineConstants>DEBUG;TRACE</DefineConstants>
24-
<ErrorReport>prompt</ErrorReport>
25-
<WarningLevel>4</WarningLevel>
45+
<DebugType>full</DebugType>
2646
</PropertyGroup>
27-
<PropertyGroupCondition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
28-
<PlatformTarget>AnyCPU</PlatformTarget>
47+
<PropertyGroupCondition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
48+
<Optimize>true</Optimize>
2949
<DebugType>pdbonly</DebugType>
50+
</PropertyGroup>
51+
<PropertyGroupCondition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
52+
<DebugSymbols>true</DebugSymbols>
53+
<Optimize>false</Optimize>
54+
<DebugType>full</DebugType>
55+
</PropertyGroup>
56+
<PropertyGroupCondition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
57+
<DebugSymbols>true</DebugSymbols>
3058
<Optimize>true</Optimize>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
59+
<DebugType>portable</DebugType>
60+
</PropertyGroup>
61+
62+
<PropertyGroupCondition="$(Configuration.Contains('Debug'))">
63+
<DefineConstantsCondition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
3464
</PropertyGroup>
65+
<PropertyGroupCondition="$(Configuration.Contains('Release'))">
66+
<DefineConstantsCondition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
67+
</PropertyGroup>
68+
3569
<ItemGroup>
3670
<ReferenceInclude="System" />
3771
<ReferenceInclude="System.Core" />
3872
<ReferenceInclude="System.Xml.Linq" />
3973
<ReferenceInclude="System.Data.DataSetExtensions" />
40-
<ReferenceInclude="Microsoft.CSharp" />
4174
<ReferenceInclude="System.Data" />
4275
<ReferenceInclude="System.Xml" />
4376
</ItemGroup>
44-
<ItemGroup>
45-
<CompileInclude="TestRunner.cs" />
77+
78+
<ItemGroupCondition="'$(TargetFramework)' == 'netcoreapp3.1'">
79+
<PackageReferenceInclude="Microsoft.NET.Test.Sdk"Version="16.5.0" />
4680
</ItemGroup>
47-
<ItemGroup>
48-
<NoneInclude="App.config" />
49-
</ItemGroup>
50-
<ItemGroup>
51-
<FolderInclude="Properties\" />
81+
82+
<ItemGroupCondition="'$(TargetFramework)' == 'net40'">
83+
<ReferenceInclude="Microsoft.CSharp" />
5284
</ItemGroup>
53-
<ImportProject="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
54-
</Project>
85+
86+
<ImportProject="Sdk.targets"Sdk="Microsoft.NET.Sdk" />
87+
88+
<PropertyGroup>
89+
<TargetAssembly>$(TargetPath)</TargetAssembly>
90+
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>
91+
</PropertyGroup>
92+
93+
<TargetName="AfterBuild">
94+
<CopyCondition="'$(TargetFramework)'=='net40'"SourceFiles="$(TargetAssembly)"DestinationFolder="$(PythonBuildDir)" />
95+
<!-- Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
96+
</Target>
97+
98+
</Project>

‎src/domain_tests/TestRunner.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,6 +821,9 @@ public static int Main()
821821

822822
publicstaticintMain(string[]args)
823823
{
824+
// We require this slightly convoluted way of ifdef'ing because the Python
825+
// comments '#' are mistaken as C# preprocessior directive
826+
#if!NETCOREAPP
824827
TestCasetestCase;
825828
if(args.Length<1)
826829
{
@@ -870,9 +873,10 @@ public static int Main(string[] args)
870873
RunAndUnload(runnerDomain,runnerAssembly);
871874
}
872875
}
873-
876+
#endif
874877
return0;
875878
}
879+
#if!NETCOREAPP
876880

877881
staticvoidRunAndUnload(AppDomaindomain,stringassemblyPath)
878882
{
@@ -898,7 +902,6 @@ static string CreateCaseRunnerAssembly(string verb, string shutdownMode = "Shutd
898902

899903
returnCreateAssembly(name,code,exe:true);
900904
}
901-
902905
staticstringCreateAssembly(stringname,stringcode,boolexe=false)
903906
{
904907
// Console.WriteLine(code);
@@ -969,6 +972,7 @@ static string CreatePythonModule(TestCase testCase)
969972

970973
returnnull;
971974
}
975+
#endif
972976

973977
}
974978
}

0 commit comments

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