Code Quality: Refactor code and make it more modern

.github/workflows/main.yml

@@ -44,7 +44,7 @@ jobs:
     - uses: actions/upload-artifact@v4
       with:
         name: packages-${{ matrix.os }}
-        path: Package/Release/Packages
+        path: eng/Release/Packages
     - name: Test (net462)
       run: ./make.ps1 -frameworks net462 test-all
       shell: pwsh

.gitignore

@@ -1,17 +1,14 @@
-# Visual Studio
-.vs/
-.vscode/
+## This file is used to ignore files and directories when using IronPython with Git.
+## It is based on the VisualStudio.gitignore file from the GitHub gitignore repository,
+## as well as the legacy .gitignore file from the IronPython repository on CodePlex.
+##
+## For more information, visit: https://docs.github.com/en/github/using-git/ignoring-files
 
 # Temporary VS files
-*.suo
-*.csproj.user
 launchSettings.json
 
 # Build results
-obj/
-bin/
-Package/Release/
-*.binlog
+eng/Release/
 
 # NuGet Packages
 packages/
@@ -20,9 +17,190 @@ packages/
 __pycache__/
 
 # Generated files
-Src/IronPythonTest/TestResults/
-Src/IronPythonTest/runsettings.*.xml
+tests/ironpython/TestResults/
+tests/ironpython/runsettings.*.xml
+
+# Created by CPython tests
+src/core/IronPython.StdLib/Lib/lib2to3/Grammar*.pickle
+src/core/IronPython.StdLib/Lib/lib2to3/PatternGrammar*.pickle
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+##
+## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
+
+# User-specific files
+*.rsuser
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# Mono auto generated files
+mono_crash.*
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+[Ww][Ii][Nn]32/
+[Aa][Rr][Mm]/
+[Aa][Rr][Mm]64/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+
+# Visual Studio 2017 auto generated files
+Generated\ Files/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUnit
+*.VisualState.xml
+TestResult.xml
+nunit-*.xml
+
+# Files built by Visual Studio
+*_i.c
+*_p.c
+*_h.h
+*.ilk
+*.meta
+*.obj
+*.iobj
+*.pch
+*.pdb
+*.ipdb
+*.pgc
+*.pgd
+*.rsp
+# but not Directory.Build.rsp, as it configures directory-level build defaults
+!Directory.Build.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*_wpftmp.csproj
+*.log
+*.tlog
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# Visual Studio code coverage results
+*.coverage
+*.coveragexml
+
+# NuGet Packages
+*.nupkg
+# NuGet Symbol Packages
+*.snupkg
+# The packages folder can be ignored because of Package Restore
+**/[Pp]ackages/*
+# except build/, which is used as an MSBuild target.
+!**/[Pp]ackages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/[Pp]ackages/repositories.config
+# NuGet v3's project.json files produces more ignorable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+*.appx
+*.appxbundle
+*.appxupload
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!?*.[Cc]ache/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+ServiceFabricBackup/
+*.rptproj.bak
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# MSBuild Binary and Structured Log
+*.binlog
+
+# Local History for Visual Studio
+.localhistory/
+
+# Visual Studio History (VSHistory) files
+.vshistory/
+
+# Backup folder for Package Reference Convert tool in Visual Studio 2017
+MigrationBackup/
+
+# VS Code files for those working on multiple tools
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
+
+# Windows Installer files from build outputs
+*.cab
+*.msi
+*.msix
+*.msm
+*.msp
 
-# created by CPython tests
-Src/StdLib/Lib/lib2to3/Grammar*.pickle
-Src/StdLib/Lib/lib2to3/PatternGrammar*.pickle
+# JetBrains Rider
+*.sln.iml

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "Src/DLR"]
-	path = Src/DLR
+[submodule "src/runtime"]
+	path = src/runtime
 	url = https://github.com/IronLanguages/dlr
 	branch = main

Build.proj

@@ -9,10 +9,10 @@
 
     <RootDir>$(MSBuildThisFileDirectory)</RootDir>
     <Solution>$(RootDir)IronPython.sln</Solution>
-    <UtilDir>$(RootDir)Util</UtilDir>
-    <ReferenceDir>$(RootDir)Util\References</ReferenceDir>
+    <UtilDir>$(RootDir)eng\utils</UtilDir>
+    <ReferenceDir>$(RootDir)eng\utils\References</ReferenceDir>
     <BinDir>$(RootDir)bin</BinDir>
-    <BuildSysDir>$(RootDir)Build</BuildSysDir>
+    <BuildSysDir>$(RootDir)eng</BuildSysDir>
   </PropertyGroup>
 
   <Import Project="$(BuildSysDir)\Tasks.Targets" />
@@ -21,8 +21,8 @@
   <PropertyGroup>
     <PackageVersion Condition="'$(ReleaseLevel)' == 'final'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</PackageVersion>
     <PackageVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</PackageVersion>
-    <StageDir>$(RootDir)Package\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
-    <PackageDir>$(RootDir)Package\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
+    <StageDir>$(RootDir)eng\$(Configuration)\Stage\IronPython-$(PackageVersion)</StageDir>
+    <PackageDir>$(RootDir)eng\$(Configuration)\Packages\IronPython-$(PackageVersion)</PackageDir>
     <StdLibDirName>lib</StdLibDirName>
   </PropertyGroup>
 
@@ -117,7 +117,7 @@
   </Target>
 
   <Target Name="_CopyStdLib" DependsOnTargets="_MakeStageDir">
-    <MSBuild Projects="$(RootDir)\Src\StdLib\StdLib.pyproj"
+    <MSBuild Projects="$(RootDir)\src\core\IronPython.StdLib\IronPython.StdLib.pyproj"
              Properties="OutputPath=$(StageDir);StdLibDirName=$(StdLibDirName)"
              Targets="Stage" />
   </Target>
@@ -138,5 +138,5 @@
   <!-- This looks like an empty target, but the targets files use it as an AfterTargets -->
   <Target Name="Package" DependsOnTargets="Stage" />
 
-  <Import Project="$(RootDir)\Package\**\*.Packaging.targets" />
+  <Import Project="$(RootDir)\eng\**\*.Packaging.targets" />
 </Project>

CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 The steps to contribute a change are:
 
-1. Fork the IronPython3 repository. For more information see [Getting the Sources](Documentation/getting-the-sources.md).
-2. Build the repository. For more information see [Building](Documentation/building.md).
-1. Make your changes on your machine, ensure ```make.ps1 test-all``` runs successfully, and commit your changes. For more information see [Modifying the Sources](Documentation/modifying-the-sources.md).
+1. Fork the IronPython3 repository. For more information see [Getting the Sources](docs/getting-the-sources.md).
+2. Build the repository. For more information see [Building](docs/building.md).
+1. Make your changes on your machine, ensure ```make.ps1 test-all``` runs successfully, and commit your changes. For more information see [Modifying the Sources](docs/modifying-the-sources.md).
 1. Push the commits to your fork. This way your name will be the author of the commit in the main IronPython3 tree (once the commits are pulled into the main tree).
 1. Create a pull request on Github, this will initiate a code review and CLA signing request
 1. The IronPython team will review, and possibly request changes, to your PR

Directory.Build.props

@@ -5,11 +5,11 @@
   <PropertyGroup>
     <!-- These are normally set by Build.proj, except when building from VS. -->
     <RootDir Condition=" '$(RootDir)' == '' ">$(MSBuildThisFileDirectory)</RootDir>
-    <BuildSysDir Condition=" '$(BuildSysDir)' == '' ">$(RootDir)Build</BuildSysDir>
-    <ReferenceDir Condition=" '$(ReferenceDir)' == '' ">$(RootDir)Util\References</ReferenceDir>
+    <BuildSysDir Condition=" '$(BuildSysDir)' == '' ">$(RootDir)eng</BuildSysDir>
+    <ReferenceDir Condition=" '$(ReferenceDir)' == '' ">$(RootDir)eng\utils\References</ReferenceDir>
 
     <Mono Condition=" '$(Mono)' == '' AND '$(MSBuildRuntimeType)' == 'Mono' ">true</Mono>
-    
+
     <!-- The following two lines prevent csc.rsp and Microsoft.NETFramework.props from adding
          additional assembly references. -->
     <NoConfig>true</NoConfig>