Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Build.proj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<MacOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">true</MacOS>

<RootDir>$(MSBuildThisFileDirectory)</RootDir>
<Solution>$(RootDir)IronPython.sln</Solution>
<Solution>$(RootDir)IronPython.slnx</Solution>
<UtilsDir>$(RootDir)eng\utils</UtilsDir>
<BinDir>$(RootDir)bin</BinDir>
<BuildSysDir>$(RootDir)eng</BuildSysDir>
Expand Down
195 changes: 0 additions & 195 deletions IronPython.sln

This file was deleted.

71 changes: 71 additions & 0 deletions IronPython.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<Solution>
<Folder Name="/DLR/">
<Project Path="src/dlr/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
<Project Path="src/dlr/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
<Project Path="src/dlr/Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
</Folder>
<Folder Name="/DLR/Tests/">
<Project Path="src/dlr/Tests/ClrAssembly/ClrAssembly.csproj" />
</Folder>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitignore" />
<File Path="Build.proj" />
<File Path="CurrentVersion.props" />
<File Path="Directory.Build.props" />
<File Path="IronPython.ruleset" />
<File Path="LICENSE" />
<File Path="make.ps1" />
<File Path="NuGet.config" />
<File Path="README.md" />
</Folder>
<Folder Name="/Solution Items/Build/">
<File Path="eng/After.targets" />
<File Path="eng/net10.0-windows.props" />
<File Path="eng/net10.0.props" />
<File Path="eng/net462.props" />
<File Path="eng/net8.0-windows.props" />
<File Path="eng/net8.0.props" />
<File Path="eng/net9.0-windows.props" />
<File Path="eng/net9.0.props" />
<File Path="eng/netstandard2.0.props" />
<File Path="eng/Tasks.Targets" />
</Folder>
<Folder Name="/Solution Items/Package/" />
<Folder Name="/Solution Items/Package/choco/">
<File Path="eng/package/choco/Choco.Packaging.targets" />
<File Path="eng/package/choco/IronPython.nuspec" />
</Folder>
<Folder Name="/Solution Items/Package/deb/">
<File Path="eng/package/deb/Deb.Packaging.targets" />
</Folder>
<Folder Name="/Solution Items/Package/msi/">
<File Path="eng/package/msi/Dlr.wxs" />
<File Path="eng/package/msi/IronPython.Installer.wixproj" />
<File Path="eng/package/msi/IronPython.wxs" />
<File Path="eng/package/msi/Msi.Packaging.targets" />
<File Path="eng/package/msi/Product.wxs" />
<File Path="eng/package/msi/Version.wxi" />
</Folder>
<Folder Name="/Solution Items/Package/nuget/">
<File Path="eng/package/nuget/IronPython.nuspec" />
<File Path="eng/package/nuget/IronPython.StdLib.nuspec" />
</Folder>
<Folder Name="/Solution Items/Package/pkg/">
<File Path="eng/package/pkg/Pkg.Packaging.targets" />
</Folder>
<Folder Name="/Solution Items/Package/zip/">
<File Path="eng/package/zip/Zip.Packaging.targets" />
</Folder>
<Project Path="src/core/IronPython.Modules/IronPython.Modules.csproj" />
<Project Path="src/core/IronPython/IronPython.csproj" />
<Project Path="src/executables/IronPython.Compiler/IronPython.Compiler.csproj" />
<Project Path="src/executables/IronPython.Console/IronPython.Console.csproj" />
<Project Path="src/executables/IronPython.Console32/IronPython.Console32.csproj" />
<Project Path="src/executables/IronPython.Window/IronPython.Window.csproj" />
<Project Path="src/executables/IronPython.Window32/IronPython.Window32.csproj" />
<Project Path="src/extensions/IronPython.SQLite/IronPython.SQLite.csproj" />
<Project Path="src/extensions/IronPython.Wpf/IronPython.Wpf.csproj" />
<Project Path="src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj" />
<Project Path="tests/IronPython.Tests/IronPython.Tests.csproj" />
</Solution>
2 changes: 1 addition & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
31 changes: 0 additions & 31 deletions tests/ctypes_test/_ctypes_test.sln

This file was deleted.

7 changes: 7 additions & 0 deletions tests/ctypes_test/_ctypes_test.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Solution>
<Configurations>
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Project Path="_ctypes_test.vcxproj" Id="0bda76b0-44bf-47b7-aa21-c247f83faf73" />
</Solution>