Repository navigation
Commit eb07dba
committed
Upgrade all project to .netstandard 2.x and remove xxx.15.csproj.
1 parent fd88290 commit eb07dba
17 files changed
Lines changed: 547 additions & 1314 deletions
File tree
- src
- clrmodule
- Properties
- console
- Properties
- embed_tests
- runtime
- testing
Large diffs are not rendered by default.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -0,0 +1,11 @@ | |||
| 1 | + <Project Sdk="Microsoft.NET.Sdk"> | ||
| 2 | + | ||
| 3 | + <PropertyGroup> | ||
| 4 | + <TargetFramework>netstandard2.0</TargetFramework> | ||
| 5 | + </PropertyGroup> | ||
| 6 | + | ||
| 7 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| 8 | + <DefineConstants>PYTHON3;TRACE;DEBUG</DefineConstants> | ||
| 9 | + </PropertyGroup> | ||
| 10 | + | ||
| 11 | + </Project> | ||
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,95 +1,15 @@ | |||
| 1 | - <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | - <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> | ||
| 1 | + <Project Sdk="Microsoft.NET.Sdk"> | ||
| 2 | + | ||
| 3 | 3 | <PropertyGroup> | |
| 4 | - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | ||
| 5 | - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | ||
| 6 | - <ProjectGuid>{86E834DE-1139-4511-96CC-69636A56E7AC}</ProjectGuid> | ||
| 7 | - <OutputType>Library</OutputType> | ||
| 8 | - <AssemblyName>clrmodule</AssemblyName> | ||
| 9 | - <RootNamespace>clrmodule</RootNamespace> | ||
| 10 | - <DocumentationFile>bin\clrmodule.xml</DocumentationFile> | ||
| 11 | - <OutputPath>bin\</OutputPath> | ||
| 12 | - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> | ||
| 13 | - <TargetFrameworkProfile /> | ||
| 14 | - <NoWarn>1591</NoWarn> | ||
| 15 | - <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> | ||
| 16 | - <PythonBuildDir Condition=" '$(PythonBuildDir)' == '' ">$(SolutionDir)\bin\</PythonBuildDir> | ||
| 17 | - <AppDesignerFolder>Properties</AppDesignerFolder> | ||
| 18 | - <LangVersion>6</LangVersion> | ||
| 19 | - <RestorePackages>true</RestorePackages> | ||
| 20 | - <ErrorReport>prompt</ErrorReport> | ||
| 4 | + <TargetFramework>netstandard2.0</TargetFramework> | ||
| 21 | 5 | </PropertyGroup> | |
| 22 | - <PropertyGroup Condition=" '$(Platform)' == 'x86'"> | ||
| 23 | - <PlatformTarget>x86</PlatformTarget> | ||
| 6 | + | ||
| 7 | + <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> | ||
| 8 | + <DefineConstants>TRACE;DEBUG;PYTHON3</DefineConstants> | ||
| 24 | 9 | </PropertyGroup> | |
| 25 | - <PropertyGroup Condition=" '$(Platform)' == 'x64'"> | ||
| 26 | - <PlatformTarget>x64</PlatformTarget> | ||
| 27 | - </PropertyGroup> | ||
| 28 | - <PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'"> | ||
| 29 | - <DebugSymbols>true</DebugSymbols> | ||
| 30 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants> | ||
| 31 | - <DebugType>full</DebugType> | ||
| 32 | - </PropertyGroup> | ||
| 33 | - <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'"> | ||
| 34 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants> | ||
| 35 | - <Optimize>true</Optimize> | ||
| 36 | - <DebugType>pdbonly</DebugType> | ||
| 37 | - </PropertyGroup> | ||
| 38 | - <PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'"> | ||
| 39 | - <DebugSymbols>true</DebugSymbols> | ||
| 40 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;TRACE;DEBUG</DefineConstants> | ||
| 41 | - <DebugType>full</DebugType> | ||
| 42 | - </PropertyGroup> | ||
| 43 | - <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'"> | ||
| 44 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2</DefineConstants> | ||
| 45 | - <Optimize>true</Optimize> | ||
| 46 | - <DebugType>pdbonly</DebugType> | ||
| 47 | - </PropertyGroup> | ||
| 48 | - <PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'"> | ||
| 49 | - <DebugSymbols>true</DebugSymbols> | ||
| 50 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants> | ||
| 51 | - <DebugType>full</DebugType> | ||
| 52 | - </PropertyGroup> | ||
| 53 | - <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'"> | ||
| 54 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants> | ||
| 55 | - <Optimize>true</Optimize> | ||
| 56 | - <DebugType>pdbonly</DebugType> | ||
| 57 | - </PropertyGroup> | ||
| 58 | - <PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'"> | ||
| 59 | - <DebugSymbols>true</DebugSymbols> | ||
| 60 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;TRACE;DEBUG</DefineConstants> | ||
| 61 | - <DebugType>full</DebugType> | ||
| 62 | - </PropertyGroup> | ||
| 63 | - <PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'"> | ||
| 64 | - <DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3</DefineConstants> | ||
| 65 | - <Optimize>true</Optimize> | ||
| 66 | - <DebugType>pdbonly</DebugType> | ||
| 67 | - </PropertyGroup> | ||
| 68 | - <ItemGroup> | ||
| 69 | - <Reference Include="RGiesecke.DllExport.Metadata"> | ||
| 70 | - <HintPath>..\..\packages\UnmanagedExports.1.2.7\lib\net\RGiesecke.DllExport.Metadata.dll</HintPath> | ||
| 71 | - <Private>False</Private> | ||
| 72 | - </Reference> | ||
| 73 | - <Reference Include="System" /> | ||
| 74 | - </ItemGroup> | ||
| 10 | + | ||
| 75 | 11 | <ItemGroup> | |
| 76 | - <Compile Include="Properties\AssemblyInfo.cs" /> | ||
| 77 | - <Compile Include="..\SharedAssemblyInfo.cs"> | ||
| 78 | - <Link>Properties\SharedAssemblyInfo.cs</Link> | ||
| 79 | - </Compile> | ||
| 80 | - <Compile Include="ClrModule.cs" /> | ||
| 12 | + <PackageReference Include="UnmanagedExports" Version="1.2.7" /> | ||
| 81 | 13 | </ItemGroup> | |
| 82 | - <ItemGroup> | ||
| 83 | - <None Include="packages.config" /> | ||
| 84 | - </ItemGroup> | ||
| 85 | - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> | ||
| 86 | - <PropertyGroup> | ||
| 87 | - <TargetAssembly>$(TargetPath)</TargetAssembly> | ||
| 88 | - <TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb> | ||
| 89 | - </PropertyGroup> | ||
| 90 | - <Target Name="AfterBuild" DependsOnTargets="RGieseckeDllExport"> | ||
| 91 | - <Copy SourceFiles="$(TargetAssembly)" DestinationFiles="$(PythonBuildDir)\clr.pyd" /> | ||
| 92 | - <Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFiles="$(PythonBuildDir)\clr.pdb" /> | ||
| 93 | - </Target> | ||
| 94 | - <Import Project="../../packages/UnmanagedExports.1.2.7/tools/RGiesecke.DllExport.targets" Condition="Exists('../../packages/UnmanagedExports.1.2.7/tools/RGiesecke.DllExport.targets')" /> | ||
| 14 | + | ||
| 95 | 15 | </Project> | |
This file was deleted.
0 commit comments