Skip to content

Update DLR #1586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slozier merged 6 commits into from
Oct 21, 2022
Merged

Update DLR #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7226702
Update DLR
slozier Oct 13, 2022
0d366be
Bump up MaxRecursion value
slozier Oct 14, 2022
abf0f65
Bump up package versions
slozier Oct 14, 2022
ff004fe
Update nuget packages
slozier Oct 15, 2022
1bc65b8
Update DLR
slozier Oct 15, 2022
5b1c90d
Fix packaging
slozier Oct 20, 2022
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
4 changes: 2 additions & 2 deletions IronPythonAnalyzer/IronPythonAnalyzer/IronPythonAnalyzer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 5 additions & 1 deletion Package/dotnettool/IronPython.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Src/DLR
Open in desktop
Submodule DLR updated 24 files
+1 −1 Build.proj
+51 −0 Build/net6.0.props
+3 −2 Dlr.sln
+6 −3 Package/nuget/DynamicLanguageRuntime.nuspec
+6 −0 Src/Microsoft.Dynamic/Actions/EventTracker.cs
+2 −0 Src/Microsoft.Dynamic/ComInterop/ComEventSink.netcoreapp.cs
+2 −0 Src/Microsoft.Dynamic/ComInterop/ComEventSinksContainer.cs
+2 −0 Src/Microsoft.Dynamic/ComInterop/ComObject.cs
+2 −0 Src/Microsoft.Dynamic/ComInterop/ComRuntimeHelpers.cs
+4 −1 Src/Microsoft.Dynamic/ComInterop/ComTypeClassDesc.cs
+4 −2 Src/Microsoft.Dynamic/ComInterop/ComTypeEnumDesc.cs
+3 −1 Src/Microsoft.Dynamic/ComInterop/DispatchArgBuilder.cs
+6 −3 Src/Microsoft.Dynamic/ComInterop/IDispatchComObject.cs
+8 −4 Src/Microsoft.Dynamic/ComInterop/Variant.cs
+2 −0 Src/Microsoft.Dynamic/Hosting/Shell/BasicConsole.cs
+4 −0 Src/Microsoft.Dynamic/Hosting/Shell/CommandLine.cs
+2 −0 Src/Microsoft.Dynamic/Hosting/Shell/ConsoleHost.cs
+2 −0 Src/Microsoft.Dynamic/Interpreter/Interpreter.cs
+2 −2 Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj
+1 −1 Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj
+16 −5 Src/Microsoft.Scripting/Microsoft.Scripting.csproj
+3 −3 Tests/Metadata/Metadata.csproj
+3 −3 Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj
+3 −3 Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj
2 changes: 1 addition & 1 deletion Src/IronPython.Modules/IronPython.Modules.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' ">
Expand Down
2 changes: 1 addition & 1 deletion Src/IronPython.SQLite/IronPython.SQLite.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
4 changes: 2 additions & 2 deletions Src/IronPython.Wpf/IronPython.Wpf.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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)" />
Expand Down
4 changes: 2 additions & 2 deletions Src/IronPython/IronPython.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions Src/IronPythonTest/IronPythonTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Tests/test_stdconsole.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down