diff --git a/Code/Flowframes.csproj b/Code/Flowframes.csproj index 904c5db..a1e9632 100644 --- a/Code/Flowframes.csproj +++ b/Code/Flowframes.csproj @@ -1,6 +1,6 @@  - + Debug @@ -82,8 +82,8 @@ packages\CircularProgressBar.2.8.0.16\lib\net40\CircularProgressBar.dll - - packages\Costura.Fody.4.1.0\lib\net40\Costura.dll + + packages\Costura.Fody.5.1.0\lib\netstandard1.0\Costura.dll packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll @@ -98,8 +98,8 @@ packages\HTAlt.WinForms.0.1.6\lib\net461\HTAlt WinForms.dll - - packages\HTAlt.Standart.0.1.6\lib\netstandard2.0\HTAlt.Standart.dll + + packages\HTAlt.Standart.0.1.6.4\lib\netstandard2.0\HTAlt.Standart.dll packages\Magick.NET-Q8-AnyCPU.7.23.2.1\lib\net40\Magick.NET-Q8-AnyCPU.dll @@ -108,14 +108,19 @@ packages\Magick.NET.Core.6.1.2\lib\net40\Magick.NET.Core.dll + + packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll + True + True + packages\WindowsAPICodePack-Core.1.1.1\lib\Microsoft.WindowsAPICodePack.dll packages\WindowsAPICodePack-Shell.1.1.1\lib\Microsoft.WindowsAPICodePack.Shell.dll - - packages\NvAPIWrapper.Net.0.8.0.98\lib\net45\NvAPIWrapper.dll + + packages\NvAPIWrapper.Net.0.8.1.101\lib\net45\NvAPIWrapper.dll packages\PagedControl.2.2.0\lib\net35\PagedControl.dll @@ -126,9 +131,20 @@ packages\Standart.Hash.xxHash.3.1.0\lib\netstandard2.0\Standart.Hash.xxHash.dll + + packages\System.AppContext.4.3.0\lib\net463\System.AppContext.dll + True + True + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + packages\System.Console.4.3.0\lib\net46\System.Console.dll + True + True + packages\System.Data.HashFunction.Core.2.0.0\lib\net45\System.Data.HashFunction.Core.dll @@ -137,28 +153,137 @@ packages\System.Data.HashFunction.Interfaces.2.0.0\lib\net45\System.Data.HashFunction.Interfaces.dll + + packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll + + + packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll + True + True + packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll + + packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll + True + True + + + packages\System.IO.4.3.0\lib\net462\System.IO.dll + True + True + + + packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll + True + True + + + + packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll + True + True + + + packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll + True + True + + + packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + True + True + + + packages\System.Linq.4.3.0\lib\net463\System.Linq.dll + True + True + + + packages\System.Linq.Expressions.4.3.0\lib\net463\System.Linq.Expressions.dll + True + True + packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll + True + True + + + packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll + True + True + packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + packages\System.Reflection.4.3.0\lib\net462\System.Reflection.dll + True + True + + + packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll + True + True + packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll + True + True + + + packages\System.Runtime.InteropServices.4.3.0\lib\net463\System.Runtime.InteropServices.dll + True + True + + + packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll + True + True + packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll True True + + packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll + True + True + + + packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll + True + True + + + packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll + True + True + + + packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll + True + True + packages\System.Security.Principal.Windows.4.3.0\lib\net46\System.Security.Principal.Windows.dll + + packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll + True + True + packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll @@ -169,9 +294,13 @@ - + + packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll + True + True + packages\TabControl.2.1.2\lib\net35\TabControl.dll @@ -355,12 +484,12 @@ + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - \ No newline at end of file diff --git a/Code/FodyWeavers.xsd b/Code/FodyWeavers.xsd index 44a5374..05e92c1 100644 --- a/Code/FodyWeavers.xsd +++ b/Code/FodyWeavers.xsd @@ -17,6 +17,16 @@ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + + A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. + + A list of unmanaged 32 bit assembly names to include, delimited with line breaks. @@ -43,6 +53,16 @@ Controls if .pdbs for reference assemblies are also embedded. + + + Controls if runtime assemblies are also embedded. + + + + + Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. @@ -73,6 +93,16 @@ A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + + A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. + + A list of unmanaged 32 bit assembly names to include, delimited with |. diff --git a/Code/Media/AvProcess.cs b/Code/Media/AvProcess.cs index 54f7e94..f6b84e7 100644 --- a/Code/Media/AvProcess.cs +++ b/Code/Media/AvProcess.cs @@ -20,7 +20,6 @@ namespace Flowframes public static TaskType lastTask = TaskType.Other; public static string lastOutputFfmpeg; - public static string lastOutputGifski; public enum LogMode { Visible, OnlyLastLine, Hidden } static LogMode currentLogMode; diff --git a/Code/packages.config b/Code/packages.config index 8c01c50..eec7ee6 100644 --- a/Code/packages.config +++ b/Code/packages.config @@ -1,32 +1,77 @@  - + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +