From c66d170908589160e70087cfd822c45363aab092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lozier?= Date: Wed, 11 Dec 2019 19:47:18 -0500 Subject: [PATCH 1/2] Update to release versions of packages --- Src/DLR | 2 +- Src/IronPython.Modules/IronPython.Modules.csproj | 4 ++-- Src/IronPython.SQLite/IronPython.SQLite.csproj | 2 +- Src/IronPython.Wpf/IronPython.Wpf.csproj | 2 +- Src/IronPython/IronPython.csproj | 4 ++-- Src/IronPythonCompiler/IronPythonCompiler.csproj | 2 +- Src/IronPythonConsole/IronPythonConsole.csproj | 2 +- Src/IronPythonTest/IronPythonTest.csproj | 2 +- Src/IronPythonWindow/IronPythonWindow.csproj | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Src/DLR b/Src/DLR index 506a1c8a7..b7902d1c8 160000 --- a/Src/DLR +++ b/Src/DLR @@ -1 +1 @@ -Subproject commit 506a1c8a760b9452d663bdc2077c31fa6960026a +Subproject commit b7902d1c86fc55362befea653e5546db94a76945 diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj index a253a6eac..c71c5003d 100644 --- a/Src/IronPython.Modules/IronPython.Modules.csproj +++ b/Src/IronPython.Modules/IronPython.Modules.csproj @@ -22,11 +22,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPython.SQLite/IronPython.SQLite.csproj b/Src/IronPython.SQLite/IronPython.SQLite.csproj index 890f64bb6..409ec3c15 100644 --- a/Src/IronPython.SQLite/IronPython.SQLite.csproj +++ b/Src/IronPython.SQLite/IronPython.SQLite.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/IronPython.Wpf/IronPython.Wpf.csproj b/Src/IronPython.Wpf/IronPython.Wpf.csproj index fdf6d575d..949760015 100644 --- a/Src/IronPython.Wpf/IronPython.Wpf.csproj +++ b/Src/IronPython.Wpf/IronPython.Wpf.csproj @@ -23,7 +23,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj index d0699b76c..69eae539d 100644 --- a/Src/IronPython/IronPython.csproj +++ b/Src/IronPython/IronPython.csproj @@ -46,11 +46,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonCompiler/IronPythonCompiler.csproj b/Src/IronPythonCompiler/IronPythonCompiler.csproj index 70d7494f3..dbfe4eb1f 100644 --- a/Src/IronPythonCompiler/IronPythonCompiler.csproj +++ b/Src/IronPythonCompiler/IronPythonCompiler.csproj @@ -28,7 +28,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj index 286c8239a..e6f965e56 100644 --- a/Src/IronPythonConsole/IronPythonConsole.csproj +++ b/Src/IronPythonConsole/IronPythonConsole.csproj @@ -38,7 +38,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj index 0b689b3b6..d2ffd95aa 100644 --- a/Src/IronPythonTest/IronPythonTest.csproj +++ b/Src/IronPythonTest/IronPythonTest.csproj @@ -42,7 +42,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Src/IronPythonWindow/IronPythonWindow.csproj b/Src/IronPythonWindow/IronPythonWindow.csproj index 53d3262be..e30d24575 100644 --- a/Src/IronPythonWindow/IronPythonWindow.csproj +++ b/Src/IronPythonWindow/IronPythonWindow.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 561c1221fe2b4486c3e2e861df72797aca9c58ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Lozier?= Date: Wed, 11 Dec 2019 20:23:49 -0500 Subject: [PATCH 2/2] Update NuGet packages --- Src/DLR | 2 +- Src/IronPython.Modules/IronPython.Modules.csproj | 2 +- Src/IronPython.Modules/_socket.cs | 6 ++++++ Src/IronPython.Modules/zlib/ZlibModule.cs | 2 +- Src/IronPython/IronPython.csproj | 2 +- Src/IronPythonCompiler/IronPythonCompiler.csproj | 2 +- Src/IronPythonConsole/IronPythonConsole.csproj | 2 +- Src/IronPythonTest/IronPythonTest.csproj | 2 +- Src/IronPythonWindow/IronPythonWindow.csproj | 2 +- 9 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Src/DLR b/Src/DLR index b7902d1c8..19ef3b59c 160000 --- a/Src/DLR +++ b/Src/DLR @@ -1 +1 @@ -Subproject commit b7902d1c86fc55362befea653e5546db94a76945 +Subproject commit 19ef3b59c9f5a0255ee1286a897095ba00773c3e diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj index c71c5003d..bad5b3417 100644 --- a/Src/IronPython.Modules/IronPython.Modules.csproj +++ b/Src/IronPython.Modules/IronPython.Modules.csproj @@ -27,7 +27,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPython.Modules/_socket.cs b/Src/IronPython.Modules/_socket.cs index 307ecf6be..f697d4379 100644 --- a/Src/IronPython.Modules/_socket.cs +++ b/Src/IronPython.Modules/_socket.cs @@ -2377,6 +2377,7 @@ private static SslProtocols GetProtocolType(int type) { SslProtocols result = SslProtocols.None; switch (type & ~PythonSsl.OP_NO_ALL) { +#pragma warning disable CA5397 // Do not use deprecated SslProtocols values #pragma warning disable CS0618 // Type or member is obsolete case PythonSsl.PROTOCOL_SSLv2: result = SslProtocols.Ssl2; @@ -2394,6 +2395,7 @@ private static SslProtocols GetProtocolType(int type) { case PythonSsl.PROTOCOL_TLSv1_1: result = SslProtocols.Tls11; break; +#pragma warning restore CA5397 // Do not use deprecated SslProtocols values case PythonSsl.PROTOCOL_TLSv1_2: result = SslProtocols.Tls12; break; @@ -2401,6 +2403,7 @@ private static SslProtocols GetProtocolType(int type) { throw new InvalidOperationException("bad ssl protocol type: " + type); } // Filter out requested protocol exclusions: +#pragma warning disable CA5397 // Do not use deprecated SslProtocols values #pragma warning disable CS0618 // Type or member is obsolete result &= (type & PythonSsl.OP_NO_SSLv3) != 0 ? ~SslProtocols.Ssl3 : ~SslProtocols.None; result &= (type & PythonSsl.OP_NO_SSLv2) != 0 ? ~SslProtocols.Ssl2 : ~SslProtocols.None; @@ -2408,6 +2411,7 @@ private static SslProtocols GetProtocolType(int type) { result &= (type & PythonSsl.OP_NO_TLSv1) != 0 ? ~SslProtocols.Tls : ~SslProtocols.None; result &= (type & PythonSsl.OP_NO_TLSv1_1) != 0 ? ~SslProtocols.Tls11 : ~SslProtocols.None; result &= (type & PythonSsl.OP_NO_TLSv1_2) != 0 ? ~SslProtocols.Tls12 : ~SslProtocols.None; +#pragma warning restore CA5397 // Do not use deprecated SslProtocols values return result; } @@ -2424,11 +2428,13 @@ public PythonTuple cipher() { private string ProtocolToPython() { switch (_sslStream.SslProtocol) { +#pragma warning disable CA5397 // Do not use deprecated SslProtocols values #pragma warning disable CS0618 // Type or member is obsolete case SslProtocols.Ssl2: return "SSLv2"; case SslProtocols.Ssl3: return "TLSv1/SSLv3"; #pragma warning restore CS0618 // Type or member is obsolete case SslProtocols.Tls: return "TLSv1"; +#pragma warning restore CA5397 // Do not use deprecated SslProtocols values default: return _sslStream.SslProtocol.ToString(); } } diff --git a/Src/IronPython.Modules/zlib/ZlibModule.cs b/Src/IronPython.Modules/zlib/ZlibModule.cs index 0d81dd388..259a2dbfe 100644 --- a/Src/IronPython.Modules/zlib/ZlibModule.cs +++ b/Src/IronPython.Modules/zlib/ZlibModule.cs @@ -75,7 +75,7 @@ An optional starting value can be specified. The returned checksum is a signed integer.")] public static int adler32([BytesConversion]IList data, long baseValue=1L) { - return (int)Adler32.GetAdler32Checksum(baseValue, data.ToArray(), 0, data.Count()); + return (int)Adler32.GetAdler32Checksum(baseValue, data.ToArray(), 0, data.Count); } [Documentation(@"crc32(string[, start]) -- Compute a CRC-32 checksum of string. diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj index 69eae539d..f3c93e444 100644 --- a/Src/IronPython/IronPython.csproj +++ b/Src/IronPython/IronPython.csproj @@ -51,7 +51,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonCompiler/IronPythonCompiler.csproj b/Src/IronPythonCompiler/IronPythonCompiler.csproj index dbfe4eb1f..78684de8c 100644 --- a/Src/IronPythonCompiler/IronPythonCompiler.csproj +++ b/Src/IronPythonCompiler/IronPythonCompiler.csproj @@ -32,7 +32,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj index e6f965e56..8c5424d84 100644 --- a/Src/IronPythonConsole/IronPythonConsole.csproj +++ b/Src/IronPythonConsole/IronPythonConsole.csproj @@ -42,7 +42,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj index d2ffd95aa..ddea5a0fb 100644 --- a/Src/IronPythonTest/IronPythonTest.csproj +++ b/Src/IronPythonTest/IronPythonTest.csproj @@ -15,7 +15,7 @@ - + diff --git a/Src/IronPythonWindow/IronPythonWindow.csproj b/Src/IronPythonWindow/IronPythonWindow.csproj index e30d24575..a2f88e12d 100644 --- a/Src/IronPythonWindow/IronPythonWindow.csproj +++ b/Src/IronPythonWindow/IronPythonWindow.csproj @@ -23,7 +23,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers