Skip to content

Commit 95107be

Browse files
BCSharpBCSharp
committed
Upgrade to target net10.0
1 parent cef87c2 commit 95107be

File tree

15 files changed

+96
-26
lines changed

15 files changed

+96
-26
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ dotnet_diagnostic.CA2211.severity = none # CA2211: Non-constant fields sh
9595
dotnet_diagnostic.CA2219.severity = suggestion # CA2219: Do not raise exceptions in finally clauses
9696
dotnet_diagnostic.CA2229.severity = suggestion # CA2229: Implement serialization constructors
9797
dotnet_diagnostic.CA2249.severity = suggestion # CA2249: Consider using 'string.Contains' instead of 'string.IndexOf'
98+
dotnet_diagnostic.CA2263.severity = none # CA2263: Prefer generic overload when type is known
9899
dotnet_diagnostic.CA3075.severity = suggestion # CA3075: Insecure DTD processing in XML
99100
dotnet_diagnostic.CA5350.severity = suggestion # CA5350: Do Not Use Weak Cryptographic Algorithms
100101
dotnet_diagnostic.CA5351.severity = suggestion # CA5351: Do Not Use Broken Cryptographic Algorithms

‎eng/net10.0-windows.props‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<PropertyGroup>
3+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
4+
<IntermediateOutputPath Condition=" '$(TargetFramework)' == 'net10.0-windows' ">$(BaseIntermediateOutputPath)$(Configuration)\net10.0</IntermediateOutputPath>
5+
<OutputPath Condition=" '$(TargetFramework)' == 'net10.0-windows' ">$(BaseOutputPath)\net10.0</OutputPath>
6+
</PropertyGroup>
7+
8+
<Import Project="net10.0.props" />
9+
</Project>

‎eng/net10.0.props‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<IsFullFramework>false</IsFullFramework>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<Features>$(Features);FEATURE_APARTMENTSTATE</Features>
9+
<Features>$(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES</Features>
10+
<Features>$(Features);FEATURE_ASSEMBLY_RESOLVE</Features>
11+
<Features>$(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY</Features>
12+
<Features>$(Features);FEATURE_CODEDOM</Features>
13+
<Features>$(Features);FEATURE_COM</Features>
14+
<Features>$(Features);FEATURE_CONFIGURATION</Features>
15+
<Features>$(Features);FEATURE_CTYPES</Features>
16+
<Features>$(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR</Features>
17+
<Features>$(Features);FEATURE_EXCEPTION_STATE</Features>
18+
<Features>$(Features);FEATURE_FILESYSTEM</Features>
19+
<Features>$(Features);FEATURE_FULL_CRYPTO</Features>
20+
<Features>$(Features);FEATURE_FULL_NET</Features>
21+
<Features>$(Features);FEATURE_LCG</Features>
22+
<Features>$(Features);FEATURE_LOADWITHPARTIALNAME</Features>
23+
<Features>$(Features);FEATURE_METADATA_READER</Features>
24+
<Features>$(Features);FEATURE_MMAP</Features>
25+
<Features>$(Features);FEATURE_NATIVE</Features>
26+
<Features>$(Features);FEATURE_OSPLATFORMATTRIBUTE</Features>
27+
<Features>$(Features);FEATURE_PIPES</Features>
28+
<Features>$(Features);FEATURE_PROCESS</Features>
29+
<Features>$(Features);FEATURE_REFEMIT</Features>
30+
<Features>$(Features);FEATURE_REGISTRY</Features>
31+
<Features>$(Features);FEATURE_RUNTIMEINFORMATION</Features>
32+
<Features>$(Features);FEATURE_SECURITY_RULES</Features>
33+
<Features>$(Features);FEATURE_STACK_TRACE</Features>
34+
<Features>$(Features);FEATURE_SYNC_SOCKETS</Features>
35+
<Features>$(Features);FEATURE_THREAD</Features>
36+
<Features>$(Features);FEATURE_XMLDOC</Features>
37+
</PropertyGroup>
38+
</Project>

‎make.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Param(
44
[Parameter(Position=1)]
55
[String] $target = "build",
66
[String] $configuration = "Release",
7-
[String[]] $frameworks=@('net462','net6.0','net8.0'),
7+
[String[]] $frameworks=@('net462','net6.0','net8.0','net10.0'),
88
[String] $platform = $null, # auto-detect
99
[switch] $runIgnored,
1010
[int] $jobs = [System.Environment]::ProcessorCount

‎src/core/IronPython.Modules/IronPython.Modules.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
55
<BaseAddress>885063680</BaseAddress>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/core/IronPython.Modules/_ssl.cs‎

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ public void load_verify_locations(CodeContext context, object cafile = null, str
252252
using IPythonBuffer buf = cabuf.GetBuffer();
253253
var contents = buf.AsReadOnlySpan();
254254
while (contents.Length > 0) {
255-
#if NET
255+
#if NET10_0_OR_GREATER
256+
var cert = X509CertificateLoader.LoadCertificate(contents);
257+
#elif NET
256258
var cert = new X509Certificate2(contents);
257259
#else
258260
var cert = new X509Certificate2(contents.ToArray());
@@ -449,7 +451,12 @@ public void do_handshake() {
449451
if (_serverSide) {
450452
var _cert = context._cert;
451453
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) {
452-
_cert = new X509Certificate2(_cert.Export(X509ContentType.Pkcs12));
454+
byte[] certData = _cert.Export(X509ContentType.Pkcs12);
455+
#if NET10_0_OR_GREATER
456+
_cert = X509CertificateLoader.LoadCertificate(certData);
457+
#else
458+
_cert = new X509Certificate2(certData);
459+
#endif
453460
}
454461
_sslStream.AuthenticateAsServer(_cert, _certsMode == PythonSsl.CERT_REQUIRED, enabledSslProtocols, false);
455462
} else {
@@ -527,6 +534,8 @@ private static SslProtocols GetProtocolType(int protocol, int options) {
527534
#pragma warning restore CS0618 // Type or member is obsolete
528535
#pragma warning restore CA5397 // Do not use deprecated SslProtocols values
529536

537+
#pragma warning disable SYSLIB0058 // Certain SslStream properties are obsolete
538+
530539
public PythonTuple cipher() {
531540
if (_sslStream != null && _sslStream.IsAuthenticated) {
532541
return PythonTuple.MakeTuple(
@@ -540,6 +549,8 @@ public PythonTuple cipher() {
540549

541550
public object compression() => null; // TODO
542551

552+
#pragma warning restore SYSLIB0058 // Certain SslStream properties are obsolete
553+
543554
#pragma warning disable CA5397 // Do not use deprecated SslProtocols values
544555
#pragma warning disable CS0618 // Type or member is obsolete
545556
#pragma warning disable SYSLIB0039 // Type or member is obsolete
@@ -876,7 +887,14 @@ public static PythonDictionary _test_decode_cert(CodeContext context, string pat
876887
private static PythonDictionary CertificateToPython(CodeContext context, X509Certificate cert) {
877888
if (cert is X509Certificate2 cert2)
878889
return CertificateToPython(context, cert2);
879-
return CertificateToPython(context, new X509Certificate2(cert.GetRawCertData()));
890+
891+
byte[] certData = cert.GetRawCertData();
892+
#if NET10_0_OR_GREATER
893+
cert2 = X509CertificateLoader.LoadCertificate(certData);
894+
#else
895+
cert2 = new X509Certificate2(certData);
896+
#endif
897+
return CertificateToPython(context, cert2);
880898
}
881899

882900
private static PythonDictionary CertificateToPython(CodeContext context, X509Certificate2 cert) {
@@ -1030,7 +1048,12 @@ private static X509Certificate2 ReadCertificate(CodeContext context, string file
10301048
var certStr = ReadToEnd(lines, ref i, "-----END CERTIFICATE-----");
10311049

10321050
try {
1033-
cert = new X509Certificate2(Convert.FromBase64String(certStr.ToString()));
1051+
byte[] certData = Convert.FromBase64String(certStr.ToString());
1052+
#if NET10_0_OR_GREATER
1053+
cert = X509CertificateLoader.LoadCertificate(certData);
1054+
#else
1055+
cert = new X509Certificate2(certData);
1056+
#endif
10341057
} catch (Exception e) {
10351058
throw ErrorDecoding(context, filename, e);
10361059
}

‎src/core/IronPython.Modules/fcntl.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ public static object fcntl(CodeContext context, object? fd, int cmd, [Optional]
117117
//
118118
// int ioctl(int, unsigned long, ...)
119119
//
120-
// but .NET, as of Jan 2025, still does not support varargs in P/Invoke [1]
120+
// but .NET, as of Jan 2026, still does not support varargs in P/Invoke [1]
121121
// so as a workaround, nonvararg prototypes are defined for each architecture.
122122
// [1]: https://github.com/dotnet/runtime/issues/48796
123123

124-
#if NET10_0_OR_GREATER
124+
#if NET11_0_OR_GREATER
125125
#error Check if this version of .NET supports P/Invoke of variadic functions; if not, change the condition to recheck at next major .NET version
126126
#endif
127127

‎src/core/IronPython/IronPython.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;netstandard2.0;net6.0;net8.0;net10.0</TargetFrameworks>
55
<BaseAddress>879755264</BaseAddress>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Mono.Unix" Version="7.1.0-final.1.21458.1" />
3131
</ItemGroup>
3232

33-
<ItemGroup>
33+
<ItemGroup Condition="'$(IsFullFramework)' == 'true' OR '$(TargetFramework)' == 'netstandard2.0'">
3434
<PackageReference Include="System.Memory" Version="4.5.5" />
3535
</ItemGroup>
3636

‎src/core/IronPython/Runtime/Importer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -769,9 +769,9 @@ private static bool IsReflected(object module) {
769769

770770
private static string CreateFullName(string/*!*/ baseName, ArraySegment<string> parts) {
771771
if (baseName == null || baseName.Length == 0 || baseName == "__main__") {
772-
return string.Join(".", parts);
772+
return string.Join(".", (IEnumerable<string>)parts);
773773
}
774-
return baseName + "." + string.Join(".", parts);
774+
return baseName + "." + string.Join(".", (IEnumerable<string>)parts);
775775
}
776776

777777
#endregion

‎src/executables/IronPython.Console/IronPython.Console.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net462;net6.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net462;net6.0;net8.0;net10.0</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>IronPython.Console</RootNamespace>
77
<AssemblyName>ipy</AssemblyName>

0 commit comments

Comments
 (0)