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 @@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

<RootDir>$(MSBuildThisFileDirectory)</RootDir>
<Solution>$(RootDir)\Dlr.sln</Solution>
<Solution>$(RootDir)\Dlr.slnx</Solution>

<UtilDir>$(RootDir)\Util</UtilDir>
<BinDir>$(RootDir)\bin</BinDir>
Expand Down
107 changes: 0 additions & 107 deletions Dlr.sln

This file was deleted.

47 changes: 47 additions & 0 deletions Dlr.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".gitattributes" />
<File Path=".gitignore" />
<File Path="Build.proj" />
<File Path="CurrentVersion.props" />
<File Path="Directory.Build.props" />
<File Path="LICENSE" />
<File Path="make.ps1" />
<File Path="NuGet.config" />
<File Path="README.md" />
</Folder>
<Folder Name="/Solution Items/Build/">
<File Path="Build/After.targets" />
<File Path="Build/net10.0.props" />
<File Path="Build/net462.props" />
<File Path="Build/net8.0.props" />
<File Path="Build/net9.0.props" />
<File Path="Build/netstandard2.0.props" />
<File Path="Build/Tasks.targets" />
</Folder>
<Folder Name="/Solution Items/CI/" />
<Folder Name="/Solution Items/CI/Azure/">
<File Path=".vsts-ci.yml" />
<File Path="Build/steps.yml" />
</Folder>
<Folder Name="/Solution Items/CI/GitHub/">
<File Path=".github/workflows/main.yml" />
</Folder>
<Folder Name="/Solution Items/Package/" />
<Folder Name="/Solution Items/Package/nuget/">
<File Path="Package/nuget/DynamicLanguageRuntime.nuspec" />
<File Path="Package/nuget/NuGet.Packaging.csproj" />
</Folder>
<Folder Name="/Tests/">
<Project Path="Tests/ClrAssembly/ClrAssembly.csproj">
<BuildDependency Project="Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
</Project>
<Project Path="Tests/Metadata/Metadata.csproj" />
<Project Path="Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj" />
<Project Path="Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj" />
</Folder>
<Project Path="Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
<Project Path="Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
<Project Path="Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
</Solution>
51 changes: 0 additions & 51 deletions Tests/DlrComLibrary/DlrComLibrary.sln

This file was deleted.

15 changes: 15 additions & 0 deletions Tests/DlrComLibrary/DlrComLibrary.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Solution>
<Configurations>
<Platform Name="Itanium" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Itanium! 🤣

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😀 Yup, that's what .sln had.

We can replace it with ARM64, but that would be a separate PR.

<Platform Name="Win32" />
<Platform Name="x64" />
</Configurations>
<Project Path="DlrComLibrary.vcxproj" />
<Project Path="DlrComLibraryPS.vcxproj">
<Build Project="false" />
</Project>
<Project Path="Setup/Setup.vdproj" Type="Installer">
<Build Solution="*|x64" />
<Build Solution="Release|Itanium" />
</Project>
</Solution>
Loading