diff --git a/tiny7z/tiny7z.csproj b/tiny7z/tiny7z.csproj
index 22c85fd..6ac004c 100644
--- a/tiny7z/tiny7z.csproj
+++ b/tiny7z/tiny7z.csproj
@@ -1,113 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E52AE256-6645-423A-B262-2CC5B6060F94}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>tiny7z</RootNamespace>
-    <AssemblyName>tiny7z</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DISABLE_TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;DISABLE_TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Archive\Archive.cs" />
-    <Compile Include="Archive\ArchiveFile.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipProgressProvider.cs" />
-    <Compile Include="Common\Converter\DataConverter.cs" />
-    <Compile Include="Common\StreamExtensions.cs" />
-    <Compile Include="Common\Streams\CRCStream.cs" />
-    <Compile Include="Common\Streams\MultiFileStream.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipCompressor.cs" />
-    <Compile Include="Common\Streams\MultiStream.cs" />
-    <Compile Include="Common\Streams\AbstractMultiStream.cs" />
-    <Compile Include="Common\Streams\NullStream.cs" />
-    <Compile Include="Common\Streams\SubStream.cs" />
-    <None Include="LICENSE" />
-    <Compile Include="Common\Util.cs" />
-    <Compile Include="Common\CRC.cs" />
-    <Compile Include="Common\Extensions.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchiveFile.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipException.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipExtractor.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipArchive.cs" />
-    <Compile Include="Compression\AES\AesDecoderStream.cs" />
-    <Compile Include="Compression\BCJ2\Bcj2DecoderStream.cs" />
-    <Compile Include="Compression\BCJ\BcjDecoderStream.cs" />
-    <Compile Include="Compression\DecoderStream.cs" />
-    <Compile Include="Compression\Interfaces.cs" />
-    <Compile Include="Compression\LZMA\Implementation\Core.cs" />
-    <Compile Include="Compression\LZMA\Implementation\CRC.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzFind.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzFindMt.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzHash.cs" />
-    <Compile Include="Compression\LZMA\Implementation\Lzma2Dec.cs" />
-    <Compile Include="Compression\LZMA\Implementation\Lzma2Enc.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzmaDec.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzmaEnc.cs" />
-    <Compile Include="Compression\LZMA\Implementation\LzmaLib.cs" />
-    <Compile Include="Compression\LZMA\Implementation\MtCoder.cs" />
-    <Compile Include="Compression\LZMA\Implementation\Threads.cs" />
-    <Compile Include="Compression\LZMA\Implementation\Types.cs" />
-    <Compile Include="Compression\LZMA\Lzma2DecoderStream.cs" />
-    <Compile Include="Compression\LZMA\LzmaDecoderStream.cs" />
-    <Compile Include="Compression\LZMA\Utilities\Pointer.cs" />
-    <Compile Include="Compression\LZMA\Utilities\Trace.cs" />
-    <Compile Include="Compression\LZMA\Utilities\Utils.cs" />
-    <Compile Include="Compression\PPMd\PpmdDecoderStream.cs" />
-    <Compile Include="Compression\Registry.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipStreamsCompressor.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipStreamsExtractor.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipHeader.cs" />
-    <Compile Include="Archive\Interfaces.cs" />
-    <Compile Include="Archive\SevenZip\SevenZipMethods.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="Doc\Understanding7z.pdf" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Doc\7zFormat.txt" />
-    <Content Include="Doc\Methods.txt" />
-    <Content Include="ToDo.txt" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>netstandard2.0</TargetFramework>
+		<OutputType>Library</OutputType>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<Version>0.2.0</Version>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Optimize>true</Optimize>
+		<DefineConstants>TRACE;DEBUG;DISABLE_TRACE</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<DebugType>none</DebugType>
+		<DefineConstants>TRACE;DISABLE_TRACE</DefineConstants>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+	</PropertyGroup>
+	<PropertyGroup>
+		<StartupObject />
+	</PropertyGroup>
+	<ItemGroup>
+		<Content Include="Doc\**">
+			<Pack>false</Pack>
+		</Content>
+		<Content Include="ToDo.txt">
+			<Pack>false</Pack>
+		</Content>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+		<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+		<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.246501">
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/tiny7zTool/FodyWeavers.xsd b/tiny7zTool/FodyWeavers.xsd
index 44a5374..05e92c1 100644
--- a/tiny7zTool/FodyWeavers.xsd
+++ b/tiny7zTool/FodyWeavers.xsd
@@ -17,6 +17,16 @@
                   <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
                 </xs:annotation>
               </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
+                <xs:annotation>
+                  <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
               <xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
                 <xs:annotation>
                   <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
@@ -43,6 +53,16 @@
                 <xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="DisableCompression" type="xs:boolean">
               <xs:annotation>
                 <xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
@@ -73,6 +93,16 @@
                 <xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
             <xs:attribute name="Unmanaged32Assemblies" type="xs:string">
               <xs:annotation>
                 <xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
diff --git a/tiny7zTool/tiny7zTool.csproj b/tiny7zTool/tiny7zTool.csproj
index 8970479..302ebac 100644
--- a/tiny7zTool/tiny7zTool.csproj
+++ b/tiny7zTool/tiny7zTool.csproj
@@ -1,69 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{C16558CA-32A2-4713-B034-7758841AC052}</ProjectGuid>
+    <TargetFramework>net5.0</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RootNamespace>tiny7zTool</RootNamespace>
     <AssemblyName>t7zt</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
   <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <ProjectReference Include="..\tiny7z\tiny7z.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\tiny7z\tiny7z.csproj">
-      <Project>{e52ae256-6645-423a-b262-2cc5b6060f94}</Project>
-      <Name>tiny7z</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Costura.Fody">
-      <Version>3.3.3</Version>
-    </PackageReference>
-    <PackageReference Include="Fody">
-      <Version>4.0.2</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Serilog">
       <Version>2.8.0</Version>
     </PackageReference>
@@ -73,9 +19,13 @@
     <PackageReference Include="SerilogTraceListener">
       <Version>3.1.0</Version>
     </PackageReference>
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.3.246501">
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Costura.Fody" Version="5.6.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file