Merge branch 'master' into 3.6

# Conflicts:
#	Src/IronPython/Runtime/PythonList.cs

Author: BCSharp

.editorconfig

@@ -82,6 +82,7 @@ dotnet_diagnostic.CA1846.severity = none        # CA1846: Prefer 'AsSpan' over '
 dotnet_diagnostic.CA1847.severity = none        # CA1847: Use char literal for a single character lookup
 dotnet_diagnostic.CA1852.severity = suggestion  # CA1852: Seal internal types
 dotnet_diagnostic.CA1859.severity = suggestion  # CA1859: Use concrete types when possible for improved performance
+dotnet_diagnostic.CA1861.severity = suggestion  # CA1861: Avoid constant arrays as arguments
 dotnet_diagnostic.CA2101.severity = suggestion  # CA2101: Specify marshaling for P/Invoke string arguments
 dotnet_diagnostic.CA2201.severity = none        # CA2201: Do not raise reserved exception types
 dotnet_diagnostic.CA2208.severity = suggestion  # CA2208: Instantiate argument exceptions correctly

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Prerequisites
 
-The issue tracker is used to report bugs and request new features, NOT to ask questions.
+The issue tracker is used to report bugs and request new features, **NOT** to ask questions.
 
 Questions should be posted in [Discussions](https://github.com/IronLanguages/ironpython3/discussions/categories/q-a) or to the users mailing list which can be accessed at 
 https://ironpython.groups.io/g/users. 
@@ -19,10 +19,21 @@ https://ironpython.groups.io/g/users.
 2. [Second Step]
 3. [and so on...]
 
-**Expected behavior:** [What you expected to happen]
+**Expected behavior:**
 
-**Actual behavior:** [What actually happened]
+[What you expected to happen]
 
-### Versions
+**Actual behavior:**
 
-You can get this information from executing `ipy -VV`.
+[What actually happened]
+
+### Version Information
+
+If you are using the `ipy` console program, provide output of executing `ipy -VV`. If it is a local build, provide also the git hash of the commit used to build IronPython. In either case, provide the type of the operating system used.
+
+If you are using the IronPython engine embedded in a .NET application, provide the version number of the NuGet package used (or if it is a local build, the git hash of the commit used to build IronPython), and the following info:
+
+* .NET platform used (choice from: .NET, .NET Core, .NET Framework, Mono, Unity, Xamarin),
+* Version of the .NET platform used,
+* Operating system used,
+* Value of `sys.version`, from imported module `sys`.

.github/workflows/main.yml

@@ -10,19 +10,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, ubuntu-20.04, macos-latest]
+        os: [windows-latest, ubuntu-latest, macos-latest]
 
     steps:
     - name: Install tools
-      if: matrix.os == 'ubuntu-20.04'
+      if: matrix.os == 'ubuntu-latest'
       run: sudo apt-get -yq install mono-vbnc dos2unix
     - uses: actions/checkout@v2
       with:
         submodules: true
-    - name: Setup .NET Core 2.1
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '2.1.x'
     - name: Setup .NET Core 3.1
       uses: actions/setup-dotnet@v1
       with:
@@ -48,9 +44,6 @@ jobs:
     - name: Test (net462)
       run: ./make.ps1 -frameworks net462 test-all
       shell: pwsh
-    - name: Test (netcoreapp2.1)
-      run: ./make.ps1 -frameworks netcoreapp2.1 test-all
-      shell: pwsh
     - name: Test (netcoreapp3.1)
       run: ./make.ps1 -frameworks netcoreapp3.1 test-all
       shell: pwsh

.vsts-ci.yml

@@ -18,7 +18,7 @@ jobs:
   displayName: Linux (Ubuntu)
   timeoutInMinutes: 180
   pool:
-    vmImage: ubuntu-20.04
+    vmImage: ubuntu-latest
   steps:
   - template: Build/steps.yml
     parameters:

Build/After.targets

@@ -19,8 +19,7 @@
   </Choose>
 
   <PropertyGroup>
-    <_TargetFramework>$(TargetFramework)</_TargetFramework>
-    <_TargetFramework Condition=" $(TargetFramework.EndsWith('-windows')) ">$(TargetFramework.Substring(0, $(TargetFramework.IndexOf('-windows'))))</_TargetFramework>
+    <_TargetFramework>$(TargetFramework.Replace('-windows', ''))</_TargetFramework>
     <MainStageDir>$(StageDir)\$(_TargetFramework)</MainStageDir>
     <MainStageDir Condition=" '$(StoreInDLLs)' == 'true' ">$(StageDir)\$(_TargetFramework)\DLLs</MainStageDir>
     <UnsignedItems>@(StageItem)</UnsignedItems>
@@ -44,9 +43,5 @@
     <Copy SourceFiles="$(UnsignedItems)" DestinationFolder="$(MainStageDir)" />
   </Target>
 
-  <Target Name="_StoreInDLLs" Condition=" '$(StoreInDLLs)' == 'true' ">
-    <Move SourceFiles="@(StageItem)" DestinationFolder="$(TargetDir)%(StageItem.RecursiveDir)DLLs" />
-  </Target>
-
-  <Target Name="Stage" DependsOnTargets="_LateStage;_MainStage;_StoreInDLLs" />
+  <Target Name="Stage" DependsOnTargets="_LateStage;_MainStage" />
 </Project>

Build/steps.yml

@@ -24,12 +24,6 @@ steps:
      Write-Host ("##vso[task.setvariable variable=PackageVersion;isSecret=false;isOutput=true;]$PackageVersion")
     displayName: Grab Package Version
 
-  - task: UseDotNet@2
-    displayName: Install .NET Core 2.1 runtime for testing
-    inputs:
-      packageType: 'runtime'
-      version: '2.1.x'
-
   - task: UseDotNet@2
     displayName: Install .NET Core 3.1 runtime for testing
     inputs:

IronPython.sln

@@ -37,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
 		Build\net462.props = Build\net462.props
 		Build\net6.0-windows.props = Build\net6.0-windows.props
 		Build\net6.0.props = Build\net6.0.props
-		Build\netcoreapp2.1.props = Build\netcoreapp2.1.props
-		Build\netcoreapp3.1.props = Build\netcoreapp3.1.props
 		Build\netstandard2.0.props = Build\netstandard2.0.props
 		Build\steps.yml = Build\steps.yml
 		Build\Tasks.Targets = Build\Tasks.Targets

Package/nuget/IronPython.nuspec

@@ -25,12 +25,7 @@ This package contains the IronPython interpreter engine.</description>
       <group targetFramework="netstandard2.0">
         <dependency id="DynamicLanguageRuntime" version="1.3.4" />
         <dependency id="System.Memory" version="4.5.5" />
-        <dependency id="System.Text.Encoding.CodePages" version="4.6.0" />
-        <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
-        <dependency id="Mono.Unix" version="7.1.0-final.1.21458.1" />
-      </group>
-      <group targetFramework="netcoreapp3.1">
-        <dependency id="DynamicLanguageRuntime" version="1.3.4" />
+        <dependency id="System.Text.Encoding.CodePages" version="4.7.0" />
         <dependency id="Microsoft.Win32.Registry" version="4.7.0" />
         <dependency id="Mono.Unix" version="7.1.0-final.1.21458.1" />
       </group>
@@ -41,9 +36,9 @@ This package contains the IronPython interpreter engine.</description>
     </dependencies>
   </metadata>
   <files>
-    <file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;netcoreapp2.1\**\*;net7.0*\**\*" />
-    <file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;netcoreapp2.1\**\*;net7.0*\**\*" />
-    <file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;netcoreapp2.1\**\*;net7.0*\**\*" />
+    <file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;netcoreapp3.1\**\*;net7.0*\**\*;net8.0*\**\*" />
+    <file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;netcoreapp3.1\**\*;net7.0*\**\*;net8.0*\**\*" />
+    <file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;netcoreapp3.1\**\*;net7.0*\**\*;net8.0*\**\*" />
     <file src="LICENSE" />
     <file src="..\..\..\nuget\README.md" target="" />
     <file src="..\..\..\..\Documentation\logo.png" target="" />

Package/zip/Zip.Packaging.targets

@@ -4,7 +4,7 @@
     <MakeDir Directories="$(PackageDir)" Condition="!Exists('$(PackageDir)')"/>
 
     <ItemGroup>
-      <ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\netcoreapp2.1\**\*;$(StageDir)\net7.0*\**\*" />
+      <ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\README.md;$(StageDir)\**\*.pdb;$(StageDir)\netstandard2.0\**\*;$(StageDir)\netcoreapp3.1\**\*;$(StageDir)\net7.0*\**\*;$(StageDir)\net8.0*\**\*" />
       <ZipFiles Include="README.md" Link="$(MSBuildThisFileDirectory)README.md" />
       <ZipFiles Include="scripts/Enter-IronPythonEnvironment.ps1" Link="$(RootDir)Src\Scripts\Enter-IronPythonEnvironment.ps1" />
       <ZipFiles Include="scripts/Install-IronPython.ps1" Link="$(RootDir)Src\Scripts\Install-IronPython.ps1" />

README.md

@@ -86,4 +86,4 @@ Binaries of IronPython 3 can be downloaded from the [release page](https://githu
 See the [building document](Documentation/building.md). Since the main development is on Windows, bugs on other platforms may inadvertently be introduced - please report them!
 
 ## Supported Platforms
-IronPython 3 targets .NET Framework 4.6.2, .NET Standard 2.0, .NET Core 3.1 and .NET 6.0. The support for .NET and .NET Core follow the lifecycle defined on [.NET and .NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).
+IronPython 3 targets .NET Framework 4.6.2, .NET Standard 2.0 and .NET 6.0. The support for .NET and .NET Core follow the lifecycle defined on [.NET and .NET Core Support Policy](https://dotnet.microsoft.com/platform/support/policy/dotnet-core).