From b0623e0771e2c82218456b0e410d89b7aa0e94b9 Mon Sep 17 00:00:00 2001 From: mjkkirschner Date: Tue, 5 Dec 2023 20:08:35 -0500 Subject: [PATCH] works for net6, still need to test net8 --- Config/shared.props | 7 +++ DSIronPython/DSIronPython.csproj | 57 ++++++++++++------- DSIronPython/pkg.json | 6 +- .../IronPythonExtension.csproj | 6 +- ...ronPythonExtension_ExtensionDefinition.xml | 2 +- IronPythonTests/IronPythonTests.csproj | 3 + README.md | 6 +- 7 files changed, 62 insertions(+), 25 deletions(-) create mode 100644 Config/shared.props diff --git a/Config/shared.props b/Config/shared.props new file mode 100644 index 0000000..f6ce855 --- /dev/null +++ b/Config/shared.props @@ -0,0 +1,7 @@ + + + + false + false + + \ No newline at end of file diff --git a/DSIronPython/DSIronPython.csproj b/DSIronPython/DSIronPython.csproj index b68a490..d2cb92a 100644 --- a/DSIronPython/DSIronPython.csproj +++ b/DSIronPython/DSIronPython.csproj @@ -1,28 +1,47 @@  - - {9EEF4F42-6B3B-4358-9A8A-C2701539A822} - Library - Properties - DSIronPython - DSIronPython - net6.0 - - - - - + + + + + $(SolutionDir)\package_output\DSIronPython\bin\ + {9EEF4F42-6B3B-4358-9A8A-C2701539A822} + Library + Properties + DSIronPython + DSIronPython + net6.0 + true + + + + + runtime + all + + + - + <_Parameter1>IronPythonTests - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DSIronPython/pkg.json b/DSIronPython/pkg.json index 3afee31..8ade97b 100644 --- a/DSIronPython/pkg.json +++ b/DSIronPython/pkg.json @@ -2,16 +2,16 @@ "license": "", "file_hash": null, "name": "DynamoIronPython2.7", - "version": "2.5.0", + "version": "3.0.0", "description": "*** This is the official version of the IronPython Extension which will load the IronPython2 evaluation engine for Dynamo. *** \r\n\r\nIf you see the following warning 'The configured Python engine could not be found' when you try to run a Python Script node which is set to use IronPython2, the host application for Dynamo (Such as Revit or Civil 3d) will have chosen to exclude IronPython2 as default installed content and you will need to download this extension in order to enable IronPython2 again.\r\n\r\nYou have the ability to either download this IronPython2 Extension or use the alternative out-of-the-box CPython3 engine and migrate your legacy IronPython2 code to CPython3. While there are differences in language the Python basis is the same and we have provided a Migration Assistant to help you migrate your code to Python3.", "group": "", "keywords": [ "python", "ironpython" ], "dependencies": [], "host_dependencies": [ "Revit", "Civil 3D", "Alias", "Advance Steel", "FormIt" ], "contents": "", - "engine_version": "2.13.0", + "engine_version": "3.0.0", "engine": "dynamo", - "engine_metadata": "This pacakge is compatible with Dynamo2.13.0 release or newer", + "engine_metadata": "Version 3.0 of this pacakge is compatible with Dynamo 3.0.0 release or newer", "site_url": "https://dynamobim.org/", "repository_url": "https://github.com/DynamoDS/Dynamo", "contains_binaries": true, diff --git a/IronPythonExtension/IronPythonExtension.csproj b/IronPythonExtension/IronPythonExtension.csproj index d654d98..f03e34e 100644 --- a/IronPythonExtension/IronPythonExtension.csproj +++ b/IronPythonExtension/IronPythonExtension.csproj @@ -1,5 +1,9 @@  + + + + $(SolutionDir)\package_output\DSIronPython\bin\ {182FCA4E-B6EF-451F-9EC4-7BF2C622F4F7} Library Properties @@ -17,6 +21,6 @@ - + \ No newline at end of file diff --git a/IronPythonExtension/IronPythonExtension_ExtensionDefinition.xml b/IronPythonExtension/IronPythonExtension_ExtensionDefinition.xml index e2eb061..a149d07 100644 --- a/IronPythonExtension/IronPythonExtension_ExtensionDefinition.xml +++ b/IronPythonExtension/IronPythonExtension_ExtensionDefinition.xml @@ -1,4 +1,4 @@ - ..\IronPythonExtension.dll + ..\bin\IronPythonExtension.dll IronPythonExtension.IronPythonExtension \ No newline at end of file diff --git a/IronPythonTests/IronPythonTests.csproj b/IronPythonTests/IronPythonTests.csproj index bd30f9b..a53615a 100644 --- a/IronPythonTests/IronPythonTests.csproj +++ b/IronPythonTests/IronPythonTests.csproj @@ -1,4 +1,7 @@  + + + 8.0.30703 2.0 diff --git a/README.md b/README.md index c9869c8..3d69c4a 100644 --- a/README.md +++ b/README.md @@ -1 +1,5 @@ -# DSIronPython \ No newline at end of file +# DSIronPython + +Contains the DSIronPython package for using the legacy IronPython2 engine in Dynamo. +Building this soluton will produce a dynamo package containing the python engine and an extension to load it. +This repo is a WIP. \ No newline at end of file