diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ccce06941..d40dbcd36 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,10 +27,6 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '3.1.x' - - name: Setup .NET 5.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '5.0.x' - name: Setup .NET 6.0 uses: actions/setup-dotnet@v1 with: @@ -58,9 +54,6 @@ jobs: - name: Test (netcoreapp3.1) run: ./make.ps1 -frameworks netcoreapp3.1 test-all shell: pwsh - - name: Test (net5.0) - run: ./make.ps1 -frameworks net5.0 test-all - shell: pwsh - name: Test (net6.0) run: ./make.ps1 -frameworks net6.0 test-all shell: pwsh diff --git a/Build/net5.0-windows.props b/Build/net5.0-windows.props deleted file mode 100644 index 798140847..000000000 --- a/Build/net5.0-windows.props +++ /dev/null @@ -1,9 +0,0 @@ - - - false - $(BaseIntermediateOutputPath)$(Configuration)\net5.0 - $(BaseOutputPath)\net5.0 - - - - diff --git a/Build/net5.0.props b/Build/net5.0.props deleted file mode 100644 index fc4a24e1f..000000000 --- a/Build/net5.0.props +++ /dev/null @@ -1,42 +0,0 @@ - - - - false - - - - $(Features);FEATURE_APARTMENTSTATE - $(Features);FEATURE_ASSEMBLY_GETFORWARDEDTYPES - $(Features);FEATURE_ASSEMBLY_RESOLVE - $(Features);FEATURE_ASSEMBLYBUILDER_DEFINEDYNAMICASSEMBLY - $(Features);FEATURE_BASIC_CONSOLE - $(Features);FEATURE_CODEDOM - $(Features);FEATURE_COM - $(Features);FEATURE_CONFIGURATION - $(Features);FEATURE_CTYPES - $(Features);FEATURE_CUSTOM_TYPE_DESCRIPTOR - $(Features);FEATURE_DYNAMIC_EXPRESSION_VISITOR - $(Features);FEATURE_EXCEPTION_STATE - $(Features);FEATURE_FILESYSTEM - $(Features);FEATURE_FULL_CONSOLE - $(Features);FEATURE_FULL_CRYPTO - $(Features);FEATURE_FULL_NET - $(Features);FEATURE_LCG - $(Features);FEATURE_LOADWITHPARTIALNAME - $(Features);FEATURE_METADATA_READER - $(Features);FEATURE_MMAP - $(Features);FEATURE_NATIVE - $(Features);FEATURE_OSPLATFORMATTRIBUTE - $(Features);FEATURE_PIPES - $(Features);FEATURE_PROCESS - $(Features);FEATURE_REFEMIT - $(Features);FEATURE_REGISTRY - $(Features);FEATURE_RUNTIMEINFORMATION - $(Features);FEATURE_SECURITY_RULES - $(Features);FEATURE_SERIALIZATION - $(Features);FEATURE_STACK_TRACE - $(Features);FEATURE_SYNC_SOCKETS - $(Features);FEATURE_THREAD - $(Features);FEATURE_XMLDOC - - diff --git a/Build/steps.yml b/Build/steps.yml index 10998dd08..97d269b15 100644 --- a/Build/steps.yml +++ b/Build/steps.yml @@ -37,13 +37,7 @@ steps: version: '3.1.x' - task: UseDotNet@2 - displayName: Install .NET Core 5.0 runtime for testing - inputs: - packageType: 'runtime' - version: '5.0.x' - - - task: UseDotNet@2 - displayName: Install .NET Core 6.0 SDK for build + displayName: Install .NET 6.0 SDK for build inputs: packageType: 'sdk' version: '6.0.x' diff --git a/IronPython.sln b/IronPython.sln index 015b418ef..58d7156bd 100644 --- a/IronPython.sln +++ b/IronPython.sln @@ -35,8 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB ProjectSection(SolutionItems) = preProject Build\After.targets = Build\After.targets Build\net46.props = Build\net46.props - Build\net5.0-windows.props = Build\net5.0-windows.props - Build\net5.0.props = Build\net5.0.props + Build\net6.0-windows.props = Build\net6.0-windows.props + Build\net6.0.props = Build\net6.0.props Build\netcoreapp2.1.props = Build\netcoreapp2.1.props Build\netcoreapp3.1.props = Build\netcoreapp3.1.props Build\netstandard2.0.props = Build\netstandard2.0.props diff --git a/Package/nuget/IronPython.nuspec b/Package/nuget/IronPython.nuspec index cbc81dbe4..6e019c7db 100644 --- a/Package/nuget/IronPython.nuspec +++ b/Package/nuget/IronPython.nuspec @@ -38,9 +38,9 @@ - - - + + + diff --git a/Package/zip/Zip.Packaging.targets b/Package/zip/Zip.Packaging.targets index 9988f5625..24f52ac3c 100644 --- a/Package/zip/Zip.Packaging.targets +++ b/Package/zip/Zip.Packaging.targets @@ -4,7 +4,7 @@ - + diff --git a/Src/IronPython.Modules/IronPython.Modules.csproj b/Src/IronPython.Modules/IronPython.Modules.csproj index 19f468a47..e7829a3d3 100644 --- a/Src/IronPython.Modules/IronPython.Modules.csproj +++ b/Src/IronPython.Modules/IronPython.Modules.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp3.1;netstandard2.0;net5.0;net6.0 + net46;netcoreapp3.1;netstandard2.0;net6.0 885063680 true true @@ -40,10 +40,6 @@ - - - - diff --git a/Src/IronPython.Modules/_ssl.cs b/Src/IronPython.Modules/_ssl.cs index 64a963f6f..9714a6285 100644 --- a/Src/IronPython.Modules/_ssl.cs +++ b/Src/IronPython.Modules/_ssl.cs @@ -199,7 +199,7 @@ public void set_ecdh_curve(CodeContext context, [NotNone] Bytes curve) { public void load_cert_chain(CodeContext context, string certfile, string keyfile = null, object password = null) { if (keyfile is not null) throw new NotImplementedException(nameof(keyfile)); if (password is not null) throw new NotImplementedException(nameof(password)); -#if NET5_0_OR_GREATER +#if NET _cert = X509Certificate2.CreateFromPemFile(certfile, keyfile); #else _cert = ReadCertificate(context, certfile, readKey: true); @@ -224,7 +224,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str } else { throw PythonOps.TypeError("cafile should be a valid filesystem path"); } -#if NET5_0_OR_GREATER +#if NET _cert_store.ImportFromPemFile(_cafile); #else _cert_store.Add(ReadCertificate(context, _cafile)); @@ -239,7 +239,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str if (cadata is string s) { if (!StringOps.TryEncodeAscii(s, out Bytes ascii)) throw PythonOps.ValueError("cadata should be an ASCII string or a bytes-like object"); -#if NET5_0_OR_GREATER +#if NET _cert_store.ImportFromPem(s); #else string line; @@ -254,7 +254,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str using IPythonBuffer buf = cabuf.GetBuffer(); var contents = buf.AsReadOnlySpan(); while (contents.Length > 0) { -#if NET5_0_OR_GREATER +#if NET var cert = new X509Certificate2(contents); #else var cert = new X509Certificate2(contents.ToArray()); @@ -949,7 +949,7 @@ private static PythonTuple IssuerFieldToPython(CodeContext context, string p) { } private static X509Certificate2 ReadCertificate(CodeContext context, string filename, bool readKey = false) { -#if NET5_0_OR_GREATER +#if NET if (readKey) { return X509Certificate2.CreateFromPemFile(filename); } diff --git a/Src/IronPython.SQLite/IronPython.SQLite.csproj b/Src/IronPython.SQLite/IronPython.SQLite.csproj index 4305dbbd3..4e104f9d8 100644 --- a/Src/IronPython.SQLite/IronPython.SQLite.csproj +++ b/Src/IronPython.SQLite/IronPython.SQLite.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp3.1;netstandard2.0;net5.0;net6.0 + net46;netcoreapp3.1;netstandard2.0;net6.0 true SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF SQLITE_OMIT_AUTHORIZATION;SQLITE_OMIT_DEPRECATED;SQLITE_OMIT_GET_TABLE;SQLITE_OMIT_INCRBLOB;SQLITE_OMIT_LOOKASIDE;SQLITE_OMIT_SHARED_CACHE;SQLITE_OMIT_UTF16;SQLITE_OMIT_WAL diff --git a/Src/IronPython.Wpf/IronPython.Wpf.csproj b/Src/IronPython.Wpf/IronPython.Wpf.csproj index 1c164287a..ae8df8bc5 100644 --- a/Src/IronPython.Wpf/IronPython.Wpf.csproj +++ b/Src/IronPython.Wpf/IronPython.Wpf.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp3.1;net5.0-windows;net6.0-windows + net46;netcoreapp3.1;net6.0-windows true true true diff --git a/Src/IronPython/IronPython.csproj b/Src/IronPython/IronPython.csproj index 6989ea784..e419ab1fd 100644 --- a/Src/IronPython/IronPython.csproj +++ b/Src/IronPython/IronPython.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp3.1;netstandard2.0;net5.0;net6.0 + net46;netcoreapp3.1;netstandard2.0;net6.0 879755264 true true diff --git a/Src/IronPython/Lib/iptest/test_env.py b/Src/IronPython/Lib/iptest/test_env.py index b80b47dad..94006df20 100644 --- a/Src/IronPython/Lib/iptest/test_env.py +++ b/Src/IronPython/Lib/iptest/test_env.py @@ -19,8 +19,8 @@ is_netcoreapp = False is_netcoreapp21 = False is_netcoreapp31 = False -is_net50 = False is_net60 = False +is_net70 = False is_mono = False is_netstandard = False if is_ironpython: @@ -28,8 +28,8 @@ is_netcoreapp = clr.IsNetCoreApp is_netcoreapp21 = clr.FrameworkDescription.startswith(".NET Core 2.x") is_netcoreapp31 = clr.FrameworkDescription.startswith(".NET Core 3.1") - is_net50 = clr.FrameworkDescription.startswith(".NET 5.0") is_net60 = clr.FrameworkDescription.startswith(".NET 6.0") + is_net70 = clr.FrameworkDescription.startswith(".NET 7.0") is_mono = clr.IsMono is_netstandard = clr.TargetFramework.startswith(".NETStandard") @@ -43,7 +43,7 @@ if not is_ironpython: import struct ptr_size = struct.calcsize('P') - is_32, is_64 = (ptr_size == 4), (ptr_size == 8) + is_32, is_64 = (ptr_size == 4), (ptr_size == 8) #--CLR version we're running on (if any) @@ -57,7 +57,7 @@ is_net40 = version.Major == 4 is_net45 = is_net40 and version.Minor == 0 and version.Build == 30319 and version.Revision < 42000 is_net45Or46 = is_net40 and version.Minor == 0 and version.Build == 30319 - is_net46 = is_net40 and version.Minor == 0 and version.Build == 30319 and version.Revision == 42000 + is_net46 = is_net40 and version.Minor == 0 and version.Build == 30319 and version.Revision == 42000 #--Newlines if is_ironpython: @@ -73,11 +73,11 @@ #--Are we using peverify to check that all IL generated is valid? is_peverify_run = False if is_cli: - is_peverify_run = is_debug and "-X:SaveAssemblies" in System.Environment.CommandLine + is_peverify_run = is_debug and "-X:SaveAssemblies" in System.Environment.CommandLine #--We only run certain time consuming test cases in the stress lab is_stress = False -# if get_env_var("THISISSTRESS")!=None: +# if get_env_var("THISISSTRESS")!=None: # is_stress = True #------------------------------------------------------------------------------ diff --git a/Src/IronPythonConsole/IronPythonConsole.csproj b/Src/IronPythonConsole/IronPythonConsole.csproj index 7ab572c34..85d2b00af 100644 --- a/Src/IronPythonConsole/IronPythonConsole.csproj +++ b/Src/IronPythonConsole/IronPythonConsole.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 + net46;netcoreapp2.1;netcoreapp3.1;net6.0 false Exe diff --git a/Src/IronPythonTest/IronPythonTest.csproj b/Src/IronPythonTest/IronPythonTest.csproj index 8d5c7a0ff..5072a86b6 100644 --- a/Src/IronPythonTest/IronPythonTest.csproj +++ b/Src/IronPythonTest/IronPythonTest.csproj @@ -1,7 +1,7 @@  - net46;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0 + net46;netcoreapp2.1;netcoreapp3.1;net6.0 false diff --git a/Tests/test_codecs_stdlib.py b/Tests/test_codecs_stdlib.py index 680007a80..37506eec4 100644 --- a/Tests/test_codecs_stdlib.py +++ b/Tests/test_codecs_stdlib.py @@ -10,7 +10,7 @@ import codecs import sys -from iptest import run_test, is_mono, is_netcoreapp31, is_net50, is_net60 +from iptest import run_test, is_mono, is_netcoreapp31, is_net60 import test.test_codecs @@ -28,7 +28,7 @@ def load_tests(loader, standard_tests, pattern): suite.addTest(test.test_codecs.CP65001Test('test_bug1098990_a')) suite.addTest(test.test_codecs.CP65001Test('test_bug1098990_b')) suite.addTest(test.test_codecs.CP65001Test('test_bug1175396')) - if is_netcoreapp31 or is_net50 or is_net60: + if is_netcoreapp31 or is_net60: suite.addTest(test.test_codecs.CP65001Test('test_decode')) else: suite.addTest(unittest.expectedFailure(test.test_codecs.CP65001Test('test_decode'))) # '[��]' != '[���]' (bug in .NET: dotnet/corefx#36163, fixed in .NET Core 3.x) @@ -206,7 +206,7 @@ def load_tests(loader, standard_tests, pattern): suite.addTest(test.test_codecs.UTF8SigTest('test_bug1175396')) suite.addTest(test.test_codecs.UTF8SigTest('test_bug1601501')) suite.addTest(test.test_codecs.UTF8SigTest('test_decoder_state')) - if is_netcoreapp31 or is_net50 or is_net60: + if is_netcoreapp31 or is_net60: suite.addTest(test.test_codecs.UTF8SigTest('test_lone_surrogates')) else: suite.addTest(unittest.expectedFailure(test.test_codecs.UTF8SigTest('test_lone_surrogates'))) # AssertionError: '\ud803\udfff��A' != '\ud803\udfff���A' @@ -221,7 +221,7 @@ def load_tests(loader, standard_tests, pattern): suite.addTest(test.test_codecs.UTF8Test('test_bug1098990_b')) suite.addTest(test.test_codecs.UTF8Test('test_bug1175396')) suite.addTest(test.test_codecs.UTF8Test('test_decoder_state')) - if is_netcoreapp31 or is_net50 or is_net60: + if is_netcoreapp31 or is_net60: suite.addTest(test.test_codecs.UTF8Test('test_lone_surrogates')) else: suite.addTest(unittest.expectedFailure(test.test_codecs.UTF8Test('test_lone_surrogates'))) # AssertionError: '\ud803\udfff��A' != '\ud803\udfff���A' @@ -243,7 +243,7 @@ def load_tests(loader, standard_tests, pattern): suite.addTest(test.test_codecs.WithStmtTest('test_encodedfile')) suite.addTest(test.test_codecs.WithStmtTest('test_streamreaderwriter')) return suite - + else: return loader.loadTestsFromModule(test.test_codecs, pattern) diff --git a/make.ps1 b/make.ps1 index 218eb1524..be7fdbf21 100755 --- a/make.ps1 +++ b/make.ps1 @@ -4,7 +4,7 @@ Param( [Parameter(Position=1)] [String] $target = "build", [String] $configuration = "Release", - [String[]] $frameworks=@('net46','netcoreapp2.1','netcoreapp3.1','net5.0','net6.0'), + [String[]] $frameworks=@('net46','netcoreapp2.1','netcoreapp3.1','net6.0'), [String] $platform = "x64", [switch] $runIgnored, [int] $jobs = [System.Environment]::ProcessorCount