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
Next Next commit
Fix remaining project files
  • Loading branch information
@filmor
filmor committed Mar 18, 2019
commit 95bcf7dba6a5b715c7912431f675f1068c364729
7 changes: 0 additions & 7 deletions NuGet.config
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions pythonnet.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.3
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Runtime", "src/runtime/Python.Runtime.csproj", "{2759F4FF-716B-4828-916F-50FA86613DFC}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Runtime", "src\runtime\Python.Runtime.csproj", "{2759F4FF-716B-4828-916F-50FA86613DFC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.EmbeddingTest", "src/embed_tests/Python.EmbeddingTest.csproj", "{66B8D01A-9906-452A-B09E-BF75EA76468F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.EmbeddingTest", "src\embed_tests\Python.EmbeddingTest.csproj", "{66B8D01A-9906-452A-B09E-BF75EA76468F}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clrmodule", "src/clrmodule/clrmodule.csproj", "{E08678D4-9A52-4AD5-B63D-8EBC7399981B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClrModule", "src\clrmodule\ClrModule.csproj", "{E08678D4-9A52-4AD5-B63D-8EBC7399981B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "src/console/Console.csproj", "{CDAD305F-8E72-492C-A314-64CF58D472A0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console", "sr 10000 c\console\Console.csproj", "{CDAD305F-8E72-492C-A314-64CF58D472A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test", "src/testing/Python.Test.csproj", "{F94B547A-E97E-4500-8D53-B4D64D076E5F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Python.Test", "src\testing\Python.Test.csproj", "{F94B547A-E97E-4500-8D53-B4D64D076E5F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
23 changes: 3 additions & 20 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
VERBOSITY = "normal" # quiet, minimal, normal, detailed, diagnostic

is_64bits = sys.maxsize > 2**32
DEVTOOLS = "MsDev" if sys.platform == "win32" else "Mono"
DEVTOOLS = "MsDev15" if sys.platform == "win32" else "Mono"
ARCH = "x64" if is_64bits else "x86"
PY_MAJOR = sys.version_info[0]
PY_MINOR = sys.version_info[1]
Expand Down Expand Up @@ -125,9 +125,7 @@ def _get_long_description():

def _update_xlat_devtools():
global DEVTOOLS
if DEVTOOLS == "MsDev":
DEVTOOLS = "MsDev15"
elif DEVTOOLS == "Mono":
if DEVTOOLS == "Mono":
DEVTOOLS = "dotnet"

class BuildExtPythonnet(build_ext.build_ext):
Expand Down Expand Up @@ -215,7 +213,7 @@ def build_extension(self, ext):
_config = "{0}Win".format(CONFIG)
_custom_define_constants = True
elif DEVTOOLS == "Mono":
_xbuild = 'xbuild'
_xbuild = 'msbuild'
_config = "{0}Mono".format(CONFIG)
_custom_define_constants = False
elif DEVTOOLS == "dotnet":
Expand All @@ -237,10 +235,6 @@ def build_extension(self, ext):
'/verbosity:{}'.format(VERBOSITY),
]

manifest = self._get_manifest(dest_dir)
if manifest:
cmd.append('/p:PythonManifest="{0}"'.format(manifest))

self.debug_print("Building: {0}".format(" ".join(cmd)))
use_shell = True if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet" else False

Expand All @@ -251,17 +245,6 @@ def build_extension(self, ext):
if DEVTOOLS == "Mono" or DEVTOOLS == "dotnet":
self._build_monoclr()

def _get_manifest(self, build_dir):
if DEVTOOLS != "MsDev" and DEVTOOLS != "MsDev15":
return
mt = self._find_msbuild_tool("mt.exe", use_windows_sdk=True)
manifest = os.path.abspath(os.path.join(build_dir, "app.manifest"))
cmd = [mt, '-inputresource:"{0}"'.format(sys.executable),
'-out:"{0}"'.format(manifest)]
self.debug_print("Extracting manifest from {}".format(sys.executable))
subprocess.check_call(" ".join(cmd), shell=False)
return manifest

def _build_monoclr(self):
try:
mono_libs = _check_output("pkg-config --libs mono-2", shell=True)
Expand Down
2 changes: 1 addition & 1 deletion src/console/Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
<ProjectReference Include="..\runtime\Python.Runtime.csproj" />
</ItemGroup>

<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
Expand Down
2 changes: 1 addition & 1 deletion src/embed_tests/Python.EmbeddingTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
<ProjectReference Include="..\runtime\Python.Runtime.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net40'">
Expand Down
2 changes: 1 addition & 1 deletion src/testing/Python.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\runtime\Python.Runtime.15.csproj" />
<ProjectReference Include="..\runtime\Python.Runtime.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
Expand Down
0