Repository navigation
Commit 2ed8bcb
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,10 +1,9 @@ | |||
| 1 | 1 | <Project> | |
| 2 | 2 | <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" /> | |
| 3 | 3 | <PropertyGroup> | |
| 4 | - <TargetFrameworks>net40;netstandard2.0</TargetFrameworks> | ||
| 5 | - <Platforms>AnyCPU</Platforms> | ||
| 4 | + <TargetFrameworks>net45;netstandard2.0</TargetFrameworks> | ||
| 5 | + <Platforms>AnyCPU;x64</Platforms> | ||
| 6 | 6 | <Configurations>DebugMono;DebugMonoPY3;ReleaseMono;ReleaseMonoPY3;DebugWin;DebugWinPY3;ReleaseWin;ReleaseWinPY3</Configurations> | |
| 7 | - <AssetTargetFallback Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">net45</AssetTargetFallback> | ||
| 8 | 7 | <RootNamespace>Python.Runtime</RootNamespace> | |
| 9 | 8 | <AssemblyName>Python.Runtime</AssemblyName> | |
| 10 | 9 | <PackageId>pythonnet</PackageId> | |
@@ -23,22 +22,19 @@ | |||
| 23 | 22 | <PackageIconUrl>https://raw.githubusercontent.com/pythonnet/pythonnet/master/src/console/python-clear.ico</PackageIconUrl> | |
| 24 | 23 | <PackageProjectUrl>https://pythonnet.github.io/</PackageProjectUrl> | |
| 25 | 24 | <OutputPath>bin\</OutputPath> | |
| 26 | - <AppendTargetFrameworkToOutputPath Condition="'$(TargetFramework)'=='net40'">false</AppendTargetFrameworkToOutputPath> | ||
| 27 | - <DocumentationFile Condition="'$(TargetFramework)'=='net40'">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 28 | - <DocumentationFile Condition="'$(TargetFramework)'!='net40'">$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> | ||
| 25 | + <DocumentationFile Condition="'$(TargetFramework)'=='net45'">$(OutputPath)\$(AssemblyName).xml</DocumentationFile> | ||
| 26 | + <DocumentationFile Condition="'$(TargetFramework)'!='net45'">$(OutputPath)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> | ||
| 29 | 27 | <NoWarn>1591;NU1701</NoWarn> | |
| 30 | 28 | <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> | |
| 31 | 29 | <PythonBuildDir Condition="'$(PythonBuildDir)' == ''">$(SolutionDir)\bin\</PythonBuildDir> | |
| 32 | - <PublishDir Condition="'$(TargetFramework)'!='net40'">$(PythonBuildDir)\$(TargetFramework)\</PublishDir> | ||
| 30 | + <PublishDir Condition="'$(TargetFramework)'!='net45'">$(PythonBuildDir)\$(TargetFramework)\</PublishDir> | ||
| 33 | 31 | <LangVersion>7.3</LangVersion> | |
| 34 | 32 | <AllowUnsafeBlocks>True</AllowUnsafeBlocks> | |
| 35 | - <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile> | ||
| 36 | 33 | <CustomDefineConstants Condition="'$(CustomDefineConstants)' == ''">$(PYTHONNET_DEFINE_CONSTANTS)</CustomDefineConstants> | |
| 37 | 34 | <BaseDefineConstants>XPLAT</BaseDefineConstants> | |
| 38 | 35 | <DefineConstants>$(DefineConstants);$(CustomDefineConstants);$(BaseDefineConstants);</DefineConstants> | |
| 39 | 36 | <DefineConstants Condition="'$(TargetFramework)'=='netstandard2.0'">$(DefineConstants);NETSTANDARD</DefineConstants> | |
| 40 | 37 | <DefineConstants Condition="'$(BuildingInsideVisualStudio)' == 'true' AND '$(CustomDefineConstants)' != '' AND $(Configuration.Contains('Debug'))">$(DefineConstants);TRACE;DEBUG</DefineConstants> | |
| 41 | - <FrameworkPathOverride Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono'))">$(NuGetPackageRoot)\microsoft.targetingpack.netframework.v4.5\1.0.1\lib\net45\</FrameworkPathOverride> | ||
| 42 | 38 | <Python2Version>$(PYTHONNET_PY2_VERSION)</Python2Version> | |
| 43 | 39 | <Python2Version Condition="'$(Python2Version)'==''">PYTHON27</Python2Version> | |
| 44 | 40 | <Python3Version>$(PYTHONNET_PY3_VERSION)</Python3Version> | |
@@ -49,11 +45,11 @@ | |||
| 49 | 45 | <PythonMonoDefineConstants Condition="'$(PythonMonoDefineConstants)'==''">UCS4;MONO_LINUX;PYTHON_WITH_PYMALLOC</PythonMonoDefineConstants> | |
| 50 | 46 | <PythonInteropFile Condition="'$(PythonInteropFile)'==''">$(PYTHONNET_INTEROP_FILE)</PythonInteropFile> | |
| 51 | 47 | </PropertyGroup> | |
| 52 | - <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'"> | ||
| 48 | + <PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net45'"> | ||
| 53 | 49 | <Optimize>false</Optimize> | |
| 54 | 50 | <DebugType>full</DebugType> | |
| 55 | 51 | </PropertyGroup> | |
| 56 | - <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'"> | ||
| 52 | + <PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net45'"> | ||
| 57 | 53 | <Optimize>true</Optimize> | |
| 58 | 54 | <DebugType>pdbonly</DebugType> | |
| 59 | 55 | </PropertyGroup> | |
@@ -121,27 +117,19 @@ | |||
| 121 | 117 | <PackageReference Include="System.Reflection.Emit" Version="4.3.0" /> | |
| 122 | 118 | </ItemGroup> | |
| 123 | 119 | ||
| 124 | - <ItemGroup Condition="'$(TargetFramework)' == 'net40'"> | ||
| 120 | + <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> | ||
| 125 | 121 | <Reference Include="Microsoft.CSharp" /> | |
| 126 | 122 | </ItemGroup> | |
| 127 | 123 | ||
| 128 | - <ItemGroup Condition="'$(TargetFramework)'=='net40'"> | ||
| 129 | - <PackageReference Include="Microsoft.TargetingPack.NETFramework.v4.5" Version="1.0.1" ExcludeAssets="All" PrivateAssets="All" /> | ||
| 130 | - </ItemGroup> | ||
| 131 | - | ||
| 132 | 124 | <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" /> | |
| 133 | 125 | ||
| 134 | 126 | <PropertyGroup> | |
| 135 | 127 | <TargetAssembly>$(TargetPath)</TargetAssembly> | |
| 136 | 128 | <TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb> | |
| 137 | 129 | </PropertyGroup> | |
| 138 | 130 | ||
| 139 | - <Target Name="BeforeBuild" Condition="'$(TargetFramework)'=='net40' AND $(Configuration.Contains('Mono')) AND '$(OS)' != 'Windows_NT'"> | ||
| 140 | - <!--Endless war!--> | ||
| 141 | - <Exec Command="[[ -e $(NuGetPackageRoot)/microsoft.targetingpack.netframework.v4.5/1.0.1/lib/net45/System.Xml.dll ]] || cp $(NuGetPackageRoot)/microsoft.targetingpack.netframework.v4.5/1.0.1/lib/net45/System.XML.dll $(NuGetPackageRoot)/microsoft.targetingpack.netframework.v4.5/1.0.1/lib/net45/System.Xml.dll" /> | ||
| 142 | - </Target> | ||
| 143 | 131 | <Target Name="AfterBuild"> | |
| 144 | - <Copy Condition="'$(TargetFramework)'=='net40'" SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" /> | ||
| 132 | + <Copy Condition="'$(TargetFramework)'=='net45'" SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" /> | ||
| 145 | 133 | <!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /--> | |
| 146 | 134 | </Target> | |
| 147 | 135 | </Project> | |
0 commit comments