Skip to content

Commit 07aefe6

Browse files
BadSingletonBadSingleton
committed
Revert "Add typeoffset.cs"
This reverts commit f575bd3.
1 parent 1ae0bfe commit 07aefe6

File tree

3 files changed

+205
-211
lines changed

3 files changed

+205
-211
lines changed

‎src/runtime/Python.Runtime.csproj

Lines changed: 187 additions & 188 deletions
Original file line numberDiff line numberDiff line change
@@ -1,189 +1,188 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{097B4AC0-74E9-4C58-BCF8-C69746EC8271}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AssemblyName>Python.Runtime</AssemblyName>
9-
<RootNamespace>Python.Runtime</RootNamespace>
10-
<DocumentationFile>bin\Python.Runtime.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>7.3</LangVersion>
19-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
20-
<SignAssembly>false</SignAssembly>
21-
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
22-
</PropertyGroup>
23-
<!--We can relax binding to platform because code references no any platform dependent assemblies-->
24-
<!--This will allows to use any build of this assebly as a compile ref assebly-->
25-
<!--<PropertyGroup Condition=" '$(Platform)' == 'x86'">
26-
<PlatformTarget>x86</PlatformTarget>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
29-
<PlatformTarget>x64</PlatformTarget>
30-
</PropertyGroup>-->
31-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
32-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4</DefineConstants>
33-
<Optimize>true</Optimize>
34-
<DebugType>pdbonly</DebugType>
35-
</PropertyGroup>
36-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
37-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4</DefineConstants>
38-
<Optimize>true</Optimize>
39-
<DebugType>pdbonly</DebugType>
40-
</PropertyGroup>
41-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42-
<DebugSymbols>true</DebugSymbols>
43-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
44-
<Optimize>false</Optimize>
45-
<DebugType>full</DebugType>
46-
</PropertyGroup>
47-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
48-
<DebugSymbols>true</DebugSymbols>
49-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4;TRACE;DEBUG</DefineConstants>
50-
<Optimize>false</Optimize>
51-
<DebugType>full</DebugType>
52-
</PropertyGroup>
53-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
54-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2</DefineConstants>
55-
<Optimize>true</Optimize>
56-
<DebugType>pdbonly</DebugType>
57-
</PropertyGroup>
58-
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
59-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2</DefineConstants>
60-
<Optimize>true</Optimize>
61-
<DebugType>pdbonly</DebugType>
62-
</PropertyGroup>
63-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
64-
<DebugSymbols>true</DebugSymbols>
65-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
66-
<Optimize>false</Optimize>
67-
<DebugType>full</DebugType>
68-
</PropertyGroup>
69-
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
70-
<DebugSymbols>true</DebugSymbols>
71-
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2;TRACE;DEBUG</DefineConstants>
72-
<Optimize>false</Optimize>
73-
<DebugType>full</DebugType>
74-
</PropertyGroup>
75-
<ItemGroup>
76-
<Reference Include="System" />
77-
</ItemGroup>
78-
<ItemGroup>
79-
<Compile Include="Codecs\EncoderGroup.cs" />
80-
<Compile Include="Codecs\DecoderGroup.cs" />
81-
<Compile Include="Codecs\RawProxyEncoder.cs" />
82-
<Compile Include="Codecs\TupleCodecs.cs" />
83-
<Compile Include="converterextensions.cs" />
84-
<Compile Include="finalizer.cs" />
85-
<Compile Include="Properties\AssemblyInfo.cs" />
86-
<Compile Include="..\SharedAssemblyInfo.cs">
87-
<Link>Properties\SharedAssemblyInfo.cs</Link>
88-
</Compile>
89-
<Compile Include="arrayobject.cs" />
90-
<Compile Include="assemblymanager.cs" />
91-
<Compile Include="BorrowedReference.cs" />
92-
<Compile Include="classderived.cs" />
93-
<Compile Include="classbase.cs" />
94-
<Compile Include="classmanager.cs" />
95-
<Compile Include="classobject.cs" />
96-
<Compile Include="clrobject.cs" />
97-
<Compile Include="codegenerator.cs" />
98-
<Compile Include="constructorbinder.cs" />
99-
<Compile Include="constructorbinding.cs" />
100-
<Compile Include="converter.cs" />
101-
<Compile Include="CustomMarshaler.cs" />
102-
<Compile Include="debughelper.cs" />
103-
<Compile Include="delegatemanager.cs" />
104-
<Compile Include="delegateobject.cs" />
105-
<Compile Include="eventbinding.cs" />
106-
<Compile Include="eventobject.cs" />
107-
<Compile Include="exceptions.cs" />
108-
<Compile Include="extensiontype.cs" />
109-
<Compile Include="fieldobject.cs" />
110-
<Compile Include="generictype.cs" />
111-
<Compile Include="genericutil.cs" />
112-
<Compile Include="importhook.cs" />
113-
<Compile Include="indexer.cs" />
114-
<Compile Include="interfaceobject.cs" />
115-
<Compile Include="interfaces.cs" />
116-
<Compile Include="interop.cs" />
117-
<Compile Include="iterator.cs" />
118-
<Compile Include="managedtype.cs" />
119-
<Compile Include="metatype.cs" />
120-
<Compile Include="methodbinder.cs" />
121-
<Compile Include="methodbinding.cs" />
122-
<Compile Include="methodobject.cs" />
123-
<Compile Include="methodwrapper.cs" />
124-
<Compile Include="modulefunctionobject.cs" />
125-
<Compile Include="moduleobject.cs" />
126-
<Compile Include="modulepropertyobject.cs" />
127-
<Compile Include="nativecall.cs" />
128-
<Compile Include="NewReference.cs" />
129-
<Compile Include="NonCopyableAttribute.cs" />
130-
<Compile Include="overload.cs" />
131-
<Compile Include="propertyobject.cs" />
132-
<Compile Include="pyansistring.cs" />
133-
<Compile Include="pydict.cs" />
134-
<Compile Include="PyExportAttribute.cs" />
135-
<Compile Include="pyfloat.cs" />
136-
<Compile Include="pyint.cs" />
137-
<Compile Include="pyiter.cs" />
138-
<Compile Include="pylist.cs" />
139-
<Compile Include="pylong.cs" />
140-
<Compile Include="pynumber.cs" />
141-
<Compile Include="pyobject.cs" />
142-
<Compile Include="pyscope.cs" />
143-
<Compile Include="pysequence.cs" />
144-
<Compile Include="pystring.cs" />
145-
<Compile Include="pythonengine.cs" />
146-
<Compile Include="pythonexception.cs" />
147-
<Compile Include="pytuple.cs" />
148-
<Compile Include="ReferenceExtensions.cs" />
149-
<Compile Include="runtime.cs" />
150-
<Compile Include="runtime_data.cs" />
151-
<Compile Include="runtime_state.cs" />
152-
<Compile Include="typemanager.cs" />
153-
<Compile Include="typemethod.cs" />
154-
<Compile Include="typeoffset.cs" />
155-
<Compile Include="Util.cs" />
156-
<Compile Include="platform\Types.cs" />
157-
<Compile Include="platform\LibraryLoader.cs" />
158-
<Compile Include="polyfill\ReflectionPolifills.cs" />
159-
<Compile Include="platform\NativeCodePage.cs" />
160-
<Compile Include="slots\mp_length.cs" />
161-
</ItemGroup>
162-
<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
163-
<Compile Include="$(PythonInteropFile)" />
164-
</ItemGroup>
165-
<ItemGroup Condition=" '$(PythonInteropFile)' == '' ">
166-
<Compile Include="interop34.cs" />
167-
<Compile Include="interop35.cs" />
168-
<Compile Include="interop36.cs" />
169-
<Compile Include="interop37.cs" />
170-
<Compile Include="interop38.cs" />
171-
</ItemGroup>
172-
<ItemGroup>
173-
<None Include="..\pythonnet.snk" />
174-
</ItemGroup>
175-
<ItemGroup>
176-
<EmbeddedResource Include="resources\clr.py">
177-
<LogicalName>clr.py</LogicalName>
178-
</EmbeddedResource>
179-
</ItemGroup>
180-
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
181-
<PropertyGroup>
182-
<TargetAssembly>$(TargetPath)</TargetAssembly>
183-
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>
184-
</PropertyGroup>
185-
<Target Name="AfterBuild">
186-
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
187-
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
188-
</Target>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProjectGuid>{097B4AC0-74E9-4C58-BCF8-C69746EC8271}</ProjectGuid>
7+
<OutputType>Library</OutputType>
8+
<AssemblyName>Python.Runtime</AssemblyName>
9+
<RootNamespace>Python.Runtime</RootNamespace>
10+
<DocumentationFile>bin\Python.Runtime.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>7.3</LangVersion>
19+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
20+
<SignAssembly>false</SignAssembly>
21+
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
22+
</PropertyGroup>
23+
<!--We can relax binding to platform because code references no any platform dependent assemblies-->
24+
<!--This will allows to use any build of this assebly as a compile ref assebly-->
25+
<!--<PropertyGroup Condition=" '$(Platform)' == 'x86'">
26+
<PlatformTarget>x86</PlatformTarget>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
29+
<PlatformTarget>x64</PlatformTarget>
30+
</PropertyGroup>-->
31+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
32+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4</DefineConstants>
33+
<Optimize>true</Optimize>
34+
<DebugType>pdbonly</DebugType>
35+
</PropertyGroup>
36+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
37+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4</DefineConstants>
38+
<Optimize>true</Optimize>
39+
<DebugType>pdbonly</DebugType>
40+
</PropertyGroup>
41+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42+
<DebugSymbols>true</DebugSymbols>
43+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS4;TRACE;DEBUG</DefineConstants>
44+
<Optimize>false</Optimize>
45+
<DebugType>full</DebugType>
46+
</PropertyGroup>
47+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
48+
<DebugSymbols>true</DebugSymbols>
49+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS4;TRACE;DEBUG</DefineConstants>
50+
<Optimize>false</Optimize>
51+
<DebugType>full</DebugType>
52+
</PropertyGroup>
53+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
54+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2</DefineConstants>
55+
<Optimize>true</Optimize>
56+
<DebugType>pdbonly</DebugType>
57+
</PropertyGroup>
58+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
59+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2</DefineConstants>
60+
<Optimize>true</Optimize>
61+
<DebugType>pdbonly</DebugType>
62+
</PropertyGroup>
63+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
64+
<DebugSymbols>true</DebugSymbols>
65+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON2;PYTHON27;UCS2;TRACE;DEBUG</DefineConstants>
66+
<Optimize>false</Optimize>
67+
<DebugType>full</DebugType>
68+
</PropertyGroup>
69+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
70+
<DebugSymbols>true</DebugSymbols>
71+
<DefineConstants Condition="'$(DefineConstants)' == ''">PYTHON3;PYTHON38;UCS2;TRACE;DEBUG</DefineConstants>
72+
<Optimize>false</Optimize>
73+
<DebugType>full</DebugType>
74+
</PropertyGroup>
75+
<ItemGroup>
76+
<Reference Include="System" />
77+
</ItemGroup>
78+
<ItemGroup>
79+
<Compile Include="Codecs\EncoderGroup.cs" />
80+
<Compile Include="Codecs\DecoderGroup.cs" />
81+
<Compile Include="Codecs\RawProxyEncoder.cs" />
82+
<Compile Include="Codecs\TupleCodecs.cs" />
83+
<Compile Include="converterextensions.cs" />
84+
<Compile Include="finalizer.cs" />
85+
<Compile Include="Properties\AssemblyInfo.cs" />
86+
<Compile Include="..\SharedAssemblyInfo.cs">
87+
<Link>Properties\SharedAssemblyInfo.cs</Link>
88+
</Compile>
89+
<Compile Include="arrayobject.cs" />
90+
<Compile Include="assemblymanager.cs" />
91+
<Compile Include="BorrowedReference.cs" />
92+
<Compile Include="classderived.cs" />
93+
<Compile Include="classbase.cs" />
94+
<Compile Include="classmanager.cs" />
95+
<Compile Include="classobject.cs" />
96+
<Compile Include="clrobject.cs" />
97+
<Compile Include="codegenerator.cs" />
98+
<Compile Include="constructorbinder.cs" />
99+
<Compile Include="constructorbinding.cs" />
100+
<Compile Include="converter.cs" />
101+
<Compile Include="CustomMarshaler.cs" />
102+
<Compile Include="debughelper.cs" />
103+
<Compile Include="delegatemanager.cs" />
104+
<Compile Include="delegateobject.cs" />
105+
<Compile Include="eventbinding.cs" />
106+
<Compile Include="eventobject.cs" />
107+
<Compile Include="exceptions.cs" />
108+
<Compile Include="extensiontype.cs" />
109+
<Compile Include="fieldobject.cs" />
110+
<Compile Include="generictype.cs" />
111+
<Compile Include="genericutil.cs" />
112+
<Compile Include="importhook.cs" />
113+
<Compile Include="indexer.cs" />
114+
<Compile Include="interfaceobject.cs" />
115+
<Compile Include="interfaces.cs" />
116+
<Compile Include="interop.cs" />
117+
<Compile Include="iterator.cs" />
118+
<Compile Include="managedtype.cs" />
119+
<Compile Include="metatype.cs" />
120+
<Compile Include="methodbinder.cs" />
121+
<Compile Include="methodbinding.cs" />
122+
<Compile Include="methodobject.cs" />
123+
<Compile Include="methodwrapper.cs" />
124+
<Compile Include="modulefunctionobject.cs" />
125+
<Compile Include="moduleobject.cs" />
126+
<Compile Include="modulepropertyobject.cs" />
127+
<Compile Include="nativecall.cs" />
128+
<Compile Include="NewReference.cs" />
129+
<Compile Include="NonCopyableAttribute.cs" />
130+
<Compile Include="overload.cs" />
131+
<Compile Include="propertyobject.cs" />
132+
<Compile Include="pyansistring.cs" />
133+
<Compile Include="pydict.cs" />
134+
<Compile Include="PyExportAttribute.cs" />
135+
<Compile Include="pyfloat.cs" />
136+
<Compile Include="pyint.cs" />
137+
<Compile Include="pyiter.cs" />
138+
<Compile Include="pylist.cs" />
139+
<Compile Include="pylong.cs" />
140+
<Compile Include="pynumber.cs" />
141+
<Compile Include="pyobject.cs" />
142+
<Compile Include="pyscope.cs" />
143+
<Compile Include="pysequence.cs" />
144+
<Compile Include="pystring.cs" />
145+
<Compile Include="pythonengine.cs" />
146+
<Compile Include="pythonexception.cs" />
147+
<Compile Include="pytuple.cs" />
148+
<Compile Include="ReferenceExtensions.cs" />
149+
<Compile Include="runtime.cs" />
150+
<Compile Include="runtime_data.cs" />
151+
<Compile Include="runtime_state.cs" />
152+
<Compile Include="typemanager.cs" />
153+
<Compile Include="typemethod.cs" />
154+
<Compile Include="Util.cs" />
155+
<Compile Include="platform\Types.cs" />
156+
<Compile Include="platform\LibraryLoader.cs" />
157+
<Compile Include="polyfill\ReflectionPolifills.cs" />
158+
<Compile Include="platform\NativeCodePage.cs" />
159+
<Compile Include="slots\mp_length.cs" />
160+
</ItemGroup>
161+
<ItemGroup Condition=" '$(PythonInteropFile)' != '' ">
162+
<Compile Include="$(PythonInteropFile)" />
163+
</ItemGroup>
164+
<ItemGroup Condition=" '$(PythonInteropFile)' == '' ">
165+
<Compile Include="interop34.cs" />
166+
<Compile Include="interop35.cs" />
167+
<Compile Include="interop36.cs" />
168+
<Compile Include="interop37.cs" />
169+
<Compile Include="interop38.cs" />
170+
</ItemGroup>
171+
<ItemGroup>
172+
<None Include="..\pythonnet.snk" />
173+
</ItemGroup>
174+
<ItemGroup>
175+
<EmbeddedResource Include="resources\clr.py">
176+
<LogicalName>clr.py</LogicalName>
177+
</EmbeddedResource>
178+
</ItemGroup>
179+
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
180+
<PropertyGroup>
181+
<TargetAssembly>$(TargetPath)</TargetAssembly>
182+
<TargetAssemblyPdb>$(TargetDir)$(TargetName).pdb</TargetAssemblyPdb>
183+
</PropertyGroup>
184+
<Target Name="AfterBuild">
185+
<Copy SourceFiles="$(TargetAssembly)" DestinationFolder="$(PythonBuildDir)" />
186+
<!--Copy SourceFiles="$(TargetAssemblyPdb)" Condition="Exists('$(TargetAssemblyPdb)')" DestinationFolder="$(PythonBuildDir)" /-->
187+
</Target>
189188
</Project>

0 commit comments

Comments
 (0)