From f8cd3cd4c369cec10bbb4d04441372acd8f6d052 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 15 Mar 2025 12:26:01 +0000 Subject: [PATCH 1/9] Initial SDK project creation --- IronPython.sln | 6 ++++++ src/sdk/IronPython.Sdk/IronPython.Sdk.csproj | 7 +++++++ 2 files changed, 13 insertions(+) create mode 100644 src/sdk/IronPython.Sdk/IronPython.Sdk.csproj diff --git a/IronPython.sln b/IronPython.sln index 6a760c366..eb60ef3fb 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -105,6 +105,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\executables\IronPython.Window32\IronPython.Window32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.Sdk", "src\sdk\IronPython.Sdk\IronPython.Sdk.csproj", "{726D85B8-E98E-4F31-A081-B02035809A33}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -171,6 +173,10 @@ Global {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.Build.0 = Debug|Any CPU {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.ActiveCfg = Release|Any CPU {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Release|Any CPU.Build.0 = Release|Any CPU + {726D85B8-E98E-4F31-A081-B02035809A33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {726D85B8-E98E-4F31-A081-B02035809A33}.Debug|Any CPU.Build.0 = Debug|Any CPU + {726D85B8-E98E-4F31-A081-B02035809A33}.Release|Any CPU.ActiveCfg = Release|Any CPU + {726D85B8-E98E-4F31-A081-B02035809A33}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj b/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj new file mode 100644 index 000000000..64b7b724d --- /dev/null +++ b/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj @@ -0,0 +1,7 @@ + + + net472;netstandard2.0 + MSBuildSdk + true + + \ No newline at end of file From 683b176059d5659a119c084ff8bac1e64380c794 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 15 Mar 2025 12:55:04 +0000 Subject: [PATCH 2/9] Added example project --- IronPython.sln | 4 +++ src/sdk/Directory.Build.props | 2 ++ .../IronPython.Sdk.Sample.py | 1 + .../IronPython.Sdk.Sample.pyproj | 9 ++++++ src/sdk/IronPython.Sdk.Sample/Program.py | 1 + src/sdk/IronPython.Sdk/IronPython.Sdk.csproj | 5 +++- src/sdk/IronPython.Sdk/Sdk/Debugging.props | 13 ++++++++ src/sdk/IronPython.Sdk/Sdk/Sdk.props | 30 +++++++++++++++++++ 8 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/sdk/Directory.Build.props create mode 100644 src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py create mode 100644 src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj create mode 100644 src/sdk/IronPython.Sdk.Sample/Program.py create mode 100644 src/sdk/IronPython.Sdk/Sdk/Debugging.props create mode 100644 src/sdk/IronPython.Sdk/Sdk/Sdk.props diff --git a/IronPython.sln b/IronPython.sln index eb60ef3fb..6bc844171 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -107,6 +107,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.Sdk", "src\sdk\IronPython.Sdk\IronPython.Sdk.csproj", "{726D85B8-E98E-4F31-A081-B02035809A33}" EndProject +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "IronPython.Sdk.Sample", "src\sdk\IronPython.Sdk.Sample\IronPython.Sdk.Sample.pyproj", "{C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -177,6 +179,8 @@ Global {726D85B8-E98E-4F31-A081-B02035809A33}.Debug|Any CPU.Build.0 = Debug|Any CPU {726D85B8-E98E-4F31-A081-B02035809A33}.Release|Any CPU.ActiveCfg = Release|Any CPU {726D85B8-E98E-4F31-A081-B02035809A33}.Release|Any CPU.Build.0 = Release|Any CPU + {C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/sdk/Directory.Build.props b/src/sdk/Directory.Build.props new file mode 100644 index 000000000..c1df2220d --- /dev/null +++ b/src/sdk/Directory.Build.props @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py @@ -0,0 +1 @@ + diff --git a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj new file mode 100644 index 000000000..3e4e99598 --- /dev/null +++ b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj @@ -0,0 +1,9 @@ + + + Global|IronPython|3.4 + + + + + + diff --git a/src/sdk/IronPython.Sdk.Sample/Program.py b/src/sdk/IronPython.Sdk.Sample/Program.py new file mode 100644 index 000000000..7df869a15 --- /dev/null +++ b/src/sdk/IronPython.Sdk.Sample/Program.py @@ -0,0 +1 @@ +print("Hello, World!") diff --git a/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj b/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj index 64b7b724d..bb25ec737 100644 --- a/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj +++ b/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj @@ -1,7 +1,10 @@ - + net472;netstandard2.0 MSBuildSdk true + + true + \ No newline at end of file diff --git a/src/sdk/IronPython.Sdk/Sdk/Debugging.props b/src/sdk/IronPython.Sdk/Sdk/Debugging.props new file mode 100644 index 000000000..bcf8fd92d --- /dev/null +++ b/src/sdk/IronPython.Sdk/Sdk/Debugging.props @@ -0,0 +1,13 @@ + + + Debug + + + true + false + + + true + false + + diff --git a/src/sdk/IronPython.Sdk/Sdk/Sdk.props b/src/sdk/IronPython.Sdk/Sdk/Sdk.props new file mode 100644 index 000000000..38ab6075e --- /dev/null +++ b/src/sdk/IronPython.Sdk/Sdk/Sdk.props @@ -0,0 +1,30 @@ + + + + 2.0 + c1e9ed5c-242e-4f90-8e69-7fdde3c919bd + . + Program.py + + + . + . + $(MSBuildProjectName) + $(Name) + + + + + + + + + + + + + + + From eb88a7ebca8dae6acd6da4e2ad2095f42e7c8418 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Sat, 15 Mar 2025 17:11:58 +0000 Subject: [PATCH 3/9] Split files [skip ci] --- .../IronPython.Sdk.Sample.pyproj | 3 ++- src/sdk/IronPython.Sdk/Sdk/FileIncludes.props | 13 +++++++++ src/sdk/IronPython.Sdk/Sdk/PythonEngine.props | 11 ++++++++ src/sdk/IronPython.Sdk/Sdk/PythonTools.props | 11 ++++++++ src/sdk/IronPython.Sdk/Sdk/Sdk.props | 27 +++++-------------- 5 files changed, 44 insertions(+), 21 deletions(-) create mode 100644 src/sdk/IronPython.Sdk/Sdk/FileIncludes.props create mode 100644 src/sdk/IronPython.Sdk/Sdk/PythonEngine.props create mode 100644 src/sdk/IronPython.Sdk/Sdk/PythonTools.props diff --git a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj index 3e4e99598..95aad839a 100644 --- a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj +++ b/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj @@ -1,6 +1,7 @@ - Global|IronPython|3.4 + IronPython + 3.4 diff --git a/src/sdk/IronPython.Sdk/Sdk/FileIncludes.props b/src/sdk/IronPython.Sdk/Sdk/FileIncludes.props new file mode 100644 index 000000000..1963861ed --- /dev/null +++ b/src/sdk/IronPython.Sdk/Sdk/FileIncludes.props @@ -0,0 +1,13 @@ + + + main.py + + + + + + + diff --git a/src/sdk/IronPython.Sdk/Sdk/PythonEngine.props b/src/sdk/IronPython.Sdk/Sdk/PythonEngine.props new file mode 100644 index 000000000..0ca7eff5b --- /dev/null +++ b/src/sdk/IronPython.Sdk/Sdk/PythonEngine.props @@ -0,0 +1,11 @@ + + + . + + + . + . + $(MSBuildProjectName) + $(Name) + + diff --git a/src/sdk/IronPython.Sdk/Sdk/PythonTools.props b/src/sdk/IronPython.Sdk/Sdk/PythonTools.props new file mode 100644 index 000000000..62d6ce3ac --- /dev/null +++ b/src/sdk/IronPython.Sdk/Sdk/PythonTools.props @@ -0,0 +1,11 @@ + + + + + + + + + diff --git a/src/sdk/IronPython.Sdk/Sdk/Sdk.props b/src/sdk/IronPython.Sdk/Sdk/Sdk.props index 38ab6075e..7f387888c 100644 --- a/src/sdk/IronPython.Sdk/Sdk/Sdk.props +++ b/src/sdk/IronPython.Sdk/Sdk/Sdk.props @@ -1,30 +1,17 @@ + + + + + Global|$(PythonInterpreter)|$(PythonVersion) + 2.0 c1e9ed5c-242e-4f90-8e69-7fdde3c919bd - . - Program.py - - - . - . - $(MSBuildProjectName) - $(Name) - - - + - - - - - - - From f59b24c1aaa196a05ffeb05f07e8fdbbb4fd8cf0 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Fri, 28 Mar 2025 07:53:18 +0000 Subject: [PATCH 4/9] Rename `sdk` to `tooling` --- src/sdk/Directory.Build.props | 2 -- src/{roslyn => tooling}/Directory.Build.props | 0 .../IronPython.Analyzer/IronPython.Analyzer.csproj | 0 .../IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs | 0 .../IronPython.Sdk.Sample/IronPython.Sdk.Sample.py | 0 .../IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj | 3 ++- src/{sdk => tooling}/IronPython.Sdk.Sample/Program.py | 0 src/{sdk => tooling}/IronPython.Sdk/IronPython.Sdk.csproj | 0 src/{sdk => tooling}/IronPython.Sdk/Sdk/Debugging.props | 0 src/{sdk => tooling}/IronPython.Sdk/Sdk/FileIncludes.props | 0 src/{sdk => tooling}/IronPython.Sdk/Sdk/PythonEngine.props | 0 src/{sdk => tooling}/IronPython.Sdk/Sdk/PythonTools.props | 0 src/{sdk => tooling}/IronPython.Sdk/Sdk/Sdk.props | 0 13 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 src/sdk/Directory.Build.props rename src/{roslyn => tooling}/Directory.Build.props (100%) rename src/{roslyn => tooling}/IronPython.Analyzer/IronPython.Analyzer.csproj (100%) rename src/{roslyn => tooling}/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs (100%) rename src/{sdk => tooling}/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py (100%) rename src/{sdk => tooling}/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj (80%) rename src/{sdk => tooling}/IronPython.Sdk.Sample/Program.py (100%) rename src/{sdk => tooling}/IronPython.Sdk/IronPython.Sdk.csproj (100%) rename src/{sdk => tooling}/IronPython.Sdk/Sdk/Debugging.props (100%) rename src/{sdk => tooling}/IronPython.Sdk/Sdk/FileIncludes.props (100%) rename src/{sdk => tooling}/IronPython.Sdk/Sdk/PythonEngine.props (100%) rename src/{sdk => tooling}/IronPython.Sdk/Sdk/PythonTools.props (100%) rename src/{sdk => tooling}/IronPython.Sdk/Sdk/Sdk.props (100%) diff --git a/src/sdk/Directory.Build.props b/src/sdk/Directory.Build.props deleted file mode 100644 index c1df2220d..000000000 --- a/src/sdk/Directory.Build.props +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/src/roslyn/Directory.Build.props b/src/tooling/Directory.Build.props similarity index 100% rename from src/roslyn/Directory.Build.props rename to src/tooling/Directory.Build.props diff --git a/src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj b/src/tooling/IronPython.Analyzer/IronPython.Analyzer.csproj similarity index 100% rename from src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj rename to src/tooling/IronPython.Analyzer/IronPython.Analyzer.csproj diff --git a/src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs b/src/tooling/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs similarity index 100% rename from src/roslyn/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs rename to src/tooling/IronPython.Analyzer/IronPythonDiagnosticAnalyzer.cs diff --git a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py b/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py similarity index 100% rename from src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py rename to src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py diff --git a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj b/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj similarity index 80% rename from src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj rename to src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj index 95aad839a..a2ab6d9ad 100644 --- a/src/sdk/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj +++ b/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj @@ -2,9 +2,10 @@ IronPython 3.4 + Global|IronPython|3.4 - + \ No newline at end of file diff --git a/src/sdk/IronPython.Sdk.Sample/Program.py b/src/tooling/IronPython.Sdk.Sample/Program.py similarity index 100% rename from src/sdk/IronPython.Sdk.Sample/Program.py rename to src/tooling/IronPython.Sdk.Sample/Program.py diff --git a/src/sdk/IronPython.Sdk/IronPython.Sdk.csproj b/src/tooling/IronPython.Sdk/IronPython.Sdk.csproj similarity index 100% rename from src/sdk/IronPython.Sdk/IronPython.Sdk.csproj rename to src/tooling/IronPython.Sdk/IronPython.Sdk.csproj diff --git a/src/sdk/IronPython.Sdk/Sdk/Debugging.props b/src/tooling/IronPython.Sdk/Sdk/Debugging.props similarity index 100% rename from src/sdk/IronPython.Sdk/Sdk/Debugging.props rename to src/tooling/IronPython.Sdk/Sdk/Debugging.props diff --git a/src/sdk/IronPython.Sdk/Sdk/FileIncludes.props b/src/tooling/IronPython.Sdk/Sdk/FileIncludes.props similarity index 100% rename from src/sdk/IronPython.Sdk/Sdk/FileIncludes.props rename to src/tooling/IronPython.Sdk/Sdk/FileIncludes.props diff --git a/src/sdk/IronPython.Sdk/Sdk/PythonEngine.props b/src/tooling/IronPython.Sdk/Sdk/PythonEngine.props similarity index 100% rename from src/sdk/IronPython.Sdk/Sdk/PythonEngine.props rename to src/tooling/IronPython.Sdk/Sdk/PythonEngine.props diff --git a/src/sdk/IronPython.Sdk/Sdk/PythonTools.props b/src/tooling/IronPython.Sdk/Sdk/PythonTools.props similarity index 100% rename from src/sdk/IronPython.Sdk/Sdk/PythonTools.props rename to src/tooling/IronPython.Sdk/Sdk/PythonTools.props diff --git a/src/sdk/IronPython.Sdk/Sdk/Sdk.props b/src/tooling/IronPython.Sdk/Sdk/Sdk.props similarity index 100% rename from src/sdk/IronPython.Sdk/Sdk/Sdk.props rename to src/tooling/IronPython.Sdk/Sdk/Sdk.props From f39eb3557b7ce10ed5c85c59c42ebab3fa08f530 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Fri, 28 Mar 2025 07:54:46 +0000 Subject: [PATCH 5/9] Fix solution --- IronPython.sln | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IronPython.sln b/IronPython.sln index 6bc844171..5f98b22b5 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -70,7 +70,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console32", "src\executables\IronPython.Console32\IronPython.Console32.csproj", "{AD21022F-E7C1-4B74-97C1-0A0E48EFF992}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Analyzer", "src\roslyn\IronPython.Analyzer\IronPython.Analyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Analyzer", "src\tooling\IronPython.Analyzer\IronPython.Analyzer.csproj", "{DA3415F3-6922-42D0-93D7-BEE2E8603A18}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}" ProjectSection(SolutionItems) = preProject @@ -105,9 +105,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF0 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\executables\IronPython.Window32\IronPython.Window32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.Sdk", "src\sdk\IronPython.Sdk\IronPython.Sdk.csproj", "{726D85B8-E98E-4F31-A081-B02035809A33}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.Sdk", "src\tooling\IronPython.Sdk\IronPython.Sdk.csproj", "{726D85B8-E98E-4F31-A081-B02035809A33}" EndProject -Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "IronPython.Sdk.Sample", "src\sdk\IronPython.Sdk.Sample\IronPython.Sdk.Sample.pyproj", "{C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}" +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "IronPython.Sdk.Sample", "src\tooling\IronPython.Sdk.Sample\IronPython.Sdk.Sample.pyproj", "{C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From 3620fce4e65fb678d2ec5b292382cbc8ce7d5ad9 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Fri, 28 Mar 2025 07:57:41 +0000 Subject: [PATCH 6/9] Move `IronPython.Sdk.Sample` to `tests` --- IronPython.sln | 2 +- .../IronPython.Sdk.Sample/IronPython.Sdk.Sample.py | 0 .../IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj | 2 +- {src/tooling => tests}/IronPython.Sdk.Sample/Program.py | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {src/tooling => tests}/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py (100%) rename {src/tooling => tests}/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj (80%) rename {src/tooling => tests}/IronPython.Sdk.Sample/Program.py (100%) diff --git a/IronPython.sln b/IronPython.sln index 5f98b22b5..c0abf5cea 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -107,7 +107,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronPython.Sdk", "src\tooling\IronPython.Sdk\IronPython.Sdk.csproj", "{726D85B8-E98E-4F31-A081-B02035809A33}" EndProject -Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "IronPython.Sdk.Sample", "src\tooling\IronPython.Sdk.Sample\IronPython.Sdk.Sample.pyproj", "{C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}" +Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "IronPython.Sdk.Sample", "tests\IronPython.Sdk.Sample\IronPython.Sdk.Sample.pyproj", "{C1E9ED5C-242E-4F90-8E69-7FDDE3C919BD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py b/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py similarity index 100% rename from src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py rename to tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py diff --git a/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj b/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj similarity index 80% rename from src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj rename to tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj index a2ab6d9ad..9d161458f 100644 --- a/src/tooling/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj +++ b/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.pyproj @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/src/tooling/IronPython.Sdk.Sample/Program.py b/tests/IronPython.Sdk.Sample/Program.py similarity index 100% rename from src/tooling/IronPython.Sdk.Sample/Program.py rename to tests/IronPython.Sdk.Sample/Program.py From e8908b2411a805af66c81259dd388223f9b1ef60 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 1 Apr 2025 18:40:18 +0100 Subject: [PATCH 7/9] Remove unnecessary file --- tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py diff --git a/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py b/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py deleted file mode 100644 index 8b1378917..000000000 --- a/tests/IronPython.Sdk.Sample/IronPython.Sdk.Sample.py +++ /dev/null @@ -1 +0,0 @@ - From 0687f09ed6be8049b9e9b3c9d19583552e016034 Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 1 Apr 2025 18:40:25 +0100 Subject: [PATCH 8/9] Reword --- src/tooling/IronPython.Sdk/Sdk/FileIncludes.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tooling/IronPython.Sdk/Sdk/FileIncludes.props b/src/tooling/IronPython.Sdk/Sdk/FileIncludes.props index 1963861ed..b38ea9df8 100644 --- a/src/tooling/IronPython.Sdk/Sdk/FileIncludes.props +++ b/src/tooling/IronPython.Sdk/Sdk/FileIncludes.props @@ -1,13 +1,15 @@ + - main.py + Program.py - + From 9d2ae8eeaef2b4aa2325fba493753637c057f87a Mon Sep 17 00:00:00 2001 From: Lamparter <71598437+Lamparter@users.noreply.github.com> Date: Tue, 1 Apr 2025 18:49:50 +0100 Subject: [PATCH 9/9] Remove `InterpreterId` calculator --- src/tooling/IronPython.Sdk/Sdk/Sdk.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tooling/IronPython.Sdk/Sdk/Sdk.props b/src/tooling/IronPython.Sdk/Sdk/Sdk.props index 7f387888c..8ecc99793 100644 --- a/src/tooling/IronPython.Sdk/Sdk/Sdk.props +++ b/src/tooling/IronPython.Sdk/Sdk/Sdk.props @@ -5,8 +5,8 @@ - Global|$(PythonInterpreter)|$(PythonVersion) - + + 2.0 c1e9ed5c-242e-4f90-8e69-7fdde3c919bd