Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-29 15:42:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

.NET: Change NETCore.App version detection to use highest match

Browse Source 
`libnethost.a` detection failed on my Linux system (Mageia 9, using Fedora 36
dotnet repos), because it used the first match which isn't the one matching
the rest of the SDK:
```
$ dotnet --list-runtimes
Microsoft.AspNetCore.App 3.1.28 [/usr/share/dotnet/shared/Microsoft.AspNetCore.App]
Microsoft.AspNetCore.App 6.0.8 [/usr/share/dotnet/shared/Microsoft.AspNetCore.App]
Microsoft.NETCore.App 3.1.28 [/usr/share/dotnet/shared/Microsoft.NETCore.App]
Microsoft.NETCore.App 6.0.5 [/usr/share/dotnet/shared/Microsoft.NETCore.App]
Microsoft.NETCore.App 6.0.8 [/usr/share/dotnet/shared/Microsoft.NETCore.App]
```

No idea why I still have 6.0.5 installed but it should pick the highest I guess.
This commit is contained in:
Rémi Verschelde 2022-08-26 13:18:52 +02:00
parent dc4193b478
commit 3d43ffdb5b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/build_scripts/mono_configure.py
View File

@ -153,6 +153,7 @@ def find_app_host_version(dotnet_cmd, search_version_str):
from distutils.version import LooseVersion from distutils.version import LooseVersion
search_version = LooseVersion(search_version_str) search_version = LooseVersion(search_version_str)
found_match = False
try: try:
env = dict(os.environ, DOTNET_CLI_UI_LANGUAGE="en-US") env = dict(os.environ, DOTNET_CLI_UI_LANGUAGE="en-US")
@ -172,7 +173,10 @@ def find_app_host_version(dotnet_cmd, search_version_str):
version = LooseVersion(version_str) version = LooseVersion(version_str)
if version >= search_version: if version >= search_version:
return version_str search_version = version
found_match = True
if found_match:
return str(search_version)
except (subprocess.CalledProcessError, OSError) as e: except (subprocess.CalledProcessError, OSError) as e:
import sys import sys