Skip to content

Commit 0b8654d

Browse files
slozierslozier
authored
Migrate to SLNX (#1999)
* Migrate to slnx * Also migrate _ctypes_test.sln
1 parent 2cd61c5 commit 0b8654d

6 files changed

Lines changed: 80 additions & 228 deletions

File tree

‎Build.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<MacOS Condition="$([MSBuild]::IsOSPlatform('OSX'))">true</MacOS>
99

1010
<RootDir>$(MSBuildThisFileDirectory)</RootDir>
11-
<Solution>$(RootDir)IronPython.sln</Solution>
11+
<Solution>$(RootDir)IronPython.slnx</Solution>
1212
<UtilsDir>$(RootDir)eng\utils</UtilsDir>
1313
<BinDir>$(RootDir)bin</BinDir>
1414
<BuildSysDir>$(RootDir)eng</BuildSysDir>

‎IronPython.sln‎

Lines changed: 0 additions & 195 deletions
This file was deleted.

‎IronPython.slnx‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<Solution>
2+
<Folder Name="/DLR/">
3+
<Project Path="src/dlr/Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
4+
<Project Path="src/dlr/Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
5+
<Project Path="src/dlr/Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
6+
</Folder>
7+
<Folder Name="/DLR/Tests/">
8+
<Project Path="src/dlr/Tests/ClrAssembly/ClrAssembly.csproj" />
9+
</Folder>
10+
<Folder Name="/Solution Items/">
11+
<File Path=".editorconfig" />
12+
<File Path=".gitignore" />
13+
<File Path="Build.proj" />
14+
<File Path="CurrentVersion.props" />
15+
<File Path="Directory.Build.props" />
16+
<File Path="IronPython.ruleset" />
17+
<File Path="LICENSE" />
18+
<File Path="make.ps1" />
19+
<File Path="NuGet.config" />
20+
<File Path="README.md" />
21+
</Folder>
22+
<Folder Name="/Solution Items/Build/">
23+
<File Path="eng/After.targets" />
24+
<File Path="eng/net10.0-windows.props" />
25+
<File Path="eng/net10.0.props" />
26+
<File Path="eng/net462.props" />
27+
<File Path="eng/net8.0-windows.props" />
28+
<File Path="eng/net8.0.props" />
29+
<File Path="eng/net9.0-windows.props" />
30+
<File Path="eng/net9.0.props" />
31+
<File Path="eng/netstandard2.0.props" />
32+
<File Path="eng/Tasks.Targets" />
33+
</Folder>
34+
<Folder Name="/Solution Items/Package/" />
35+
<Folder Name="/Solution Items/Package/choco/">
36+
<File Path="eng/package/choco/Choco.Packaging.targets" />
37+
<File Path="eng/package/choco/IronPython.nuspec" />
38+
</Folder>
39+
<Folder Name="/Solution Items/Package/deb/">
40+
<File Path="eng/package/deb/Deb.Packaging.targets" />
41+
</Folder>
42+
<Folder Name="/Solution Items/Package/msi/">
43+
<File Path="eng/package/msi/Dlr.wxs" />
44+
<File Path="eng/package/msi/IronPython.Installer.wixproj" />
45+
<File Path="eng/package/msi/IronPython.wxs" />
46+
<File Path="eng/package/msi/Msi.Packaging.targets" />
47+
<File Path="eng/package/msi/Product.wxs" />
48+
<File Path="eng/package/msi/Version.wxi" />
49+
</Folder>
50+
<Folder Name="/Solution Items/Package/nuget/">
51+
<File Path="eng/package/nuget/IronPython.nuspec" />
52+
<File Path="eng/package/nuget/IronPython.StdLib.nuspec" />
53+
</Folder>
54+
<Folder Name="/Solution Items/Package/pkg/">
55+
<File Path="eng/package/pkg/Pkg.Packaging.targets" />
56+
</Folder>
57+
<Folder Name="/Solution Items/Package/zip/">
58+
<File Path="eng/package/zip/Zip.Packaging.targets" />
59+
</Folder>
60+
<Project Path="src/core/IronPython.Modules/IronPython.Modules.csproj" />
61+
<Project Path="src/core/IronPython/IronPython.csproj" />
62+
<Project Path="src/executables/IronPython.Compiler/IronPython.Compiler.csproj" />
63+
<Project Path="src/executables/IronPython.Console/IronPython.Console.csproj" />
64+
<Project Path="src/executables/IronPython.Console32/IronPython.Console32.csproj" />
65+
<Project Path="src/executables/IronPython.Window/IronPython.Window.csproj" />
66+
<Project Path="src/executables/IronPython.Window32/IronPython.Window32.csproj" />
67+
<Project Path="src/extensions/IronPython.SQLite/IronPython.SQLite.csproj" />
68+
<Project Path="src/extensions/IronPython.Wpf/IronPython.Wpf.csproj" />
69+
<Project Path="src/roslyn/IronPython.Analyzer/IronPython.Analyzer.csproj" />
70+
<Project Path="tests/IronPython.Tests/IronPython.Tests.csproj" />
71+
</Solution>

‎make.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function EnsureMSBuild() {
2424
if([System.IO.File]::Exists($_VSWHERE)) {
2525
$_VSINSTPATH = & "$_VSWHERE" -latest -requires Microsoft.Component.MSBuild -property installationPath
2626
} else {
27-
Write-Error "Visual Studio 2019 16.8 or later is required"
27+
Write-Error "Visual Studio 2022 17.14.26 or later is required"
2828
Exit 1
2929
}
3030

‎tests/ctypes_test/_ctypes_test.sln‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎tests/ctypes_test/_ctypes_test.slnx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="x64" />
4+
<Platform Name="x86" />
5+
</Configurations>
6+
<Project Path="_ctypes_test.vcxproj" Id="0bda76b0-44bf-47b7-aa21-c247f83faf73" />
7+
</Solution>

0 commit comments

Comments
 (0)