Merge branch 'master' into 3.6

Author: slozier

.editorconfig

@@ -80,6 +80,7 @@ dotnet_diagnostic.CA1838.severity = suggestion  # CA1838: Avoid 'StringBuilder'
 dotnet_diagnostic.CA1845.severity = none        # CA1845: Use span-based 'string.Concat'
 dotnet_diagnostic.CA1846.severity = none        # CA1846: Prefer 'AsSpan' over 'Substring'
 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.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/workflows/main.yml

@@ -27,10 +27,6 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: '3.1.x'
-    - name: Setup .NET 5.0
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '5.0.x'
     - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v1
       with:
@@ -49,18 +45,15 @@ jobs:
       with:
         name: packages
         path: Package/Release/Packages
-    - name: Test (net46)
-      run: ./make.ps1 -frameworks net46 test-all
+    - 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
-    - name: Test (net5.0)
-      run: ./make.ps1 -frameworks net5.0 test-all
-      shell: pwsh
     - name: Test (net6.0)
       run: ./make.ps1 -frameworks net6.0 test-all
       shell: pwsh

Build/net46.props Build/net462.propsBuild/net46.props renamed to Build/net462.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <IsFullFramework>true</IsFullFramework>
   </PropertyGroup>
 

Build/net5.0-windows.props

@@ -37,13 +37,7 @@ steps:
       version: '3.1.x'
 
   - task: UseDotNet@2
-    displayName: Install .NET Core 5.0 runtime for testing
-    inputs:
-      packageType: 'runtime'
-      version: '5.0.x'
-
-  - task: UseDotNet@2
-    displayName: Install .NET Core 6.0 SDK for build
+    displayName: Install .NET 6.0 SDK for build
     inputs:
       packageType: 'sdk'
       version: '6.0.x'

Build/net5.0.props

@@ -117,7 +117,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Using Include="Microsoft.Scripting.Runtime.NotNullAttribute" Alias="NotNoneAttribute" />
+    <Using Include="Microsoft.Scripting.Runtime.NotNullAttribute" Alias="NotNone" />
   </ItemGroup>
 
   <!-- Release -->

Build/steps.yml

@@ -38,3 +38,17 @@ To install:
 ```
 ipy -m pip install requests==2.21.0
 ```
+
+## sympy (1.4)
+
+To install:
+```
+ipy -m pip install sympy==1.4
+```
+
+The above will also automatically install `mpmath` 1.2.1 if not yet installed.
+
+`sympy` comes with an interactive console, which can be started with:
+```
+ipy -m isympy
+```

Directory.Build.props

@@ -34,9 +34,9 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB-40C6-41A6-83DA-3203A4DCEC19}"
 	ProjectSection(SolutionItems) = preProject
 		Build\After.targets = Build\After.targets
-		Build\net46.props = Build\net46.props
-		Build\net5.0-windows.props = Build\net5.0-windows.props
-		Build\net5.0.props = Build\net5.0.props
+		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

Documentation/package-compatibility.md

@@ -7,6 +7,6 @@
     </PropertyGroup>
     <Exec Command="$(NuGet) install chocolatey -Version $(ChocolateyVersion) -OutputDirectory &quot;$(RootDir)packages&quot; -Source https://api.nuget.org/v3/index.json" />
     <Exec Command="$(RootDir)packages\chocolatey.$(ChocolateyVersion)\tools\chocolateyInstall\choco.exe pack -r &quot;$(RootDir)Package\choco\IronPython.nuspec&quot; --outputdirectory &quot;$(StageDir)&quot; --version $(PackageVersion) STAGEDIR=&quot;$(StageDir)&quot;" />
-    <Move SourceFiles="$(StageDir)\ironpython3.$(PackageVersion).nupkg" DestinationFiles="$(PackageDir)\ironpython3.chocolatey.$(PackageVersion).nupkg" />
+    <Move SourceFiles="$(StageDir)\ironpython.$(PackageVersion).nupkg" DestinationFiles="$(PackageDir)\ironpython.chocolatey.$(PackageVersion).nupkg" />
   </Target>
 </Project>