From babfe6e744bfdda09f6a0fe73f1b5d056f2ac4ff Mon Sep 17 00:00:00 2001 From: N00MKRAD <61149547+n00mkrad@users.noreply.github.com> Date: Tue, 9 Feb 2021 16:07:57 +0100 Subject: [PATCH] Revert "Convert to .NET 5 Project" --- Build/Build-Distributable-SlimOnly.bat | 31 +- Build/Build-Distributable.bat | 43 +-- Code/.gitignore | 442 ------------------------- Code/App.config | 30 ++ Code/Flowframes.csproj | 397 +++++++++++++++++++--- Code/Flowframes.sln | 20 +- Code/FodyWeavers.xml | 3 + Code/FodyWeavers.xsd | 111 +++++++ Code/Form1.cs | 6 +- Code/Forms/UpdaterForm.cs | 4 +- Code/IO/IOUtils.cs | 4 +- Code/OS/AiProcess.cs | 2 +- Code/nuget.config | 6 - Code/packages.config | 40 +++ 14 files changed, 591 insertions(+), 548 deletions(-) delete mode 100644 Code/.gitignore create mode 100644 Code/App.config create mode 100644 Code/FodyWeavers.xml create mode 100644 Code/FodyWeavers.xsd delete mode 100644 Code/nuget.config create mode 100644 Code/packages.config diff --git a/Build/Build-Distributable-SlimOnly.bat b/Build/Build-Distributable-SlimOnly.bat index 479283e..1463b54 100644 --- a/Build/Build-Distributable-SlimOnly.bat +++ b/Build/Build-Distributable-SlimOnly.bat @@ -10,39 +10,34 @@ echo. set "ver=16" set /p ver="Enter the version number: " -cd .. - -dotnet publish -c Release -o "Release/Build" "Code" - -cd Release +cd ..\Code\bin\x64\Release rmdir /s/q FlowframesApp%ver% mkdir "FlowframesApp%ver%" mkdir "FlowframesApp%ver%/FlowframesData" mkdir "FlowframesApp%ver%/FlowframesData/pkgs" -rem xcopy "../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E -xcopy "../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I -xcopy "../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I -xcopy "../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I -xcopy "../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I -xcopy "../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I +rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E +xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I +xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I +xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I +xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I +xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" -xcopy "Build\Flowframes.exe" "FlowframesApp%ver%" +xcopy Flowframes.exe "FlowframesApp%ver%" -cd ..\Build +cd ../../../../Build -rmdir /s/q ..\Release\FlowframesApp%ver%\FlowframesData\logs -del ..\Release\FlowframesApp%ver%\FlowframesData\config.ini +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs +del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini -del FF-%ver%-Slim.7z -7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Release\FlowframesApp%ver%" +7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" -rmdir /s/q ..\Release\FlowframesApp%ver% +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% rem pause \ No newline at end of file diff --git a/Build/Build-Distributable.bat b/Build/Build-Distributable.bat index 903cdb4..868e870 100644 --- a/Build/Build-Distributable.bat +++ b/Build/Build-Distributable.bat @@ -10,48 +10,41 @@ echo. set "ver=16" set /p ver="Enter the version number: " -cd .. - -dotnet publish -c Release -o "Release/Build" "Code" - -cd Release +cd ..\Code\bin\x64\Release rmdir /s/q FlowframesApp%ver% mkdir "FlowframesApp%ver%" mkdir "FlowframesApp%ver%/FlowframesData" mkdir "FlowframesApp%ver%/FlowframesData/pkgs" -rem xcopy "../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E -xcopy "../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I -xcopy "../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I -xcopy "../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I -xcopy "../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I -xcopy "../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I +rem xcopy "../../../../pkgs" "FlowframesApp%ver%/FlowframesData\pkgs\" /E +xcopy "../../../../pkgs/av" "FlowframesApp%ver%/FlowframesData\pkgs\av" /E /I +xcopy "../../../../pkgs/dain-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\dain-ncnn" /E /I +xcopy "../../../../pkgs/licenses" "FlowframesApp%ver%/FlowframesData\pkgs\licenses" /E /I +xcopy "../../../../pkgs/rife-cuda" "FlowframesApp%ver%/FlowframesData\pkgs\rife-cuda" /E /I +xcopy "../../../../pkgs/rife-ncnn" "FlowframesApp%ver%/FlowframesData\pkgs\rife-ncnn" /E /I echo %ver% >> "FlowframesApp%ver%/FlowframesData/ver.ini" -xcopy "Build\Flowframes.exe" "FlowframesApp%ver%" +xcopy Flowframes.exe "FlowframesApp%ver%" -cd ..\Build +cd ../../../../Build -rmdir /s/q ..\Release\FlowframesApp%ver%\FlowframesData\logs -del ..\Release\FlowframesApp%ver%\FlowframesData\config.ini +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\logs +del ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\config.ini -del FF-%ver%-Slim.7z -7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Release\FlowframesApp%ver%" +7za.exe a FF-%ver%-Slim.7z -m0=flzma2 -mx5 "..\Code\bin\x64\Release\FlowframesApp%ver%" -xcopy "../pkgs/py-tu" "..\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu" /E /I -del FF-%ver%-Full.7z -7za.exe a FF-%ver%-Full.7z -m0=flzma2 -mx7 "..\Release\FlowframesApp%ver%" +xcopy "../pkgs/py-tu" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu" /E /I +7za.exe a FF-%ver%-Full.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" -rmdir /s/q ..\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu -xcopy "../pkgs/py-amp" "..\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I -del FF-%ver%-Full-RTX3000.7z -7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Release\FlowframesApp%ver%" +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-tu +xcopy "../pkgs/py-amp" "..\Code\bin\x64\Release\FlowframesApp%ver%\FlowframesData\pkgs\py-amp" /E /I +7za.exe a FF-%ver%-Full-RTX3000.7z -m0=flzma2 -mx7 "..\Code\bin\x64\Release\FlowframesApp%ver%" -rmdir /s/q ..\Release\FlowframesApp%ver% +rmdir /s/q ..\Code\bin\x64\Release\FlowframesApp%ver% rem pause \ No newline at end of file diff --git a/Code/.gitignore b/Code/.gitignore deleted file mode 100644 index 920d1cd..0000000 --- a/Code/.gitignore +++ /dev/null @@ -1,442 +0,0 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. -## -## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore - -# User-specific files -*.rsuser -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Mono auto generated files -mono_crash.* - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -[Aa][Rr][Mm]/ -[Aa][Rr][Mm]64/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ -[Ll]ogs/ - -# Visual Studio 2015/2017 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# Visual Studio 2017 auto generated files -Generated\ Files/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUnit -*.VisualState.xml -TestResult.xml -nunit-*.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# Benchmark Results -BenchmarkDotNet.Artifacts/ - -# .NET Core -project.lock.json -project.fragment.lock.json -artifacts/ - -# StyleCop -StyleCopReport.xml - -# Files built by Visual Studio -*_i.c -*_p.c -*_h.h -*.ilk -*.meta -*.obj -*.iobj -*.pch -*.pdb -*.ipdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*_wpftmp.csproj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# Visual Studio Trace Files -*.e2e - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# AxoCover is a Code Coverage Tool -.axoCover/* -!.axoCover/settings.json - -# Coverlet is a free, cross platform Code Coverage Tool -coverage*[.json, .xml, .info] - -# Visual Studio code coverage results -*.coverage -*.coveragexml - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# Note: Comment the next line if you want to checkin your web deploy settings, -# but database connection strings (with potential passwords) will be unencrypted -*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# NuGet Symbol Packages -*.snupkg -# The packages folder can be ignored because of Package Restore -**/[Pp]ackages/* -# except build/, which is used as an MSBuild target. -!**/[Pp]ackages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/[Pp]ackages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt -*.appx -*.appxbundle -*.appxupload - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!?*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -orleans.codegen.cs - -# Including strong name files can present a security risk -# (https://github.com/github/gitignore/pull/2483#issue-259490424) -#*.snk - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm -ServiceFabricBackup/ -*.rptproj.bak - -# SQL Server files -*.mdf -*.ldf -*.ndf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings -*.rptproj.rsuser -*- [Bb]ackup.rdl -*- [Bb]ackup ([0-9]).rdl -*- [Bb]ackup ([0-9][0-9]).rdl - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat -node_modules/ - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) -*.vbw - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# CodeRush personal settings -.cr/personal - -# Python Tools for Visual Studio (PTVS) -__pycache__/ -*.pyc - -# Cake - Uncomment if you are using it -# tools/** -# !tools/packages.config - -# Tabs Studio -*.tss - -# Telerik's JustMock configuration file -*.jmconfig - -# BizTalk build output -*.btp.cs -*.btm.cs -*.odx.cs -*.xsd.cs - -# OpenCover UI analysis results -OpenCover/ - -# Azure Stream Analytics local run output -ASALocalRun/ - -# MSBuild Binary and Structured Log -*.binlog - -# NVidia Nsight GPU debugger configuration file -*.nvuser - -# MFractors (Xamarin productivity tool) working folder -.mfractor/ - -# Local History for Visual Studio -.localhistory/ - -# BeatPulse healthcheck temp database -healthchecksdb - -# Backup folder for Package Reference Convert tool in Visual Studio 2017 -MigrationBackup/ - -# Ionide (cross platform F# VS Code tools) working folder -.ionide/ - -## -## Visual studio for Mac -## - - -# globs -Makefile.in -*.userprefs -*.usertasks -config.make -config.status -aclocal.m4 -install-sh -autom4te.cache/ -*.tar.gz -tarballs/ -test-results/ - -# Mac bundle stuff -*.dmg -*.app - -# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore -# Windows thumbnail cache files -Thumbs.db -ehthumbs.db -ehthumbs_vista.db - -# Dump file -*.stackdump - -# Folder config file -[Dd]esktop.ini - -# Recycle Bin used on file shares -$RECYCLE.BIN/ - -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp - -# Windows shortcuts -*.lnk - -# JetBrains Rider -.idea/ -*.sln.iml - -## -## Visual Studio Code -## -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json diff --git a/Code/App.config b/Code/App.config new file mode 100644 index 0000000..99a5271 --- /dev/null +++ b/Code/App.config @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Code/Flowframes.csproj b/Code/Flowframes.csproj index 8825a18..6756632 100644 --- a/Code/Flowframes.csproj +++ b/Code/Flowframes.csproj @@ -1,54 +1,369 @@ - - + + + + + Debug + AnyCPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3} WinExe - net5.0-windows - true - - win-x64 - true - false - true - false - true - - false - false - false - false + Flowframes + Flowframes + v4.7.2 + 512 + true + true + + + false + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + true + + + x64 + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + flowframesIcoNew.ico - + + + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + 7.3 + prompt + MinimumRecommendedRules.ruleset + true + - - - - - - - - - - - - - - + + packages\7z.NET.1.0.3\lib\net463\7z.NET.dll + + + packages\CircularProgressBar.2.8.0.16\lib\net40\CircularProgressBar.dll + + + packages\Costura.Fody.4.1.0\lib\net40\Costura.dll + + + packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll + + + + packages\CyotekTabList.2.0.0\lib\net35\Cyotek.Windows.Forms.TabList.dll + + + packages\diskdetector-net.0.3.2\lib\netstandard2.0\DiskDetector.dll + + + packages\HTAlt.WinForms.0.1.6\lib\net461\HTAlt WinForms.dll + + + packages\HTAlt.Standart.0.1.6\lib\netstandard2.0\HTAlt.Standart.dll + + + packages\Magick.NET-Q16-AnyCPU.7.21.1\lib\net40\Magick.NET-Q16-AnyCPU.dll + + + packages\Magick.NET.Core.4.1.0\lib\net40\Magick.NET.Core.dll + + + + 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\PagedControl.2.2.0\lib\net35\PagedControl.dll + + + + + packages\Standart.Hash.xxHash.3.1.0\lib\netstandard2.0\Standart.Hash.xxHash.dll + + + + packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + + packages\System.Data.HashFunction.Core.2.0.0\lib\net45\System.Data.HashFunction.Core.dll + + + packages\System.Data.HashFunction.Interfaces.2.0.0\lib\net45\System.Data.HashFunction.Interfaces.dll + + + + packages\System.Drawing.Common.5.0.0\lib\net461\System.Drawing.Common.dll + + + + packages\System.Memory.4.5.4\lib\net461\System.Memory.dll + + + + packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + packages\System.Security.Claims.4.3.0\lib\net46\System.Security.Claims.dll + True + True + + + packages\System.Security.Principal.Windows.4.3.0\lib\net46\System.Security.Principal.Windows.dll + + + packages\System.Threading.Tasks.Extensions.4.5.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll + + + + + + + + + + + + + packages\TabControl.2.1.2\lib\net35\TabControl.dll + + + packages\Win32Interop.Dwmapi.1.0.1\lib\Win32Interop.Dwmapi.dll + + + packages\Win32Interop.Gdi32.1.0.1\lib\Win32Interop.Gdi32.dll + + + packages\Win32Interop.Kernel32.1.0.1\lib\Win32Interop.Kernel32.dll + + + packages\Win32Interop.User32.1.0.1\lib\Win32Interop.User32.dll + + + packages\Win32Interop.Uxtheme.1.0.1\lib\Win32Interop.Uxtheme.dll + + + + + packages\WinFormAnimation.1.6.0.4\lib\net40\WinFormAnimation.dll + - - - True - True - Settings.settings + + + + + + + + Form - - - - + + BatchForm.cs + + + Form + + + BigPreviewForm.cs + + + Form + + + SettingsForm.cs + + + Form + + + UpdaterForm.cs + + + + + + + + + + + + + + + + + + + + + + + + + Form + + + Form1.cs + + + + + + + + + + + + + + + + + + + + + + Form1.cs + Designer + + + BatchForm.cs + + + BigPreviewForm.cs + + + SettingsForm.cs + + + UpdaterForm.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + SettingsSingleFileGenerator Settings.Designer.cs + + True + Settings.settings + True + - + + + + + + False + Microsoft .NET Framework 4.7.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Flowframes.sln b/Code/Flowframes.sln index 46b78f0..163ede5 100644 --- a/Code/Flowframes.sln +++ b/Code/Flowframes.sln @@ -1,25 +1,31 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.30907.101 +VisualStudioVersion = 16.0.30413.136 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flowframes", "Flowframes.csproj", "{A7E45FC0-5BE5-40FC-BCB6-48096F57AF73}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Flowframes", "Flowframes.csproj", "{389E42DD-A163-49D7-9E0A-AE41090A07B3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7E45FC0-5BE5-40FC-BCB6-48096F57AF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7E45FC0-5BE5-40FC-BCB6-48096F57AF73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7E45FC0-5BE5-40FC-BCB6-48096F57AF73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7E45FC0-5BE5-40FC-BCB6-48096F57AF73}.Release|Any CPU.Build.0 = Release|Any CPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|x64.ActiveCfg = Debug|x64 + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Debug|x64.Build.0 = Debug|x64 + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Release|Any CPU.Build.0 = Release|Any CPU + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Release|x64.ActiveCfg = Release|x64 + {389E42DD-A163-49D7-9E0A-AE41090A07B3}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {62B981E7-6590-4960-BDF4-3439D25D3840} + SolutionGuid = {4622DEE4-C34E-4439-A743-7B534210FDFA} EndGlobalSection EndGlobal diff --git a/Code/FodyWeavers.xml b/Code/FodyWeavers.xml new file mode 100644 index 0000000..5029e70 --- /dev/null +++ b/Code/FodyWeavers.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Code/FodyWeavers.xsd b/Code/FodyWeavers.xsd new file mode 100644 index 0000000..44a5374 --- /dev/null +++ b/Code/FodyWeavers.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks + + + + + A list of 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. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with line breaks. + + + + + The order of preloaded assemblies, delimited with line breaks. + + + + + + This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. + + + + + Controls if .pdbs for reference assemblies are also embedded. + + + + + Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. + + + + + As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. + + + + + Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. + + + + + Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. + + + + + A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | + + + + + A list of 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 |. + + + + + A list of unmanaged 64 bit assembly names to include, delimited with |. + + + + + The order of preloaded assemblies, delimited with |. + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/Code/Form1.cs b/Code/Form1.cs index 706dcc2..576a258 100644 --- a/Code/Form1.cs +++ b/Code/Form1.cs @@ -371,17 +371,17 @@ namespace Flowframes private void discordBtn_Click(object sender, EventArgs e) { - Process.Start(new ProcessStartInfo("https://discord.gg/eJHD2NSJRe") { UseShellExecute = true }); + Process.Start("https://discord.gg/eJHD2NSJRe"); } private void paypalBtn_Click(object sender, EventArgs e) { - Process.Start(new ProcessStartInfo("https://www.paypal.com/paypalme/nmkd/10") { UseShellExecute = true }); + Process.Start("https://www.paypal.com/paypalme/nmkd/10"); } private void patreonBtn_Click(object sender, EventArgs e) { - Process.Start(new ProcessStartInfo("https://patreon.com/n00mkrad") { UseShellExecute = true }); + Process.Start("https://patreon.com/n00mkrad"); } private void settingsBtn_Click(object sender, EventArgs e) diff --git a/Code/Forms/UpdaterForm.cs b/Code/Forms/UpdaterForm.cs index bee6896..23e4a72 100644 --- a/Code/Forms/UpdaterForm.cs +++ b/Code/Forms/UpdaterForm.cs @@ -69,14 +69,14 @@ namespace Flowframes.Forms { string link = Updater.GetLatestVerLink(true); if(!string.IsNullOrWhiteSpace(link)) - Process.Start(new ProcessStartInfo(link) { UseShellExecute = true }); + Process.Start(link); } private void updateFreeBtn_Click(object sender, EventArgs e) { string link = Updater.GetLatestVerLink(false); if (!string.IsNullOrWhiteSpace(link)) - Process.Start(new ProcessStartInfo(link) { UseShellExecute = true }); + Process.Start(link); } } } diff --git a/Code/IO/IOUtils.cs b/Code/IO/IOUtils.cs index 4858c77..6cb4d10 100644 --- a/Code/IO/IOUtils.cs +++ b/Code/IO/IOUtils.cs @@ -29,9 +29,7 @@ namespace Flowframes.IO public static string GetExeDir() { - // Messy workaround for Single File compilation to get correct working directory - var fileName = Process.GetCurrentProcess().MainModule?.FileName; - return fileName != null ? Directory.GetParent(fileName).ToString() : AppDomain.CurrentDomain.BaseDirectory; + return AppDomain.CurrentDomain.BaseDirectory; } public static Image GetImage(string path) diff --git a/Code/OS/AiProcess.cs b/Code/OS/AiProcess.cs index 1748e20..bce0175 100644 --- a/Code/OS/AiProcess.cs +++ b/Code/OS/AiProcess.cs @@ -288,7 +288,7 @@ namespace Flowframes hasShownError = true; InterpolateUtils.ShowMessage($"A python module is missing.\nCheck {logFilename} for details.\n\n{line}", "Error"); if(!Python.HasEmbeddedPyFolder()) - Process.Start(new ProcessStartInfo("https://github.com/n00mkrad/flowframes/blob/main/PythonDependencies.md") { UseShellExecute = true }); + Process.Start("https://github.com/n00mkrad/flowframes/blob/main/PythonDependencies.md"); } if (!hasShownError && line.ToLower().Contains("no longer supports this gpu")) diff --git a/Code/nuget.config b/Code/nuget.config deleted file mode 100644 index 2c70539..0000000 --- a/Code/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Code/packages.config b/Code/packages.config new file mode 100644 index 0000000..136ae9e --- /dev/null +++ b/Code/packages.config @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file