Skip to content

Commit d55e5ec

Browse files
thalterthalter
committed
Remove unsupported .NET frameworks
1 parent ee1ba08 commit d55e5ec

File tree

17 files changed

+55
-105
lines changed

17 files changed

+55
-105
lines changed

‎FubarDev.FtpServer.sln

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.28516.95
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.2.32602.215
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FubarDev.FtpServer", "src\FubarDev.FtpServer\FubarDev.FtpServer.csproj", "{01EBBF94-7469-43A0-A618-07FB734B163F}"
77
EndProject
@@ -10,13 +10,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.dockerignore = .dockerignore
1111
.editorconfig = .editorconfig
1212
azure-pipelines.yml = azure-pipelines.yml
13+
DotNetSdkMono.props = DotNetSdkMono.props
1314
FubarDev.FtpServer.ruleset = FubarDev.FtpServer.ruleset
1415
Global.props = Global.props
1516
LICENSE.md = LICENSE.md
1617
PackageLibrary.props = PackageLibrary.props
1718
README.md = README.md
1819
stylecop.json = stylecop.json
19-
DotNetSdkMono.props = DotNetSdkMono.props
2020
EndProjectSection
2121
EndProject
2222
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FubarDev.FtpServer.FileSystem.DotNet", "src\FubarDev.FtpServer.FileSystem.DotNet\FubarDev.FtpServer.FileSystem.DotNet.csproj", "{9A83C6F5-378B-48B3-B32A-151DB90B390C}"
@@ -70,12 +70,6 @@ EndProject
7070
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReadLine", "third-party\ReadLine\ReadLine.shproj", "{F68F448F-E8A4-4536-9A83-12018B6294B0}"
7171
EndProject
7272
Global
73-
GlobalSection(SharedMSBuildProjectFiles) = preSolution
74-
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{52126b62-de83-4597-a832-d144f9a5a870}*SharedItemsImports = 13
75-
third-party\DotNet.Glob\DotNet.Glob.projitems*{a45290b4-20f7-48e9-8543-c69240bfb9f8}*SharedItemsImports = 13
76-
third-party\ReadLine\ReadLine.projitems*{f68f448f-e8a4-4536-9a83-12018b6294b0}*SharedItemsImports = 13
77-
third-party\GnuSslStream\GnuSslStream.projitems*{fd524518-e097-4ac0-aac8-d5ea24f31545}*SharedItemsImports = 13
78-
EndGlobalSection
7973
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8074
Debug|Any CPU = Debug|Any CPU
8175
Release|Any CPU = Release|Any CPU
@@ -176,4 +170,17 @@ Global
176170
GlobalSection(ExtensibilityGlobals) = postSolution
177171
SolutionGuid = {DAA7D00E-C61D-4640-A54E-D307E4682263}
178172
EndGlobalSection
173+
GlobalSection(SharedMSBuildProjectFiles) = preSolution
174+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{01ebbf94-7469-43a0-a618-07fb734b163f}*SharedItemsImports = 5
175+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{37ce4218-fac3-4201-82a0-54945698c6ad}*SharedItemsImports = 5
176+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{474bd381-5b80-4580-bfb1-d41beb70c458}*SharedItemsImports = 5
177+
third-party\ReadLine\ReadLine.projitems*{4bda38ca-a19d-4ba9-ac7e-e0b091b3770d}*SharedItemsImports = 5
178+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{52126b62-de83-4597-a832-d144f9a5a870}*SharedItemsImports = 13
179+
third-party\DotNet.Glob\DotNet.Glob.projitems*{7e3f81e2-764e-4075-992f-e53bf50f9623}*SharedItemsImports = 5
180+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{9a83c6f5-378b-48b3-b32a-151db90b390c}*SharedItemsImports = 5
181+
third-party\DotNet.Glob\DotNet.Glob.projitems*{a45290b4-20f7-48e9-8543-c69240bfb9f8}*SharedItemsImports = 13
182+
src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{e763936d-dd8d-4392-8075-ca26d7f2ba1e}*SharedItemsImports = 5
183+
third-party\ReadLine\ReadLine.projitems*{f68f448f-e8a4-4536-9a83-12018b6294b0}*SharedItemsImports = 13
184+
third-party\GnuSslStream\GnuSslStream.projitems*{fd524518-e097-4ac0-aac8-d5ea24f31545}*SharedItemsImports = 13
185+
EndGlobalSection
179186
EndGlobal

‎samples/QuickStart.AspNetCoreHost/QuickStart.AspNetCoreHost.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.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
<IsPackable>false</IsPackable>
77
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

‎samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
88
</PropertyGroup>

‎samples/QuickStart/QuickStart.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net461</TargetFramework>
5+
<TargetFramework>net48</TargetFramework>
66
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>

‎samples/TestFtpServer.Api/TestFtpServer.Api.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="../../Global.props" />
33

44
<PropertyGroup>
5-
<TargetFramework>netstandard1.3</TargetFramework>
5+
<TargetFramework>netstandard2.0</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

‎samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="../../Global.props" />
44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>net5.0</TargetFramework>
6+
<TargetFramework>net6.0</TargetFramework>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99
<ItemGroup>
@@ -17,7 +17,7 @@
1717
</ItemGroup>
1818
<ItemGroup>
1919
<PackageReference Include="JKang.IpcServiceFramework.Client" Version="2.2.2" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
2121
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
2222
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
2323
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />

‎samples/TestFtpServer/TestFtpServer.csproj

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="../../Global.props" />
44
<PropertyGroup>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<OutputType>Exe</OutputType>
77
<AssemblyName>ftpserver</AssemblyName>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<PackageReference Include="JKang.IpcServiceFramework.Server" Version="2.2.2" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.0.0" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
18-
<PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />
19-
<PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
20-
<PackageReference Include="Serilog" Version="2.9.0" />
21-
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
22-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
11+
<PackageReference Include="JKang.IpcServiceFramework.Server" Version="2.3.1" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
16+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
17+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
18+
<PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2" />
19+
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
20+
<PackageReference Include="Serilog" Version="2.11.0" />
21+
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
22+
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\..\src\FubarDev.FtpServer.FileSystem.DotNet\FubarDev.FtpServer.FileSystem.DotNet.csproj" />
@@ -29,7 +29,7 @@
2929
<ProjectReference Include="..\..\src\FubarDev.FtpServer\FubarDev.FtpServer.csproj" />
3030
<ProjectReference Include="..\TestFtpServer.Api\TestFtpServer.Api.csproj" />
3131
</ItemGroup>
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'net5.0' ">
32+
<ItemGroup>
3333
<ProjectReference Include="..\..\src\FubarDev.FtpServer.FileSystem.Unix\FubarDev.FtpServer.FileSystem.Unix.csproj" />
3434
<ProjectReference Include="..\..\src\FubarDev.FtpServer.MembershipProvider.Pam\FubarDev.FtpServer.MembershipProvider.Pam.csproj" />
3535
</ItemGroup>

‎src/FubarDev.FtpServer.Abstractions/FubarDev.FtpServer.Abstractions.csproj

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;net461;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55
<Description>Interfaces for the portable FTP server</Description>
66
<RootNamespace>FubarDev.FtpServer</RootNamespace>
77
<PackageTags>portable;FTP;server</PackageTags>
88
</PropertyGroup>
9-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
10-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
11-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
12-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
13-
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.0.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
16-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
18-
<PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
19-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
20-
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="1.0.0" />
21-
</ItemGroup>
229
<ItemGroup>
23-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
24-
<PackageReference Include="NGettext" Version="0.6.3" />
25-
<PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
10+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
11+
<PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
13+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
14+
<PackageReference Include="NGettext" Version="0.6.7" />
15+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
2616
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
27-
<PackageReference Include="System.Threading.Channels" Version="4.5.0" />
17+
<PackageReference Include="System.Threading.Channels" Version="6.0.0" />
2818
</ItemGroup>
2919
<Import Project="..\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems" Label="Shared" />
3020
<Import Project="../../PackageLibrary.props" />

‎src/FubarDev.FtpServer.Commands/FubarDev.FtpServer.Commands.csproj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.3;netstandard2.0;net461;netstandard2.1</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
44
<Description>Commands for the portable FTP server</Description>
55
<RootNamespace>FubarDev.FtpServer</RootNamespace>
66
<PackageTags>portable;FTP;server</PackageTags>
@@ -9,14 +9,8 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
1111
</ItemGroup>
12-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
13-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
17-
</ItemGroup>
1812
<ItemGroup>
19-
<PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
13+
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
2014
</ItemGroup>
2115
<Import Project="..\..\third-party\DotNet.Glob\DotNet.Glob.projitems" Label="Shared" />
2216
</Project>

‎src/FubarDev.FtpServer.FileSystem.DotNet/FubarDev.FtpServer.FileSystem.DotNet.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55
<Description>.NET file system for portable FTP server</Description>
66
<PackageTags>file;system;portable;FTP;server</PackageTags>
77
</PropertyGroup>
8-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
9-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
10-
</ItemGroup>
11-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
12-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
13-
</ItemGroup>
148
<ItemGroup>
159
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
1610
</ItemGroup>

‎src/FubarDev.FtpServer.FileSystem.GoogleDrive/FubarDev.FtpServer.FileSystem.GoogleDrive.csproj

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55
<Description>Google Drive file system for the portable FTP server</Description>
66
<PackageTags>portable;FTP;server;Google;Drive</PackageTags>
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Google.Apis.Drive.v3" Version="1.39.0.1566" />
1010
</ItemGroup>
11-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
12-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
13-
</ItemGroup>
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
15-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
16-
</ItemGroup>
17-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
18-
<PackageReference Include="System.ValueTuple" Version="4.3.0" />
19-
</ItemGroup>
2011
<ItemGroup>
2112
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
2213
</ItemGroup>

‎src/FubarDev.FtpServer.FileSystem.InMemory/FubarDev.FtpServer.FileSystem.InMemory.csproj

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
44
<Description>In-memory file system for portable FTP server</Description>
55
<PackageTags>file;system;portable;FTP;server</PackageTags>
66
</PropertyGroup>
7-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
8-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
9-
</ItemGroup>
10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
11-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
12-
</ItemGroup>
137
<ItemGroup>
148
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
159
</ItemGroup>

‎src/FubarDev.FtpServer.FileSystem.S3/FubarDev.FtpServer.FileSystem.S3.csproj

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;net461</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55
<Description>S3 file system for portable FTP server</Description>
66
<PackageTags>portable;FTP;server;AWS;S3</PackageTags>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="AWSSDK.S3" Version="3.3.104.33" />
1111
</ItemGroup>
12-
<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
13-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
14-
</ItemGroup>
15-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
17-
</ItemGroup>
18-
1912
<ItemGroup>
2013
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
2114
</ItemGroup>

‎src/FubarDev.FtpServer.FileSystem.Unix/FubarDev.FtpServer.FileSystem.Unix.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88
<ItemGroup>
99
<PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
10-
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
10+
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />

‎src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="../../PackageLibrary.props" />
44

55
<PropertyGroup>
6-
<TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
6+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
77
<Description>PAM membership provider for portable FTP server</Description>
88
<PackageTags>pam;membership;portable;FTP;server</PackageTags>
99
</PropertyGroup>

‎src/FubarDev.FtpServer/FubarDev.FtpServer.csproj

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.0;net461;net47;netstandard2.1;netcoreapp3.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
55
<Description>TCP-based FTP server implementation</Description>
66
<PackageTags>portable;FTP;server</PackageTags>
77
</PropertyGroup>
8-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
9-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
10-
<DefineConstants>USE_GNU_SSL_STREAM;$(DefineConstants)</DefineConstants>
11-
</PropertyGroup>
12-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net47' ">
13-
<DefineConstants>USE_SYNC_SSL_STREAM;$(DefineConstants)</DefineConstants>
14-
</PropertyGroup>
158
<ItemGroup>
169
<PackageReference Include="Scrutor" Version="2.0.0" />
17-
<PackageReference Include="System.IO.Pipelines" Version="4.5.1" />
18-
</ItemGroup>
19-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
20-
<PackageReference Include="System.Net.Security" Version="4.0.1" />
21-
<PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
22-
<PackageReference Include="System.Threading.Thread" Version="4.3.0" />
10+
<PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
2311
</ItemGroup>
2412
<ItemGroup>
2513
<ProjectReference Include="..\FubarDev.FtpServer.Commands\FubarDev.FtpServer.Commands.csproj" />
2614
</ItemGroup>
27-
<Import Project="..\..\third-party\GnuSslStream\GnuSslStream.projitems" Label="Shared" Condition=" '$(TargetFramework)' == 'net461' " />
2815
<Import Project="..\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems" Label="Shared" />
2916
<Import Project="../../PackageLibrary.props" />
3017
</Project>

‎test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77
<ItemGroup>

0 commit comments

Comments
 (0)