Skip to content

Commit 7f76163

Browse files
slozierslozier
authored
Remove .NET 5 (#1482)
1 parent 69434be commit 7f76163

17 files changed

Lines changed: 30 additions & 98 deletions

File tree

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
uses: actions/setup-dotnet@v1
2828
with:
2929
dotnet-version: '3.1.x'
30-
- name: Setup .NET 5.0
31-
uses: actions/setup-dotnet@v1
32-
with:
33-
dotnet-version: '5.0.x'
3430
- name: Setup .NET 6.0
3531
uses: actions/setup-dotnet@v1
3632
with:
@@ -58,9 +54,6 @@ jobs:
5854
- name: Test (netcoreapp3.1)
5955
run: ./make.ps1 -frameworks netcoreapp3.1 test-all
6056
shell: pwsh
61-
- name: Test (net5.0)
62-
run: ./make.ps1 -frameworks net5.0 test-all
63-
shell: pwsh
6457
- name: Test (net6.0)
6558
run: ./make.ps1 -frameworks net6.0 test-all
6659
shell: pwsh

‎Build/net5.0-windows.props‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Build/net5.0.props‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎Build/steps.yml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ steps:
3737
version: '3.1.x'
3838

3939
- task: UseDotNet@2
40-
displayName: Install .NET Core 5.0 runtime for testing
41-
inputs:
42-
packageType: 'runtime'
43-
version: '5.0.x'
44-
45-
- task: UseDotNet@2
46-
displayName: Install .NET Core 6.0 SDK for build
40+
displayName: Install .NET 6.0 SDK for build
4741
inputs:
4842
packageType: 'sdk'
4943
version: '6.0.x'

‎IronPython.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{17737ACB
3535
ProjectSection(SolutionItems) = preProject
3636
Build\After.targets = Build\After.targets
3737
Build\net46.props = Build\net46.props
38-
Build\net5.0-windows.props = Build\net5.0-windows.props
39-
Build\net5.0.props = Build\net5.0.props
38+
Build\net6.0-windows.props = Build\net6.0-windows.props
39+
Build\net6.0.props = Build\net6.0.props
4040
Build\netcoreapp2.1.props = Build\netcoreapp2.1.props
4141
Build\netcoreapp3.1.props = Build\netcoreapp3.1.props
4242
Build\netstandard2.0.props = Build\netstandard2.0.props

‎Package/nuget/IronPython.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
</dependencies>
3939
</metadata>
4040
<files>
41-
<file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;netcoreapp2.1\**\*;net5.0*\**\*" />
42-
<file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;netcoreapp2.1\**\*;net5.0*\**\*" />
43-
<file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;netcoreapp2.1\**\*;net5.0*\**\*" />
41+
<file src="**\IronPython*.dll" target="lib" exclude="**\IronPythonTest.dll;**\DLLs\*.dll;netcoreapp2.1\**\*;net7.0*\**\*" />
42+
<file src="**\IronPython*.pdb" target="lib" exclude="**\IronPythonTest.pdb;**\DLLs\*.pdb;netcoreapp2.1\**\*;net7.0*\**\*" />
43+
<file src="**\IronPython*.xml" target="lib" exclude="**\IronPythonTest.xml;**\DLLs\*.xml;netcoreapp2.1\**\*;net7.0*\**\*" />
4444
<file src="LICENSE;README.md" />
4545
</files>
4646
</package>

‎Package/zip/Zip.Packaging.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MakeDir Directories="$(PackageDir)" Condition="!Exists('$(PackageDir)')"/>
55

66
<ItemGroup>
7-
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\**\IronPythonTest.*;$(StageDir)\**\*.pdb;$(StageDir)\netcoreapp2.1\**\*;$(StageDir)\net5.0*\**\*" />
7+
<ZipFiles Include="$(StageDir)\**\*.*" Exclude="$(StageDir)\**\IronPythonTest.*;$(StageDir)\**\*.pdb;$(StageDir)\netcoreapp2.1\**\*;$(StageDir)\net7.0*\**\*" />
88
</ItemGroup>
99
<Zip Files="@(ZipFiles)" ZipFileName="$(PackageDir)\IronPython.$(PackageVersion).zip" WorkingDirectory="$(StageDir)" />
1010

‎Src/IronPython.Modules/IronPython.Modules.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netcoreapp3.1;netstandard2.0;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netcoreapp3.1;netstandard2.0;net6.0</TargetFrameworks>
55
<BaseAddress>885063680</BaseAddress>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -40,10 +40,6 @@
4040
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
4141
</ItemGroup>
4242

43-
<ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
44-
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0 " />
45-
</ItemGroup>
46-
4743
<Import Project="$(AfterTargetFiles)" />
4844
<Target Name="AfterBuildEnds" AfterTargets="AfterBuild" DependsOnTargets="$(AfterTargets)" />
4945

‎Src/IronPython.Modules/_ssl.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public void set_ecdh_curve(CodeContext context, [NotNone] Bytes curve) {
199199
public void load_cert_chain(CodeContext context, string certfile, string keyfile = null, object password = null) {
200200
if (keyfile is not null) throw new NotImplementedException(nameof(keyfile));
201201
if (password is not null) throw new NotImplementedException(nameof(password));
202-
#if NET5_0_OR_GREATER
202+
#if NET
203203
_cert = X509Certificate2.CreateFromPemFile(certfile, keyfile);
204204
#else
205205
_cert = ReadCertificate(context, certfile, readKey: true);
@@ -224,7 +224,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str
224224
} else {
225225
throw PythonOps.TypeError("cafile should be a valid filesystem path");
226226
}
227-
#if NET5_0_OR_GREATER
227+
#if NET
228228
_cert_store.ImportFromPemFile(_cafile);
229229
#else
230230
_cert_store.Add(ReadCertificate(context, _cafile));
@@ -239,7 +239,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str
239239
if (cadata is string s) {
240240
if (!StringOps.TryEncodeAscii(s, out Bytes ascii))
241241
throw PythonOps.ValueError("cadata should be an ASCII string or a bytes-like object");
242-
#if NET5_0_OR_GREATER
242+
#if NET
243243
_cert_store.ImportFromPem(s);
244244
#else
245245
string line;
@@ -254,7 +254,7 @@ public void load_verify_locations(CodeContext context, object cafile = null, str
254254
using IPythonBuffer buf = cabuf.GetBuffer();
255255
var contents = buf.AsReadOnlySpan();
256256
while (contents.Length > 0) {
257-
#if NET5_0_OR_GREATER
257+
#if NET
258258
var cert = new X509Certificate2(contents);
259259
#else
260260
var cert = new X509Certificate2(contents.ToArray());
@@ -949,7 +949,7 @@ private static PythonTuple IssuerFieldToPython(CodeContext context, string p) {
949949
}
950950

951951
private static X509Certificate2 ReadCertificate(CodeContext context, string filename, bool readKey = false) {
952-
#if NET5_0_OR_GREATER
952+
#if NET
953953
if (readKey) {
954954
return X509Certificate2.CreateFromPemFile(filename);
955955
}

‎Src/IronPython.SQLite/IronPython.SQLite.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>net46;netcoreapp3.1;netstandard2.0;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net46;netcoreapp3.1;netstandard2.0;net6.0</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<SQLiteCommon>SQLITE_DEBUG;TRUE;WIN32;_MSC_VER;SQLITE_ASCII;SQLITE_MEM_POOL;SQLITE_ENABLE_COLUMN_METADATA;SQLITE_OS_WIN;SQLITE_SYSTEM_MALLOC;VDBE_PROFILE_OFF</SQLiteCommon>
77
<SQLiteCommonOmit>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</SQLiteCommonOmit>

0 commit comments

Comments
 (0)