From d55e5ecf8c2d2acc251f9e1d90942c159395f8a9 Mon Sep 17 00:00:00 2001
From: Tom Halter <email@tomhalter.com>
Date: Tue, 21 Jun 2022 16:12:43 -0400
Subject: [PATCH 1/5] Remove unsupported .NET frameworks

---
 FubarDev.FtpServer.sln                        | 25 +++++++++++------
 .../QuickStart.AspNetCoreHost.csproj          |  2 +-
 .../QuickStart.GenericHost.csproj             |  2 +-
 samples/QuickStart/QuickStart.csproj          |  2 +-
 .../TestFtpServer.Api.csproj                  |  2 +-
 .../TestFtpServer.Shell.csproj                |  4 +--
 samples/TestFtpServer/TestFtpServer.csproj    | 28 +++++++++----------
 .../FubarDev.FtpServer.Abstractions.csproj    | 26 ++++++-----------
 .../FubarDev.FtpServer.Commands.csproj        | 10 ++-----
 ...ubarDev.FtpServer.FileSystem.DotNet.csproj |  8 +-----
 ...ev.FtpServer.FileSystem.GoogleDrive.csproj | 11 +-------
 ...arDev.FtpServer.FileSystem.InMemory.csproj |  8 +-----
 .../FubarDev.FtpServer.FileSystem.S3.csproj   |  9 +-----
 .../FubarDev.FtpServer.FileSystem.Unix.csproj |  2 +-
 ...ev.FtpServer.MembershipProvider.Pam.csproj |  2 +-
 .../FubarDev.FtpServer.csproj                 | 17 ++---------
 .../FubarDev.FtpServer.Tests.csproj           |  2 +-
 17 files changed, 55 insertions(+), 105 deletions(-)

diff --git a/FubarDev.FtpServer.sln b/FubarDev.FtpServer.sln
index 50cccf0a..fef86b6c 100644
--- a/FubarDev.FtpServer.sln
+++ b/FubarDev.FtpServer.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28516.95
+# Visual Studio Version 17
+VisualStudioVersion = 17.2.32602.215
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FubarDev.FtpServer", "src\FubarDev.FtpServer\FubarDev.FtpServer.csproj", "{01EBBF94-7469-43A0-A618-07FB734B163F}"
 EndProject
@@ -10,13 +10,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
 		azure-pipelines.yml = azure-pipelines.yml
+		DotNetSdkMono.props = DotNetSdkMono.props
 		FubarDev.FtpServer.ruleset = FubarDev.FtpServer.ruleset
 		Global.props = Global.props
 		LICENSE.md = LICENSE.md
 		PackageLibrary.props = PackageLibrary.props
 		README.md = README.md
 		stylecop.json = stylecop.json
-		DotNetSdkMono.props = DotNetSdkMono.props
 	EndProjectSection
 EndProject
 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
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReadLine", "third-party\ReadLine\ReadLine.shproj", "{F68F448F-E8A4-4536-9A83-12018B6294B0}"
 EndProject
 Global
-	GlobalSection(SharedMSBuildProjectFiles) = preSolution
-		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{52126b62-de83-4597-a832-d144f9a5a870}*SharedItemsImports = 13
-		third-party\DotNet.Glob\DotNet.Glob.projitems*{a45290b4-20f7-48e9-8543-c69240bfb9f8}*SharedItemsImports = 13
-		third-party\ReadLine\ReadLine.projitems*{f68f448f-e8a4-4536-9a83-12018b6294b0}*SharedItemsImports = 13
-		third-party\GnuSslStream\GnuSslStream.projitems*{fd524518-e097-4ac0-aac8-d5ea24f31545}*SharedItemsImports = 13
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -176,4 +170,17 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DAA7D00E-C61D-4640-A54E-D307E4682263}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{01ebbf94-7469-43a0-a618-07fb734b163f}*SharedItemsImports = 5
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{37ce4218-fac3-4201-82a0-54945698c6ad}*SharedItemsImports = 5
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{474bd381-5b80-4580-bfb1-d41beb70c458}*SharedItemsImports = 5
+		third-party\ReadLine\ReadLine.projitems*{4bda38ca-a19d-4ba9-ac7e-e0b091b3770d}*SharedItemsImports = 5
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{52126b62-de83-4597-a832-d144f9a5a870}*SharedItemsImports = 13
+		third-party\DotNet.Glob\DotNet.Glob.projitems*{7e3f81e2-764e-4075-992f-e53bf50f9623}*SharedItemsImports = 5
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{9a83c6f5-378b-48b3-b32a-151db90b390c}*SharedItemsImports = 5
+		third-party\DotNet.Glob\DotNet.Glob.projitems*{a45290b4-20f7-48e9-8543-c69240bfb9f8}*SharedItemsImports = 13
+		src\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems*{e763936d-dd8d-4392-8075-ca26d7f2ba1e}*SharedItemsImports = 5
+		third-party\ReadLine\ReadLine.projitems*{f68f448f-e8a4-4536-9a83-12018b6294b0}*SharedItemsImports = 13
+		third-party\GnuSslStream\GnuSslStream.projitems*{fd524518-e097-4ac0-aac8-d5ea24f31545}*SharedItemsImports = 13
+	EndGlobalSection
 EndGlobal
diff --git a/samples/QuickStart.AspNetCoreHost/QuickStart.AspNetCoreHost.csproj b/samples/QuickStart.AspNetCoreHost/QuickStart.AspNetCoreHost.csproj
index bbf4a2c4..1fc62be7 100644
--- a/samples/QuickStart.AspNetCoreHost/QuickStart.AspNetCoreHost.csproj
+++ b/samples/QuickStart.AspNetCoreHost/QuickStart.AspNetCoreHost.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <IsPackable>false</IsPackable>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
diff --git a/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj b/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
index fb9ca4ca..c35b7979 100644
--- a/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
+++ b/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
diff --git a/samples/QuickStart/QuickStart.csproj b/samples/QuickStart/QuickStart.csproj
index c7e05360..b1558e59 100644
--- a/samples/QuickStart/QuickStart.csproj
+++ b/samples/QuickStart/QuickStart.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/samples/TestFtpServer.Api/TestFtpServer.Api.csproj b/samples/TestFtpServer.Api/TestFtpServer.Api.csproj
index 2f11fc01..c60076b3 100644
--- a/samples/TestFtpServer.Api/TestFtpServer.Api.csproj
+++ b/samples/TestFtpServer.Api/TestFtpServer.Api.csproj
@@ -2,7 +2,7 @@
   <Import Project="../../Global.props" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj b/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
index 3aedd774..bd0e48e6 100644
--- a/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
+++ b/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
@@ -3,7 +3,7 @@
   <Import Project="../../Global.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
@@ -17,7 +17,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="JKang.IpcServiceFramework.Client" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
diff --git a/samples/TestFtpServer/TestFtpServer.csproj b/samples/TestFtpServer/TestFtpServer.csproj
index 9a5438f6..4df8c40f 100644
--- a/samples/TestFtpServer/TestFtpServer.csproj
+++ b/samples/TestFtpServer/TestFtpServer.csproj
@@ -2,24 +2,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="../../Global.props" />
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AssemblyName>ftpserver</AssemblyName>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="JKang.IpcServiceFramework.Server" Version="2.2.2" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.0" />
-    <PackageReference Include="Nito.AsyncEx.Context" Version="5.0.0" />
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
-    <PackageReference Include="Serilog" Version="2.9.0" />
-    <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
+    <PackageReference Include="JKang.IpcServiceFramework.Server" Version="2.3.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="Nito.AsyncEx.Context" Version="5.1.2" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FubarDev.FtpServer.FileSystem.DotNet\FubarDev.FtpServer.FileSystem.DotNet.csproj" />
@@ -29,7 +29,7 @@
     <ProjectReference Include="..\..\src\FubarDev.FtpServer\FubarDev.FtpServer.csproj" />
     <ProjectReference Include="..\TestFtpServer.Api\TestFtpServer.Api.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.0' or '$(TargetFramework)' == 'net5.0' ">
+  <ItemGroup>
     <ProjectReference Include="..\..\src\FubarDev.FtpServer.FileSystem.Unix\FubarDev.FtpServer.FileSystem.Unix.csproj" />
     <ProjectReference Include="..\..\src\FubarDev.FtpServer.MembershipProvider.Pam\FubarDev.FtpServer.MembershipProvider.Pam.csproj" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer.Abstractions/FubarDev.FtpServer.Abstractions.csproj b/src/FubarDev.FtpServer.Abstractions/FubarDev.FtpServer.Abstractions.csproj
index e6bfa413..d58c1db1 100644
--- a/src/FubarDev.FtpServer.Abstractions/FubarDev.FtpServer.Abstractions.csproj
+++ b/src/FubarDev.FtpServer.Abstractions/FubarDev.FtpServer.Abstractions.csproj
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net461;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>Interfaces for the portable FTP server</Description>
     <RootNamespace>FubarDev.FtpServer</RootNamespace>
     <PackageTags>portable;FTP;server</PackageTags>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.0.0" />
-    <PackageReference Include="System.Dynamic.Runtime" Version="4.0.11" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="1.0.0" />
-  </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
-    <PackageReference Include="NGettext" Version="0.6.3" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="4.1.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Features" Version="5.0.17" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
+    <PackageReference Include="NGettext" Version="0.6.7" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Channels" Version="4.5.0" />
+    <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
   </ItemGroup>
   <Import Project="..\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems" Label="Shared" />
   <Import Project="../../PackageLibrary.props" />
diff --git a/src/FubarDev.FtpServer.Commands/FubarDev.FtpServer.Commands.csproj b/src/FubarDev.FtpServer.Commands/FubarDev.FtpServer.Commands.csproj
index bf87ffda..9a544a52 100644
--- a/src/FubarDev.FtpServer.Commands/FubarDev.FtpServer.Commands.csproj
+++ b/src/FubarDev.FtpServer.Commands/FubarDev.FtpServer.Commands.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net461;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>Commands for the portable FTP server</Description>
     <RootNamespace>FubarDev.FtpServer</RootNamespace>
     <PackageTags>portable;FTP;server</PackageTags>
@@ -9,14 +9,8 @@
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-  </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
   </ItemGroup>
   <Import Project="..\..\third-party\DotNet.Glob\DotNet.Glob.projitems" Label="Shared" />
 </Project>
diff --git a/src/FubarDev.FtpServer.FileSystem.DotNet/FubarDev.FtpServer.FileSystem.DotNet.csproj b/src/FubarDev.FtpServer.FileSystem.DotNet/FubarDev.FtpServer.FileSystem.DotNet.csproj
index a487c2ae..d52685ec 100644
--- a/src/FubarDev.FtpServer.FileSystem.DotNet/FubarDev.FtpServer.FileSystem.DotNet.csproj
+++ b/src/FubarDev.FtpServer.FileSystem.DotNet/FubarDev.FtpServer.FileSystem.DotNet.csproj
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>.NET file system for portable FTP server</Description>
     <PackageTags>file;system;portable;FTP;server</PackageTags>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer.FileSystem.GoogleDrive/FubarDev.FtpServer.FileSystem.GoogleDrive.csproj b/src/FubarDev.FtpServer.FileSystem.GoogleDrive/FubarDev.FtpServer.FileSystem.GoogleDrive.csproj
index be4edeef..9a589eff 100644
--- a/src/FubarDev.FtpServer.FileSystem.GoogleDrive/FubarDev.FtpServer.FileSystem.GoogleDrive.csproj
+++ b/src/FubarDev.FtpServer.FileSystem.GoogleDrive/FubarDev.FtpServer.FileSystem.GoogleDrive.csproj
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>Google Drive file system for the portable FTP server</Description>
     <PackageTags>portable;FTP;server;Google;Drive</PackageTags>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Google.Apis.Drive.v3" Version="1.39.0.1566" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard2.0' ">
-    <PackageReference Include="System.ValueTuple" Version="4.3.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer.FileSystem.InMemory/FubarDev.FtpServer.FileSystem.InMemory.csproj b/src/FubarDev.FtpServer.FileSystem.InMemory/FubarDev.FtpServer.FileSystem.InMemory.csproj
index 28c927f0..c908bbd8 100644
--- a/src/FubarDev.FtpServer.FileSystem.InMemory/FubarDev.FtpServer.FileSystem.InMemory.csproj
+++ b/src/FubarDev.FtpServer.FileSystem.InMemory/FubarDev.FtpServer.FileSystem.InMemory.csproj
@@ -1,15 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>In-memory file system for portable FTP server</Description>
     <PackageTags>file;system;portable;FTP;server</PackageTags>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer.FileSystem.S3/FubarDev.FtpServer.FileSystem.S3.csproj b/src/FubarDev.FtpServer.FileSystem.S3/FubarDev.FtpServer.FileSystem.S3.csproj
index 485c0c12..29e8d20d 100644
--- a/src/FubarDev.FtpServer.FileSystem.S3/FubarDev.FtpServer.FileSystem.S3.csproj
+++ b/src/FubarDev.FtpServer.FileSystem.S3/FubarDev.FtpServer.FileSystem.S3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>S3 file system for portable FTP server</Description>
     <PackageTags>portable;FTP;server;AWS;S3</PackageTags>
   </PropertyGroup>
@@ -9,13 +9,6 @@
   <ItemGroup>
     <PackageReference Include="AWSSDK.S3" Version="3.3.104.33" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.Extensions.Options" Version="1.0.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer.FileSystem.Unix/FubarDev.FtpServer.FileSystem.Unix.csproj b/src/FubarDev.FtpServer.FileSystem.Unix/FubarDev.FtpServer.FileSystem.Unix.csproj
index 344492ae..81f7c6d2 100644
--- a/src/FubarDev.FtpServer.FileSystem.Unix/FubarDev.FtpServer.FileSystem.Unix.csproj
+++ b/src/FubarDev.FtpServer.FileSystem.Unix/FubarDev.FtpServer.FileSystem.Unix.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
diff --git a/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj b/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
index 0a44610f..72f33740 100644
--- a/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
+++ b/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
@@ -3,7 +3,7 @@
   <Import Project="../../PackageLibrary.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>PAM membership provider for portable FTP server</Description>
     <PackageTags>pam;membership;portable;FTP;server</PackageTags>
   </PropertyGroup>
diff --git a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
index e7725243..d3721164 100644
--- a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
+++ b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
@@ -1,30 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;netcoreapp2.0;net461;net47;netstandard2.1;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Description>TCP-based FTP server implementation</Description>
     <PackageTags>portable;FTP;server</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>USE_GNU_SSL_STREAM;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net47' ">
-    <DefineConstants>USE_SYNC_SSL_STREAM;$(DefineConstants)</DefineConstants>
-  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Scrutor" Version="2.0.0" />
-    <PackageReference Include="System.IO.Pipelines" Version="4.5.1" />
-  </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Net.Security" Version="4.0.1" />
-    <PackageReference Include="System.Net.NameResolution" Version="4.0.0" />
-    <PackageReference Include="System.Threading.Thread" Version="4.3.0" />
+    <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Commands\FubarDev.FtpServer.Commands.csproj" />
   </ItemGroup>
-  <Import Project="..\..\third-party\GnuSslStream\GnuSslStream.projitems" Label="Shared" Condition=" '$(TargetFramework)' == 'net461' " />
   <Import Project="..\FubarDev.FtpServer.Shared\FubarDev.FtpServer.Shared.projitems" Label="Shared" />
   <Import Project="../../PackageLibrary.props" />
 </Project>
diff --git a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
index 1fa214bd..ce5d82b8 100644
--- a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
+++ b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

From d0c5e61513f3fa21a048e088cffcb1b257fd2deb Mon Sep 17 00:00:00 2001
From: Tom Halter <email@tomhalter.com>
Date: Wed, 22 Jun 2022 12:53:09 -0400
Subject: [PATCH 2/5] Everything builds!

---
 samples/QuickStart/QuickStart.csproj                         | 2 +-
 samples/TestFtpServer/TestFtpServer.csproj                   | 1 +
 .../FubarDev.FtpServer.MembershipProvider.Pam.csproj         | 5 +++--
 src/FubarDev.FtpServer/FubarDev.FtpServer.csproj             | 1 -
 .../FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/samples/QuickStart/QuickStart.csproj b/samples/QuickStart/QuickStart.csproj
index b1558e59..9e830c29 100644
--- a/samples/QuickStart/QuickStart.csproj
+++ b/samples/QuickStart/QuickStart.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/TestFtpServer/TestFtpServer.csproj b/samples/TestFtpServer/TestFtpServer.csproj
index 4df8c40f..aec832eb 100644
--- a/samples/TestFtpServer/TestFtpServer.csproj
+++ b/samples/TestFtpServer/TestFtpServer.csproj
@@ -9,6 +9,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="JKang.IpcServiceFramework.Server" Version="2.3.1" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
diff --git a/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj b/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
index 72f33740..265257d0 100644
--- a/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
+++ b/src/FubarDev.FtpServer.MembershipProvider.Pam/FubarDev.FtpServer.MembershipProvider.Pam.csproj
@@ -3,18 +3,19 @@
   <Import Project="../../PackageLibrary.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <Description>PAM membership provider for portable FTP server</Description>
     <PackageTags>pam;membership;portable;FTP;server</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FubarDev.PamSharp" Version="0.4.0" />
+    <PackageReference Include="FubarDev.PamSharp" Version="0.5.0" />
     <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Abstractions\FubarDev.FtpServer.Abstractions.csproj" />
+    <ProjectReference Include="..\FubarDev.FtpServer\FubarDev.FtpServer.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
index d3721164..e4495aa8 100644
--- a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
+++ b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Scrutor" Version="2.0.0" />
-    <PackageReference Include="System.IO.Pipelines" Version="6.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Commands\FubarDev.FtpServer.Commands.csproj" />
diff --git a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
index ce5d82b8..7944cd98 100644
--- a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
+++ b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="FluentFTP" Version="27.0.3" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.19" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.19" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />

From e7aa6dc42bdbdb607052ec84185749b78c24af5e Mon Sep 17 00:00:00 2001
From: Tom Halter <email@tomhalter.com>
Date: Wed, 22 Jun 2022 12:59:28 -0400
Subject: [PATCH 3/5] Component Updates

---
 .../QuickStart.GenericHost/QuickStart.GenericHost.csproj    | 2 +-
 samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj      | 6 +++---
 src/FubarDev.FtpServer/FubarDev.FtpServer.csproj            | 2 +-
 .../FubarDev.FtpServer.Tests.csproj                         | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj b/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
index c35b7979..1d469f32 100644
--- a/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
+++ b/samples/QuickStart.GenericHost/QuickStart.GenericHost.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj b/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
index bd0e48e6..fa534862 100644
--- a/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
+++ b/samples/TestFtpServer.Shell/TestFtpServer.Shell.csproj
@@ -18,9 +18,9 @@
   <ItemGroup>
     <PackageReference Include="JKang.IpcServiceFramework.Client" Version="2.2.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Scrutor" Version="3.1.0" />
     <PackageReference Include="System.Interactive.Async" Version="4.0.0" />
   </ItemGroup>
diff --git a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
index e4495aa8..295ef36e 100644
--- a/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
+++ b/src/FubarDev.FtpServer/FubarDev.FtpServer.csproj
@@ -6,7 +6,7 @@
     <PackageTags>portable;FTP;server</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Scrutor" Version="2.0.0" />
+    <PackageReference Include="Scrutor" Version="3.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\FubarDev.FtpServer.Commands\FubarDev.FtpServer.Commands.csproj" />
diff --git a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
index 7944cd98..7fce37f0 100644
--- a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
+++ b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
@@ -7,8 +7,8 @@
   <ItemGroup>
     <PackageReference Include="FluentFTP" Version="27.0.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.19" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.19" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>

From 56b44aff65e7f5c4f8d7484c652c5f32cae1b95c Mon Sep 17 00:00:00 2001
From: Tom Halter <email@tomhalter.com>
Date: Wed, 22 Jun 2022 13:12:30 -0400
Subject: [PATCH 4/5] Update README.md

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fd71625e..1e14ed3e 100644
--- a/README.md
+++ b/README.md
@@ -17,13 +17,13 @@ The library is released under the [![MIT license](https://img.shields.io/github/
 
 ## Compilation
 
-* Visual Studio 2019 / C# 8.0
+* Visual Studio 2022 / C# 8.0
 
 ## Using
 
-* Visual Studio 2019
+* Visual Studio 2022
 * .NET Standard 2.0 (everything **except** sample application, PAM authentication)
-* .NET Core 3.0 (sample application, PAM authentication)
+* .NET Core 3.1 (PAM authentication)
 
 ## NuGet packages
 

From 4239e33e6258d7d42c337f6aec6c65b1d5b4fbba Mon Sep 17 00:00:00 2001
From: Tom Halter <email@tomhalter.com>
Date: Wed, 22 Jun 2022 13:12:51 -0400
Subject: [PATCH 5/5] Component Updates

---
 test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
index 7fce37f0..f9d42062 100644
--- a/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
+++ b/test/FubarDev.FtpServer.Tests/FubarDev.FtpServer.Tests.csproj
@@ -14,7 +14,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Xunit.Extensions.Logging" Version="1.1.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">