Update DLR (#1586)

* Update DLR

* Bump up MaxRecursion value

* Bump up package versions

* Update nuget packages

* Update DLR

* Fix packaging

Author: slozier

IronPythonAnalyzer/IronPythonAnalyzer/IronPythonAnalyzer.csproj

@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

Package/dotnettool/IronPython.Console.csproj

@@ -38,15 +38,19 @@ This package contains a standalone Python interpreter, invokable from the comman
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" />
     <PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
+    <!-- must match PackageReferences for the DLR -->
+    <PackageReference Include="System.CodeDom" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ToolFiles Include="$(StageDir)\$(TargetFramework)\ipy.deps.json" />
     <ToolFiles Include="$(StageDir)\$(TargetFramework)\ipy.dll" />
     <ToolFiles Include="$(StageDir)\$(TargetFramework)\IronPython*.dll" />
     <ToolFiles Include="$(StageDir)\$(TargetFramework)\**\DLLs\*.dll" />
+    <!-- we don't need Microsoft.Scripting.Metadata.dll since it's not actually used by IronPython -->
+    <ToolFiles Include="$(StageDir)\$(TargetFramework)\Microsoft.Scripting.dll" />
+    <ToolFiles Include="$(StageDir)\$(TargetFramework)\Microsoft.Dynamic.dll" />
   </ItemGroup>
 
   <ItemGroup>

Src/DLR

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFrameworkIdentifier) != '.NETFramework' ">

Src/IronPython.Modules/IronPython.Modules.csproj

@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(AfterTargetFiles)" />

Src/IronPython.SQLite/IronPython.SQLite.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop" >
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFrameworks>net462;netcoreapp3.1;net6.0-windows</TargetFrameworks>
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(AfterTargetFiles)" />

Src/IronPython.Wpf/IronPython.Wpf.csproj

@@ -49,8 +49,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="Nullable" Version="1.3.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Nullable" Version="1.3.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

Src/IronPython/IronPython.csproj

@@ -17,9 +17,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnitLite" Version="3.13.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
+    <PackageReference Include="NUnitLite" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>

Src/IronPythonTest/IronPythonTest.csproj

@@ -312,7 +312,7 @@ def test_u(self):
     @skipUnlessIronPython()
     def test_X_MaxRecursion(self):
         """Test -X:MaxRecursion"""
-        self.TestCommandLine(("-X:MaxRecursion", "45", "-c", "2+2"), "") # TODO: this is high because of importlib
+        self.TestCommandLine(("-X:MaxRecursion", "60", "-c", "2+2"), "") # TODO: this is high because of importlib
         self.TestCommandLine(("-X:MaxRecursion", "3.14159265", "-c", "2+2"), "The argument for the -X MaxRecursion option must be an integer >= 10.\n", 1)
         self.TestCommandLine(("-X:MaxRecursion",), "Argument expected for the -X:MaxRecursion option.\n", 1)
         self.TestCommandLine(("-X:MaxRecursion", "2"), "The argument for the -X MaxRecursion option must be an integer >= 10.\n", 1)