diff --git a/Build.proj b/Build.proj
index 929b39f17..5c3396c3d 100644
--- a/Build.proj
+++ b/Build.proj
@@ -8,7 +8,7 @@
true
$(MSBuildThisFileDirectory)
- $(RootDir)IronPython.sln
+ $(RootDir)IronPython.slnx
$(RootDir)eng\utils
$(RootDir)bin
$(RootDir)eng
diff --git a/IronPython.sln b/IronPython.sln
deleted file mode 100644
index 36ced327b..000000000
--- a/IronPython.sln
+++ /dev/null
@@ -1,195 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.9.34714.143
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython", "src\core\IronPython\IronPython.csproj", "{95289EA9-5778-489D-AB48-F81F2CE2DA32}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Modules", "src\core\IronPython.Modules\IronPython.Modules.csproj", "{155CE436-1669-4A48-8095-410F2430237F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Wpf", "src\extensions\IronPython.Wpf\IronPython.Wpf.csproj", "{65E997B7-E99B-4C83-B29E-9951429BB293}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Console", "src\executables\IronPython.Console\IronPython.Console.csproj", "{811AC32C-11F3-4ED8-92A7-A7E39C2BB704}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Tests", "tests\IronPython.Tests\IronPython.Tests.csproj", "{B6B42537-07F8-4F6C-A99A-B155CAEB124E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window", "src\executables\IronPython.Window\IronPython.Window.csproj", "{81DA19C7-4FEC-47E7-981B-D9310D549F95}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3A14D070-628F-44EF-92DD-47C8BE5C33CD}"
- ProjectSection(SolutionItems) = preProject
- .editorconfig = .editorconfig
- .gitignore = .gitignore
- Build.proj = Build.proj
- CurrentVersion.props = CurrentVersion.props
- Directory.Build.props = Directory.Build.props
- IronPython.ruleset = IronPython.ruleset
- LICENSE = LICENSE
- make.ps1 = make.ps1
- NuGet.config = NuGet.config
- README.md = README.md
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.SQLite", "src\extensions\IronPython.SQLite\IronPython.SQLite.csproj", "{4A617A40-2BA7-4713-AAFE-F90C4325C581}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB-40C6-41A6-83DA-3203A4DCEC19}"
- ProjectSection(SolutionItems) = preProject
- eng\After.targets = eng\After.targets
- eng\net462.props = eng\net462.props
- eng\net8.0-windows.props = eng\net8.0-windows.props
- eng\net8.0.props = eng\net8.0.props
- eng\net9.0-windows.props = eng\net9.0-windows.props
- eng\net9.0.props = eng\net9.0.props
- eng\net10.0-windows.props = eng\net10.0-windows.props
- eng\net10.0.props = eng\net10.0.props
- eng\netstandard2.0.props = eng\netstandard2.0.props
- eng\Tasks.Targets = eng\Tasks.Targets
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Compiler", "src\executables\IronPython.Compiler\IronPython.Compiler.csproj", "{3DFB096E-AC09-4E7A-9288-7F7C33C288C7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLR", "DLR", "{AC38EFB1-820D-4E90-BF40-BEF3AC825542}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic", "src\dlr\Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting", "src\dlr\Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Metadata", "src\dlr\Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{60836ADE-CAB7-4587-B6FB-8C4FEB872752}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClrAssembly", "src\dlr\Tests\ClrAssembly\ClrAssembly.csproj", "{BEE737B9-18D5-48D9-8672-9A896213C98B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{EE77D917-27F7-4E54-B72F-C8CEE4AEDCAA}"
- ProjectSection(SolutionItems) = preProject
- eng\package\nuget\IronPython.nuspec = eng\package\nuget\IronPython.nuspec
- eng\package\nuget\IronPython.StdLib.nuspec = eng\package\nuget\IronPython.StdLib.nuspec
- EndProjectSection
-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}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "choco", "choco", "{EA550FD8-2241-4131-8292-619D009E0199}"
- ProjectSection(SolutionItems) = preProject
- eng\package\choco\Choco.Packaging.targets = eng\package\choco\Choco.Packaging.targets
- eng\package\choco\IronPython.nuspec = eng\package\choco\IronPython.nuspec
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{01CE1AE6-CD7F-491B-8150-58CD738B20AC}"
- ProjectSection(SolutionItems) = preProject
- eng\package\pkg\Pkg.Packaging.targets = eng\package\pkg\Pkg.Packaging.targets
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deb", "deb", "{676093FF-CB44-4BD5-B83C-A28FE88D5017}"
- ProjectSection(SolutionItems) = preProject
- eng\package\deb\Deb.Packaging.targets = eng\package\deb\Deb.Packaging.targets
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "zip", "zip", "{8FC07B92-D2AC-4921-9E97-A92A84D2B461}"
- ProjectSection(SolutionItems) = preProject
- eng\package\zip\Zip.Packaging.targets = eng\package\zip\Zip.Packaging.targets
- EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "msi", "msi", "{450F93D5-DF02-4C04-960B-AE7E454668AA}"
- ProjectSection(SolutionItems) = preProject
- eng\package\msi\Dlr.wxs = eng\package\msi\Dlr.wxs
- eng\package\msi\IronPython.Installer.wixproj = eng\package\msi\IronPython.Installer.wixproj
- eng\package\msi\IronPython.wxs = eng\package\msi\IronPython.wxs
- eng\package\msi\Msi.Packaging.targets = eng\package\msi\Msi.Packaging.targets
- eng\package\msi\Product.wxs = eng\package\msi\Product.wxs
- eng\package\msi\Version.wxi = eng\package\msi\Version.wxi
- EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IronPython.Window32", "src\executables\IronPython.Window32\IronPython.Window32.csproj", "{8F177DC2-9822-45BD-AB05-1F40FCA86168}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {95289EA9-5778-489D-AB48-F81F2CE2DA32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {95289EA9-5778-489D-AB48-F81F2CE2DA32}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {95289EA9-5778-489D-AB48-F81F2CE2DA32}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {95289EA9-5778-489D-AB48-F81F2CE2DA32}.Release|Any CPU.Build.0 = Release|Any CPU
- {155CE436-1669-4A48-8095-410F2430237F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {155CE436-1669-4A48-8095-410F2430237F}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {155CE436-1669-4A48-8095-410F2430237F}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {155CE436-1669-4A48-8095-410F2430237F}.Release|Any CPU.Build.0 = Release|Any CPU
- {65E997B7-E99B-4C83-B29E-9951429BB293}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {65E997B7-E99B-4C83-B29E-9951429BB293}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {65E997B7-E99B-4C83-B29E-9951429BB293}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {65E997B7-E99B-4C83-B29E-9951429BB293}.Release|Any CPU.Build.0 = Release|Any CPU
- {811AC32C-11F3-4ED8-92A7-A7E39C2BB704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {811AC32C-11F3-4ED8-92A7-A7E39C2BB704}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {811AC32C-11F3-4ED8-92A7-A7E39C2BB704}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {811AC32C-11F3-4ED8-92A7-A7E39C2BB704}.Release|Any CPU.Build.0 = Release|Any CPU
- {B6B42537-07F8-4F6C-A99A-B155CAEB124E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B6B42537-07F8-4F6C-A99A-B155CAEB124E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B6B42537-07F8-4F6C-A99A-B155CAEB124E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B6B42537-07F8-4F6C-A99A-B155CAEB124E}.Release|Any CPU.Build.0 = Release|Any CPU
- {81DA19C7-4FEC-47E7-981B-D9310D549F95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {81DA19C7-4FEC-47E7-981B-D9310D549F95}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {81DA19C7-4FEC-47E7-981B-D9310D549F95}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {81DA19C7-4FEC-47E7-981B-D9310D549F95}.Release|Any CPU.Build.0 = Release|Any CPU
- {4A617A40-2BA7-4713-AAFE-F90C4325C581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4A617A40-2BA7-4713-AAFE-F90C4325C581}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4A617A40-2BA7-4713-AAFE-F90C4325C581}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4A617A40-2BA7-4713-AAFE-F90C4325C581}.Release|Any CPU.Build.0 = Release|Any CPU
- {3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {3DFB096E-AC09-4E7A-9288-7F7C33C288C7}.Release|Any CPU.Build.0 = Release|Any CPU
- {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.Build.0 = Release|Any CPU
- {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.Build.0 = Release|Any CPU
- {ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Release|Any CPU.Build.0 = Release|Any CPU
- {BEE737B9-18D5-48D9-8672-9A896213C98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {BEE737B9-18D5-48D9-8672-9A896213C98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {BEE737B9-18D5-48D9-8672-9A896213C98B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {BEE737B9-18D5-48D9-8672-9A896213C98B}.Release|Any CPU.Build.0 = Release|Any CPU
- {AD21022F-E7C1-4B74-97C1-0A0E48EFF992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {AD21022F-E7C1-4B74-97C1-0A0E48EFF992}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {AD21022F-E7C1-4B74-97C1-0A0E48EFF992}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {AD21022F-E7C1-4B74-97C1-0A0E48EFF992}.Release|Any CPU.Build.0 = Release|Any CPU
- {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {DA3415F3-6922-42D0-93D7-BEE2E8603A18}.Release|Any CPU.Build.0 = Release|Any CPU
- {8F177DC2-9822-45BD-AB05-1F40FCA86168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {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
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(NestedProjects) = preSolution
- {17737ACB-40C6-41A6-83DA-3203A4DCEC19} = {3A14D070-628F-44EF-92DD-47C8BE5C33CD}
- {EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {AC38EFB1-820D-4E90-BF40-BEF3AC825542}
- {02FF0909-F5AD-48CF-A86A-345E721B7E40} = {AC38EFB1-820D-4E90-BF40-BEF3AC825542}
- {ACDD9B9E-8FE6-439C-9521-1CCBA47F6143} = {AC38EFB1-820D-4E90-BF40-BEF3AC825542}
- {60836ADE-CAB7-4587-B6FB-8C4FEB872752} = {AC38EFB1-820D-4E90-BF40-BEF3AC825542}
- {BEE737B9-18D5-48D9-8672-9A896213C98B} = {60836ADE-CAB7-4587-B6FB-8C4FEB872752}
- {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0} = {3A14D070-628F-44EF-92DD-47C8BE5C33CD}
- {EE77D917-27F7-4E54-B72F-C8CEE4AEDCAA} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- {EA550FD8-2241-4131-8292-619D009E0199} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- {01CE1AE6-CD7F-491B-8150-58CD738B20AC} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- {676093FF-CB44-4BD5-B83C-A28FE88D5017} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- {8FC07B92-D2AC-4921-9E97-A92A84D2B461} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- {450F93D5-DF02-4C04-960B-AE7E454668AA} = {CE610DDE-D1DB-44D8-BAE9-BAAB00DA98F0}
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {981EA700-AB4F-462F-96D7-F35FAAAA7E89}
- EndGlobalSection
-EndGlobal
diff --git a/IronPython.slnx b/IronPython.slnx
new file mode 100644
index 000000000..3b4f31a91
--- /dev/null
+++ b/IronPython.slnx
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/make.ps1 b/make.ps1
index f9cbb699f..ace454293 100755
--- a/make.ps1
+++ b/make.ps1
@@ -24,7 +24,7 @@ function EnsureMSBuild() {
if([System.IO.File]::Exists($_VSWHERE)) {
$_VSINSTPATH = & "$_VSWHERE" -latest -requires Microsoft.Component.MSBuild -property installationPath
} else {
- Write-Error "Visual Studio 2019 16.8 or later is required"
+ Write-Error "Visual Studio 2022 17.14.26 or later is required"
Exit 1
}
diff --git a/tests/ctypes_test/_ctypes_test.sln b/tests/ctypes_test/_ctypes_test.sln
deleted file mode 100644
index 1c9000c93..000000000
--- a/tests/ctypes_test/_ctypes_test.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes_test", "_ctypes_test.vcxproj", "{0BDA76B0-44BF-47B7-AA21-C247F83FAF73}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
- Release|x64 = Release|x64
- Release|x86 = Release|x86
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Debug|x64.ActiveCfg = Debug|x64
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Debug|x64.Build.0 = Debug|x64
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Debug|x86.ActiveCfg = Debug|Win32
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Debug|x86.Build.0 = Debug|Win32
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Release|x64.ActiveCfg = Release|x64
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Release|x64.Build.0 = Release|x64
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Release|x86.ActiveCfg = Release|Win32
- {0BDA76B0-44BF-47B7-AA21-C247F83FAF73}.Release|x86.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {D6D984C3-CAF5-4D08-9E0F-3691152F7691}
- EndGlobalSection
-EndGlobal
diff --git a/tests/ctypes_test/_ctypes_test.slnx b/tests/ctypes_test/_ctypes_test.slnx
new file mode 100644
index 000000000..1c6ca3240
--- /dev/null
+++ b/tests/ctypes_test/_ctypes_test.slnx
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+