8000 Drop old (v14) project and solution files by filmor · Pull Request #830 · pythonnet/pythonnet · GitHub
[go: up one dir, main page]
Skip to content

Drop old (v14) project and solution files #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Drop old (v14) project and solution files #830

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df0d0ef
Drop old (v14) project and solution files
filmor Mar 13, 2019
3424eb5
Fix pythonnet.sln reference
filmor Mar 13, 2019
95bcf7d
Fix remaining project files
filmor Mar 18, 2019
c2e39d0
Readd NuGet.config
filmor Mar 19, 2019
7eadceb
Rework msbuild finding logic
filmor Mar 19, 2019
f6c54ea
Merge branch 'master' into drop-old-project-files
filmor Mar 19, 2019
14e2d2a
Remove explicit restore step, install msbuild on Linux
filmor Mar 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove explicit restore step, install msbuild on Linux
  • Loading branch information
@filmor
filmor committed Mar 23, 2019
commit 14e2d2a6536162082902b09ba32b531ebf32aaf7
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ matrix:
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
packages:
- mono-devel
- msbuild
- ca-certificates-mono
- dotnet-hostfxr-2.0.0
- dotnet-runtime-2.0.0
Expand All @@ -44,6 +45,7 @@ matrix:
key_url: http://keyserver.ubuntu.com/pks/lookup?op=get&search=0xA6A19B38D3D831EF
packages:
- mono-devel
- msbuild
- ca-certificates-mono
- dotnet-hostfxr-2.0.0
- dotnet-runtime-2.0.0
Expand Down
19 changes: 0 additions & 19 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ def build_extension(self, ext):
if ext.name != "clr":
return build_ext.build_ext.build_extension(self, ext)

# install packages using nuget
self._install_packages()

dest_file = self.get_ext_fullpath(ext.name)
dest_dir = os.path.dirname(dest_file)
if not os.path.exists(dest_dir):
Expand Down Expand Up @@ -231,22 +228,6 @@ def _build_monoclr(self):

build_ext.build_ext.build_extension(self, clr_ext)

def _install_packages(self):
"""install packages using nuget"""
use_shell = DEVTOOLS == "Mono" or DEVTOOLS == "dotnet"

if DEVTOOLS == "MsDev":
_config = "{0}Win".format(CONFIG)
else:
_config = "{0}Mono".format(CONFIG)

cmd = "dotnet msbuild /t:Restore pythonnet.sln /p:Configuration={0} /p:Platform={1}".format(
_config, ARCH
)

self.debug_print("Updating packages with xplat: {0}".format(cmd))
subprocess.check_call(cmd, shell=use_shell)

def _find_msbuild_tool(self):
"""Return full path to one of the Microsoft build tools"""

Expand Down
0