Skip to content

Commit dff82a1

Browse files
dotnet 9 (#98)
* dotnet 9 * Bump version to 2.0.42 * Fix compiler warnings
1 parent 78551df commit dff82a1

File tree

14 files changed

+27
-37
lines changed

14 files changed

+27
-37
lines changed

Directory.Build.props

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<AssemblyCopyright>Copyright (c) 2006-2021 The Contributors of the Python.NET Project</AssemblyCopyright>
55
<AssemblyCompany>pythonnet</AssemblyCompany>
66
<AssemblyProduct>Python.NET</AssemblyProduct>
7-
<LangVersion>10.0</LangVersion>
87
<IsPackable>false</IsPackable>
98
</PropertyGroup>
109
</Project>

src/console/Console.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0</TargetFrameworks>
3+
<TargetFrameworks>net9.0</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<AssemblyName>nPython</AssemblyName>
66
<RootNamespace>Python.Runtime</RootNamespace>

src/embed_tests/Python.EmbeddingTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
66
<SignAssembly>true</SignAssembly>
77
</PropertyGroup>

src/embed_tests/StateSerialization/MethodSerialization.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System.IO;
1+
/*using System.IO;
22
using System.Reflection;
33
44
using NUnit.Framework;
@@ -44,3 +44,4 @@ public class MethodTestHost
4444
public MethodTestHost(int _) { }
4545
public void Generic<T>(T item, T[] array, ref T @ref) { }
4646
}
47+
*/

src/perf_tests/Python.PerformanceTests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

@@ -13,7 +13,7 @@
1313
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1414
</PackageReference>
1515
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
16-
<PackageReference Include="quantconnect.pythonnet" Version="2.0.41" GeneratePathProperty="true">
16+
<PackageReference Include="quantconnect.pythonnet" Version="2.0.42" GeneratePathProperty="true">
1717
<IncludeAssets>compile</IncludeAssets>
1818
</PackageReference>
1919
</ItemGroup>
@@ -25,7 +25,7 @@
2525
</Target>
2626

2727
<Target Name="CopyBaseline" AfterTargets="Build">
28-
<Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.41\lib\net6.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
28+
<Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.42\lib\net9.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
2929
</Target>
3030

3131
<Target Name="CopyNewBuild" AfterTargets="Build">

src/python_tests_runner/Python.PythonTestsRunner.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0</TargetFrameworks>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>

src/runtime/MethodBinder.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,6 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
793793

794794
static BorrowedReference HandleParamsArray(BorrowedReference args, int arrayStart, int pyArgCount, out NewReference tempObject)
795795
{
796-
BorrowedReference op;
797796
tempObject = default;
798797
// for a params method, we may have a sequence or single/multiple items
799798
// here we look to see if the item at the paramIndex is there or not
@@ -806,20 +805,19 @@ static BorrowedReference HandleParamsArray(BorrowedReference args, int arrayStar
806805
if (!Runtime.PyString_Check(item) && (Runtime.PySequence_Check(item) || (ManagedType.GetManagedObject(item) as CLRObject)?.inst is IEnumerable))
807806
{
808807
// it's a sequence (and not a string), so we use it as the op
809-
op = item;
808+
return item;
810809
}
811810
else
812811
{
813812
tempObject = Runtime.PyTuple_GetSlice(args, arrayStart, pyArgCount);
814-
op = tempObject.Borrow();
813+
return tempObject.Borrow();
815814
}
816815
}
817816
else
818817
{
819818
tempObject = Runtime.PyTuple_GetSlice(args, arrayStart, pyArgCount);
820-
op = tempObject.Borrow();
819+
return tempObject.Borrow();
821820
}
822-
return op;
823821
}
824822

825823
/// <summary>

src/runtime/Native/NewReference.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ref struct NewReference
1515

1616
/// <summary>Creates a <see cref="NewReference"/> pointing to the same object</summary>
1717
[DebuggerHidden]
18-
public NewReference(BorrowedReference reference, bool canBeNull = false)
18+
public NewReference(scoped BorrowedReference reference, bool canBeNull = false)
1919
{
2020
var address = canBeNull
2121
? reference.DangerousGetAddressOrNull()
@@ -157,15 +157,15 @@ public static bool IsNull(this in NewReference reference)
157157

158158
[Pure]
159159
[DebuggerHidden]
160-
public static BorrowedReference BorrowNullable(this in NewReference reference)
160+
public static BorrowedReference BorrowNullable(this scoped in NewReference reference)
161161
=> new(NewReference.DangerousGetAddressOrNull(reference));
162162
[Pure]
163163
[DebuggerHidden]
164-
public static BorrowedReference Borrow(this in NewReference reference)
164+
public static BorrowedReference Borrow(this scoped in NewReference reference)
165165
=> reference.IsNull() ? throw new NullReferenceException() : reference.BorrowNullable();
166166
[Pure]
167167
[DebuggerHidden]
168-
public static BorrowedReference BorrowOrThrow(this in NewReference reference)
168+
public static BorrowedReference BorrowOrThrow(this scoped in NewReference reference)
169169
=> reference.IsNull() ? throw PythonException.ThrowLastAsClrException() : reference.BorrowNullable();
170170
}
171171
}

src/runtime/Native/StolenReference.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static StolenReference Take(ref IntPtr ptr)
2828
}
2929
[MethodImpl(MethodImplOptions.AggressiveInlining)]
3030
[DebuggerHidden]
31-
public static StolenReference TakeNullable(ref IntPtr ptr)
31+
public static StolenReference TakeNullable(scoped ref IntPtr ptr)
3232
{
3333
var stolenAddr = ptr;
3434
ptr = IntPtr.Zero;

src/runtime/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
[assembly: InternalsVisibleTo("Python.EmbeddingTest, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
55
[assembly: InternalsVisibleTo("Python.Test, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
66

7-
[assembly: AssemblyVersion("2.0.41")]
8-
[assembly: AssemblyFileVersion("2.0.41")]
7+
[assembly: AssemblyVersion("2.0.42")]
8+
[assembly: AssemblyFileVersion("2.0.42")]

0 commit comments

Comments
 (0)