Update to net6

Martin-Molinero · Martin-Molinero · commit 8e522633b7d2 · 2022-05-02T19:01:48.000-03:00
diff --git a/src/console/Console.csproj b/src/console/Console.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <AssemblyName>nPython</AssemblyName>
     <RootNamespace>Python.Runtime</RootNamespace>
diff --git a/src/embed_tests/Python.EmbeddingTest.csproj b/src/embed_tests/Python.EmbeddingTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
diff --git a/src/perf_tests/Python.PerformanceTests.csproj b/src/perf_tests/Python.PerformanceTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/python_tests_runner/Python.PythonTestsRunner.csproj b/src/python_tests_runner/Python.PythonTestsRunner.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/runtime/Python.Runtime.csproj b/src/runtime/Python.Runtime.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <Platforms>AnyCPU</Platforms>
-    <LangVersion>10.0</LangVersion>
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
     <PackageId>QuantConnect.pythonnet</PackageId>
@@ -65,7 +64,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Security.Permissions" Version="4.7.0" />
     <PackageReference Include="fasterflect" Version="3.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/runtime/PythonException.cs b/src/runtime/PythonException.cs
@@ -110,11 +110,11 @@ internal static PythonException FetchCurrentRaw()
                 throw;
             }
 
-            var normalizedValue = new NewReference(value.Borrow());
-            Runtime.PyErr_NormalizeException(type: ref type, val: ref normalizedValue, tb: ref traceback);
-
             try
             {
+                var normalizedValue = new NewReference(value.Borrow());
+                Runtime.PyErr_NormalizeException(type: ref type, val: ref normalizedValue, tb: ref traceback);
+
                 return FromPyErr(typeRef: type.Borrow(), valRef: value.Borrow(), nValRef: normalizedValue.Borrow(), tbRef: traceback.BorrowNullable(), out dispatchInfo);
             }
             finally
diff --git a/src/testing/Python.Test.csproj b/src/testing/Python.Test.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net5.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <AssemblyOriginatorKeyFile>..\pythonnet.snk</AssemblyOriginatorKeyFile>

Original file line number	Diff line number	Diff line change
`@@ -110,11 +110,11 @@ internal static PythonException FetchCurrentRaw()`
`110`	`110`	`throw;`
`111`	`111`	`}`
`112`	`112`
`113`		`- var normalizedValue = new NewReference(value.Borrow());`
`114`		`- Runtime.PyErr_NormalizeException(type: ref type, val: ref normalizedValue, tb: ref traceback);`
`115`		`-`
`116`	`113`	`try`
`117`	`114`	`{`
	`115`	`+ var normalizedValue = new NewReference(value.Borrow());`
	`116`	`+ Runtime.PyErr_NormalizeException(type: ref type, val: ref normalizedValue, tb: ref traceback);`
	`117`	`+`
`118`	`118`	`return FromPyErr(typeRef: type.Borrow(), valRef: value.Borrow(), nValRef: normalizedValue.Borrow(), tbRef: traceback.BorrowNullable(), out dispatchInfo);`
`119`	`119`	`}`
`120`	`120`	`finally`