diff --git a/build.bat b/build.bat index d35096576..e5035dab5 100644 --- a/build.bat +++ b/build.bat @@ -210,7 +210,9 @@ COPY /Y /V "UtfUnknown.dll" "temp_zip\" COPY /Y /V "Vosk.dll" "temp_zip\" COPY /Y /V "NCalc.dll" "temp_zip\" COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\" COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\" COPY /Y /V "NAudio.Core.dll" "temp_zip\" COPY /Y /V "NAudio.WinMM.dll" "temp_zip\" COPY /Y /V "Microsoft.Win32.Registry.dll" "temp_zip\" diff --git a/build_beta.bat b/build_beta.bat index e54c34ecf..261b2a552 100644 --- a/build_beta.bat +++ b/build_beta.bat @@ -184,7 +184,9 @@ COPY /Y /V "UtfUnknown.dll" "temp_zip\" COPY /Y /V "Vosk.dll" "temp_zip\" COPY /Y /V "NCalc.dll" "temp_zip\" COPY /Y /V "..\..\DLLs\Interop.QuartzTypeLib.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Extensions.dll" "temp_zip\" COPY /Y /V "Newtonsoft.Json.dll" "temp_zip\" +COPY /Y /V "System.Net.Http.Primitives.dll" "temp_zip\" COPY /Y /V "NAudio.Core.dll" "temp_zip\" COPY /Y /V "NAudio.WinMM.dll" "temp_zip\" COPY /Y /V "Microsoft.Win32.Registry.dll" "temp_zip\" diff --git a/installer/Subtitle_Edit_Installer.iss b/installer/Subtitle_Edit_Installer.iss index 9a6610ab9..36710843c 100644 --- a/installer/Subtitle_Edit_Installer.iss +++ b/installer/Subtitle_Edit_Installer.iss @@ -322,6 +322,8 @@ Source: {#bindir}\Vosk.dll; DestDir: {app}; Source: {#bindir}\NCalc.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: ..\src\ui\DLLs\Interop.QuartzTypeLib.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: {#bindir}\Newtonsoft.Json.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\System.Net.Http.Extensions.dll; DestDir: {app}; Flags: ignoreversion; Components: main +Source: {#bindir}\System.Net.Http.Primitives.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: {#bindir}\NAudio.Core.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: {#bindir}\NAudio.WinMM.dll; DestDir: {app}; Flags: ignoreversion; Components: main Source: {#bindir}\Microsoft.Win32.Registry.dll; DestDir: {app}; Flags: ignoreversion; Components: main diff --git a/src/ui/Properties/Settings.Designer.cs b/src/ui/Properties/Settings.Designer.cs index 62beecf1d..4d3764b59 100644 --- a/src/ui/Properties/Settings.Designer.cs +++ b/src/ui/Properties/Settings.Designer.cs @@ -12,7 +12,7 @@ namespace Nikse.SubtitleEdit.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.1.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.7.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/src/ui/SubtitleEdit.csproj b/src/ui/SubtitleEdit.csproj index 1b197eda7..88771ed14 100644 --- a/src/ui/SubtitleEdit.csproj +++ b/src/ui/SubtitleEdit.csproj @@ -85,6 +85,12 @@ + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Extensions.dll + + + ..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll + ..\..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll @@ -2574,13 +2580,6 @@ true - - - {3e3cb28f-3a7b-430f-9eb3-0d6c1e53b753} - LibSE - True - - @@ -2590,6 +2589,13 @@ false + + + TargetFramework=net48 + {d6f64cd3-c3ea-4b36-b575-9b3b8a3ca13f} + LibSE + + @@ -2608,6 +2614,8 @@ 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/src/ui/packages.config b/src/ui/packages.config index e5d527fad..fd62bc412 100644 --- a/src/ui/packages.config +++ b/src/ui/packages.config @@ -1,5 +1,8 @@  + + +