8000 backout #546, wrong merge! · pythonnet/pythonnet@700b522 · GitHub
[go: up one dir, main page]
Skip to content

Commit 700b522

Browse files
author
dse
committed
backout #546, wrong merge!
1 parent 75e5231 commit 700b522

File tree

9 files changed

+222
-120
lines changed

9 files changed

+222
-120
lines changed

‎.travis.yml

Lines changed: 106 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ language: python
44

55
matrix:
66
include:
7-
# --------------------- XPLAT builds ------------------------
87
- python: 2.7
9-
env: &xplat-env
8+
env:
109
- BUILD_OPTS=--xplat
1110
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
12-
addons: &xplat-addons
11+
addons:
1312
apt:
1413
sources:
1514
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
1615
key_url: https://packages.microsoft.com/keys/microsoft.asc
17-
- sourceline: deb http://download.mono-project.com/repo/debian trusty/snapshots/5.2.0.224 main
16+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
1817
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
1918
packages:
2019
- mono-devel
@@ -23,52 +22,124 @@ matrix:
2322
- dotnet-runtime-2.0.0
2423
- dotnet-sdk-2.0.0
2524
- python: 3.3
26-
env: *xplat-env
27-
addons: *xplat-addons
28-
25+
env:
26+
- BUILD_OPTS=--xplat
27+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
28+
addons:
29+
apt:
30+
sources:
31+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
32+
key_url: https://packages.microsoft.com/keys/microsoft.asc
33+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
34+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
35+
packages:
36+
- mono-devel
37+
- ca-certificates-mono
38+
- dotnet-hostfxr-2.0.0
39+
- dotnet-runtime-2.0.0
40+
- dotnet-sdk-2.0.0
2941
- python: 3.4
30-
env: *xplat-env
31-
addons: *xplat-addons
32-
42+
env:
43+
- BUILD_OPTS=--xplat
A93C
44+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
45+
addons:
46+
apt:
47+
sources:
48+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
49+
key_url: https://packages.microsoft.com/keys/microsoft.asc
50+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
51+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
52+
packages:
53+
- mono-devel
54+
- ca-certificates-mono
55+
- dotnet-hostfxr-2.0.0
56+
- dotnet-runtime-2.0.0
57+
- dotnet-sdk-2.0.0
3358
- python: 3.5
34-
env: *xplat-env
35-
addons: *xplat-addons
36-
59+
env:
60+
- BUILD_OPTS=--xplat
61+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
62+
addons:
63+
apt:
64+
sources:
65+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
66+
key_url: https://packages.microsoft.com/keys/microsoft.asc
67+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
68+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
69+
packages:
70+
- mono-devel
71+
- ca-certificates-mono
72+
- dotnet-hostfxr-2.0.0
73+
- dotnet-runtime-2.0.0
74+
- dotnet-sdk-2.0.0
3775
- python: 3.6
38-
env: *xplat-env
39-
addons: *xplat-addons
76+
env:
77+
- BUILD_OPTS=--xplat
78+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
79+
addons:
80+
apt:
81+
sources:
82+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
83+
key_url: https://packages.microsoft.com/keys/microsoft.asc
84+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
85+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
86+
packages:
87+
- mono-devel
88+
- ca-certificates-mono
89+
- dotnet-hostfxr-2.0.0
90+
- dotnet-runtime-2.0.0
91+
- dotnet-sdk-2.0.0
4092
- python: "3.7-dev"
41-
env: *xplat-env
42-
addons: *xplat-addons
93+
env:
94+
- BUILD_OPTS=--xplat
95+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
96+
addons:
97+
apt:
98+
sources:
99+
- sourceline: deb [arch=amd64] https://packages.microsoft.com/repos/microsoft-ubuntu-trusty-prod trusty main
100+
key_url: https://packages.microsoft.com/keys/microsoft.asc
101+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
102+
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
103+
packages:
104+
- mono-devel
105+
- ca-certificates-mono
106+
- dotnet-hostfxr-2.0.0
107+
- dotnet-runtime-2.0.0
108+
- dotnet-sdk-2.0.0
43109

44-
# --------------------- Classic builds ------------------------
45110
- python: 2.7
46-
env: &classic-env
111+
env:
47112
- BUILD_OPTS=
48113
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
49-
50114
- python: 3.3
51-
env: *classic-env
52-
115+
env:
116+
- BUILD_OPTS=
117+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
53118
- python: 3.4
54-
env: *classic-env
55-
119+
env:
120+
- BUILD_OPTS=
121+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
56122
- python: 3.5
57-
env: *classic-env
58-
123+
env:
124+
- BUILD_OPTS=
125+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
59126
- python: 3.6
60-
env: *classic-env
61-
127+
env:
128+
- BUILD_OPTS=
129+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
62130
- python: "3.7-dev"
63-
env: *classic-env
64-
131+
env:
132+
- BUILD_OPTS=
133+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
65134
allow_failures:
66135
- python: "3.7-dev"
67-
env: *xplat-env
68-
136+
env:
137+
- BUILD_OPTS=
138+
- NUNIT_PATH=./packages/NUnit.*/tools/nunit3-console.exe
69139
- python: "3.7-dev"
70-
env: *classic-env
71-
140+
env:
141+
- BUILD_OPTS=--xplat
142+
- NUNIT_PATH=~/.nuget/packages/nunit.consolerunner/3.*/tools/nunit3-console.exe
72143
env:
73144
global:
74145
- LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
@@ -79,7 +150,7 @@ env:
79150
addons:
80151
apt:
81152
sources:
82-
- sourceline: deb http://download.mono-project.com/repo/debian trusty/snapshots/5.2.0.224 main
153+
- sourceline: deb http://download.mono-project.com/repo/ubuntu trusty main
83154
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
84155
packages:
85156
- mono-devel

‎appveyor.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ init:
4242

4343
install:
4444
- pip install --upgrade -r requirements.txt --quiet
45+
- choco install vswhere -y
46+
- cmd: curl -O https://download.microsoft.com/download/5/6/B/56BFEF92-9045-4414-970C-AB31E0FC07EC/dotnet-runtime-2.0.0-win-x86.exe
47+
- cmd: dotnet-runtime-2.0.0-win-x86.exe /install /quiet /norestart /log install.log
4548

4649
# Install OpenCover. Can't put on `packages.config`, not Mono compatible
4750
- .\tools\nuget\nuget.exe install OpenCover -OutputDirectory packages -Verbosity quiet

‎setup.py

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@
4040
kits_suffix = os.path.join("bin", ARCH)
4141

4242
WIN_SDK_KEYS = (
43-
RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
44-
value_name="KitsRoot10", suffix=os.path.join("bin", "10.0.16299.0", ARCH)),
45-
46-
RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
47-
value_name="KitsRoot10", suffix=os.path.join("bin", "10.0.15063.0", ARCH)),
48-
4943
RegKey(sdk_name="Windows Kit 10.0", key=kits_root,
5044
value_name="KitsRoot10", suffix=kits_suffix),
5145

@@ -330,20 +324,6 @@ def _install_packages(self):
330324

331325
def _find_msbuild_tool(self, tool="msbuild.exe", use_windows_sdk=False):
332326
"""Return full path to one of the Microsoft build tools"""
333-
334-
# trying to search path with help of vswhere when MSBuild 15.0 and higher installed.
335-
if tool=="msbuild.exe" and use_windows_sdk==False:
336-
try:
337-
basePathes = subprocess.check_output(
338-
["tools\\vswhere\\vswhere.exe", "-latest",
339-
"-version", "[15.0, 16.0)",
340-
"-requires", "Microsoft.Component.MSBuild",
341-
"-property", "InstallationPath"]).splitlines()
342-
if len(basePathes):
343-
return os.path.join(basePathes[0].decode(sys.stdout.encoding or "utf-8"), "MSBuild", "15.0", "Bin", "MSBuild.exe")
344-
except:
345-
pass # keep trying to search by old method.
346-
347327
# Search in PATH first
348328
path = spawn.find_executable(tool)
349329
if path:
@@ -390,7 +370,7 @@ def _find_msbuild_tool_15(self):
390370
"""Return full path to one of the Microsoft build tools"""
391371
try:
392372
basePathes = subprocess.check_output(
393-
["tools\\vswhere\\vswhere.exe", "-latest",
373+
["vswhere", "-latest",
394374
"-version", "[15.0, 16.0)",
395375
"-requires", "Microsoft.Component.MSBuild",
396376
"-property", "InstallationPath"]).splitlines()

‎src/clrmodule/clrmodule.15.csproj

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,38 +38,45 @@
3838
<PlatformTarget>x64</PlatformTarget>
3939
</PropertyGroup>
4040

41-
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
42-
<Optimize>false</Optimize>
43-
<DebugType>full</DebugType>
44-
</PropertyGroup>
45-
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
46-
<Optimize>true</Optimize>
47-
<DebugType>pdbonly</DebugType>
48-
</PropertyGroup>
49-
5041
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42+
<DebugSymbols>true</DebugSymbols>
5143
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
44+
<DebugType>full</DebugType>
5245
</PropertyGroup>
5346
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
5447
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
48+
<Optimize>true</Optimize>
49+
<DebugType>pdbonly</DebugType>
5550
</PropertyGroup>
5651
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
52+
<DebugSymbols>true</DebugSymbols>
5753
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2;TRACE;DEBUG</DefineConstants>
54+
<DebugType>full</DebugType>
5855
</PropertyGroup>
5956
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
6057
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON2</DefineConstants>
58+
<Optimize>true</Optimize>
59+
<DebugType>pdbonly</DebugType>
6160
</PropertyGroup>
6261
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
62+
<DebugSymbols>true</DebugSymbols>
6363
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
64+
<DebugType>full</DebugType>
6465
</PropertyGroup>
6566
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
6667
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
68+
<Optimize>true</Optimize>
69+
<DebugType>pdbonly</DebugType>
6770
</PropertyGroup>
6871
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72+
<DebugSymbols>true</DebugSymbols>
6973
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3;TRACE;DEBUG</DefineConstants>
74+
<DebugType>full</DebugType>
7075
</PropertyGroup>
7176
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
7277
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);PYTHON3</DefineConstants>
78+
<Optimize>true</Optimize>
79+
<DebugType>pdbonly</DebugType>
7380
</PropertyGroup>
7481

7582
<ItemGroup>

‎src/console/Console.15.csproj

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,46 @@
3838
<PropertyGroup Condition=" '$(Platform)' == 'x64'">
3939
<PlatformTarget>x64</PlatformTarget>
4040
</PropertyGroup>
41-
42-
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='net40'">
43-
<Optimize>false</Optimize>
41+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMono'">
42+
<DebugSymbols>true</DebugSymbols>
43+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
4444
<DebugType>full</DebugType>
4545
</PropertyGroup>
46-
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='net40'">
46+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMono'">
47+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
4748
<Optimize>true</Optimize>
4849
<DebugType>pdbonly</DebugType>
4950
</PropertyGroup>
50-
<PropertyGroup Condition="$(Configuration.Contains('Debug')) AND '$(TargetFramework)'=='netstandard2.0'">
51+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWin'">
5152
<DebugSymbols>true</DebugSymbols>
52-
<Optimize>false</Optimize>
53+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
5354
<DebugType>full</DebugType>
5455
</PropertyGroup>
55-
<PropertyGroup Condition="$(Configuration.Contains('Release')) AND '$(TargetFramework)'=='netstandard2.0'">
56+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWin'">
57+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
58+
<Optimize>true</Optimize>
59+
<DebugType>pdbonly</DebugType>
60+
</PropertyGroup>
61+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugMonoPY3'">
5662
<DebugSymbols>true</DebugSymbols>
63+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
64+
<DebugType>full</DebugType>
65+
</PropertyGroup>
66+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseMonoPY3'">
67+
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
5768
<Optimize>true</Optimize>
58-
<DebugType>portable</DebugType>
69+
<DebugType>pdbonly</DebugType>
5970
</PropertyGroup>
60-
61-
<PropertyGroup Condition="$(Configuration.Contains('Debug'))">
71+
<PropertyGroup Condition=" '$(Configuration)' == 'DebugWinPY3'">
72+
<DebugSymbols>true</DebugSymbols>
6273
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants);DEBUG;TRACE</DefineConstants>
74+
<DebugType>full</DebugType>
6375
</PropertyGroup>
64-
<PropertyGroup Condition="$(Configuration.Contains('Release'))">
76+
<PropertyGroup Condition=" '$(Configuration)' == 'ReleaseWinPY3'">
6577
<DefineConstants Condition="'$(CustomDefineConstants)' == ''">$(DefineConstants)</DefineConstants>
78+
<Optimize>true</Optimize>
79+
<DebugType>pdbonly</DebugType>
6680
</PropertyGroup>
67-
6881
<PropertyGroup Condition="'$(PythonManifest)' != ''">
6982
<ApplicationManifest>$(PythonManifest)</ApplicationManifest>
7083
</PropertyGroup>

0 commit comments

Comments
 (0)
0