diff --git a/.gitignore b/.gitignore
index 57a40328..bb7ef794 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
bld/*
!bld/*.iss
!bld/*.bat
+!bld/Redist
!bld/Resources
# Rider
@@ -144,4 +145,3 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
-
diff --git a/TweetDuck.csproj b/TweetDuck.csproj
index 0190e9ee..5426a663 100644
--- a/TweetDuck.csproj
+++ b/TweetDuck.csproj
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="packages\CefSharp.Common.96.0.180\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.96.0.180\build\CefSharp.Common.props')" />
+ <Import Project="packages\cef.redist.x86.96.0.18\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.96.0.18\build\cef.redist.x86.props')" />
+ <Import Project="packages\cef.redist.x64.96.0.18\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.96.0.18\build\cef.redist.x64.props')" />
<Import Project="packages\CefSharp.WinForms.92.0.260\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.92.0.260\build\CefSharp.WinForms.props')" />
- <Import Project="packages\CefSharp.Common.92.0.260\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.92.0.260\build\CefSharp.Common.props')" />
- <Import Project="packages\cef.redist.x86.92.0.26\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.92.0.26\build\cef.redist.x86.props')" />
- <Import Project="packages\cef.redist.x64.92.0.26\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.92.0.26\build\cef.redist.x64.props')" />
<Import Project="packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -45,14 +45,14 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
- <Reference Include="CefSharp, Version=92.0.260.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.dll</HintPath>
+ <Reference Include="CefSharp, Version=96.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>packages\CefSharp.Common.96.0.180\lib\net452\CefSharp.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.Core, Version=92.0.260.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.Core.dll</HintPath>
+ <Reference Include="CefSharp.Core, Version=96.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>packages\CefSharp.Common.96.0.180\lib\net452\CefSharp.Core.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.WinForms, Version=92.0.260.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
- <HintPath>packages\CefSharp.WinForms.92.0.260\lib\net452\CefSharp.WinForms.dll</HintPath>
+ <Reference Include="CefSharp.WinForms, Version=96.0.180.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
+ <HintPath>packages\CefSharp.WinForms.96.0.180\lib\net462\CefSharp.WinForms.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@@ -318,6 +318,7 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
+ <None Include="app.config" />
<None Include="packages.config" />
<None Include="Resources\Images\avatar.png" />
<None Include="Resources\Images\icon-muted.ico" />
@@ -375,6 +376,9 @@
<None Include="Resources\Scripts\twitter.js" />
<None Include="Resources\Scripts\update.js" />
</ItemGroup>
+ <ItemGroup>
+ <Redist Include="$(ProjectDir)bld\Redist\*.*" />
+ </ItemGroup>
<ItemGroup>
<ProjectReference Include="lib\TweetLib.Core\TweetLib.Core.csproj">
<Project>{93ba3cb4-a812-4949-b07d-8d393fb38937}</Project>
@@ -416,6 +420,7 @@ IF EXIST "$(ProjectDir)bld\post_build.exe" (
<Exec Command="del "$(TargetDir)*.xml"" />
<Delete Files="$(TargetDir)CefSharp.BrowserSubprocess.exe" />
<Delete Files="$(TargetDir)widevinecdmadapter.dll" />
+ <Copy SourceFiles="@(Redist)" DestinationFolder="$(TargetDir)" />
<Exec Command="start "" /B "ISCC.exe" /Q "$(ProjectDir)bld\gen_upd.iss"" WorkingDirectory="$(ProjectDir)bld\" IgnoreExitCode="true" />
</Target>
<PropertyGroup>
@@ -426,10 +431,10 @@ IF EXIST "$(ProjectDir)bld\post_build.exe" (
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props'))" />
- <Error Condition="!Exists('packages\cef.redist.x64.92.0.26\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.92.0.26\build\cef.redist.x64.props'))" />
- <Error Condition="!Exists('packages\cef.redist.x86.92.0.26\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.92.0.26\build\cef.redist.x86.props'))" />
- <Error Condition="!Exists('packages\CefSharp.Common.92.0.260\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.92.0.260\build\CefSharp.Common.props'))" />
- <Error Condition="!Exists('packages\CefSharp.Common.92.0.260\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.92.0.260\build\CefSharp.Common.targets'))" />
+ <Error Condition="!Exists('packages\cef.redist.x64.96.0.18\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.96.0.18\build\cef.redist.x64.props'))" />
+ <Error Condition="!Exists('packages\cef.redist.x86.96.0.18\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.96.0.18\build\cef.redist.x86.props'))" />
+ <Error Condition="!Exists('packages\CefSharp.Common.96.0.180\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.96.0.180\build\CefSharp.Common.props'))" />
+ <Error Condition="!Exists('packages\CefSharp.Common.96.0.180\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.96.0.180\build\CefSharp.Common.targets'))" />
</Target>
- <Import Project="packages\CefSharp.Common.92.0.260\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.92.0.260\build\CefSharp.Common.targets')" />
-</Project>
\ No newline at end of file
+ <Import Project="packages\CefSharp.Common.96.0.180\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.96.0.180\build\CefSharp.Common.targets')" />
+</Project>
diff --git a/Utils/BrowserUtils.cs b/Utils/BrowserUtils.cs
index aabbbe52..366cba8a 100644
--- a/Utils/BrowserUtils.cs
+++ b/Utils/BrowserUtils.cs
@@ -34,6 +34,7 @@ public static void SetupCefArgs(IDictionary<string, string> args) {
args["disable-touch-adjustment"] = "1";
}
+ args["disable-component-update"] = "1";
args["disable-pdf-extension"] = "1";
args["disable-plugins-discovery"] = "1";
args["enable-system-flash"] = "0";
diff --git a/app.config b/app.config
new file mode 100644
index 00000000..6fecf3c1
--- /dev/null
+++ b/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+ <runtime>
+ <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+ <dependentAssembly>
+ <assemblyIdentity name="CefSharp" publicKeyToken="40c4b6fc221f4138" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-96.0.180.0" newVersion="96.0.180.0" />
+ </dependentAssembly>
+ </assemblyBinding>
+ </runtime>
+</configuration>
\ No newline at end of file
diff --git a/bld/Redist/api-ms-win-core-console-l1-1-0.dll b/bld/Redist/api-ms-win-core-console-l1-1-0.dll
new file mode 100644
index 00000000..5c746b6e
Binary files /dev/null and b/bld/Redist/api-ms-win-core-console-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-datetime-l1-1-0.dll b/bld/Redist/api-ms-win-core-datetime-l1-1-0.dll
new file mode 100644
index 00000000..270130fd
Binary files /dev/null and b/bld/Redist/api-ms-win-core-datetime-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-debug-l1-1-0.dll b/bld/Redist/api-ms-win-core-debug-l1-1-0.dll
new file mode 100644
index 00000000..5acef2ac
Binary files /dev/null and b/bld/Redist/api-ms-win-core-debug-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-errorhandling-l1-1-0.dll b/bld/Redist/api-ms-win-core-errorhandling-l1-1-0.dll
new file mode 100644
index 00000000..1374800e
Binary files /dev/null and b/bld/Redist/api-ms-win-core-errorhandling-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-file-l1-1-0.dll b/bld/Redist/api-ms-win-core-file-l1-1-0.dll
new file mode 100644
index 00000000..1300afa8
Binary files /dev/null and b/bld/Redist/api-ms-win-core-file-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-file-l1-2-0.dll b/bld/Redist/api-ms-win-core-file-l1-2-0.dll
new file mode 100644
index 00000000..dda8db74
Binary files /dev/null and b/bld/Redist/api-ms-win-core-file-l1-2-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-file-l2-1-0.dll b/bld/Redist/api-ms-win-core-file-l2-1-0.dll
new file mode 100644
index 00000000..6e13fd38
Binary files /dev/null and b/bld/Redist/api-ms-win-core-file-l2-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-handle-l1-1-0.dll b/bld/Redist/api-ms-win-core-handle-l1-1-0.dll
new file mode 100644
index 00000000..523d45f2
Binary files /dev/null and b/bld/Redist/api-ms-win-core-handle-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-heap-l1-1-0.dll b/bld/Redist/api-ms-win-core-heap-l1-1-0.dll
new file mode 100644
index 00000000..8e04457c
Binary files /dev/null and b/bld/Redist/api-ms-win-core-heap-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-interlocked-l1-1-0.dll b/bld/Redist/api-ms-win-core-interlocked-l1-1-0.dll
new file mode 100644
index 00000000..cba3a82b
Binary files /dev/null and b/bld/Redist/api-ms-win-core-interlocked-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-libraryloader-l1-1-0.dll b/bld/Redist/api-ms-win-core-libraryloader-l1-1-0.dll
new file mode 100644
index 00000000..0d0df2cc
Binary files /dev/null and b/bld/Redist/api-ms-win-core-libraryloader-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-localization-l1-2-0.dll b/bld/Redist/api-ms-win-core-localization-l1-2-0.dll
new file mode 100644
index 00000000..e2fbe159
Binary files /dev/null and b/bld/Redist/api-ms-win-core-localization-l1-2-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-memory-l1-1-0.dll b/bld/Redist/api-ms-win-core-memory-l1-1-0.dll
new file mode 100644
index 00000000..d5a464d3
Binary files /dev/null and b/bld/Redist/api-ms-win-core-memory-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-namedpipe-l1-1-0.dll b/bld/Redist/api-ms-win-core-namedpipe-l1-1-0.dll
new file mode 100644
index 00000000..382a677b
Binary files /dev/null and b/bld/Redist/api-ms-win-core-namedpipe-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-processenvironment-l1-1-0.dll b/bld/Redist/api-ms-win-core-processenvironment-l1-1-0.dll
new file mode 100644
index 00000000..f846cd1b
Binary files /dev/null and b/bld/Redist/api-ms-win-core-processenvironment-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-processthreads-l1-1-0.dll b/bld/Redist/api-ms-win-core-processthreads-l1-1-0.dll
new file mode 100644
index 00000000..fb086be4
Binary files /dev/null and b/bld/Redist/api-ms-win-core-processthreads-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-processthreads-l1-1-1.dll b/bld/Redist/api-ms-win-core-processthreads-l1-1-1.dll
new file mode 100644
index 00000000..a5df5fb4
Binary files /dev/null and b/bld/Redist/api-ms-win-core-processthreads-l1-1-1.dll differ
diff --git a/bld/Redist/api-ms-win-core-profile-l1-1-0.dll b/bld/Redist/api-ms-win-core-profile-l1-1-0.dll
new file mode 100644
index 00000000..f473bd3e
Binary files /dev/null and b/bld/Redist/api-ms-win-core-profile-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-rtlsupport-l1-1-0.dll b/bld/Redist/api-ms-win-core-rtlsupport-l1-1-0.dll
new file mode 100644
index 00000000..f05b0587
Binary files /dev/null and b/bld/Redist/api-ms-win-core-rtlsupport-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-string-l1-1-0.dll b/bld/Redist/api-ms-win-core-string-l1-1-0.dll
new file mode 100644
index 00000000..7758ac42
Binary files /dev/null and b/bld/Redist/api-ms-win-core-string-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-synch-l1-1-0.dll b/bld/Redist/api-ms-win-core-synch-l1-1-0.dll
new file mode 100644
index 00000000..a9512053
Binary files /dev/null and b/bld/Redist/api-ms-win-core-synch-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-synch-l1-2-0.dll b/bld/Redist/api-ms-win-core-synch-l1-2-0.dll
new file mode 100644
index 00000000..38fee872
Binary files /dev/null and b/bld/Redist/api-ms-win-core-synch-l1-2-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-sysinfo-l1-1-0.dll b/bld/Redist/api-ms-win-core-sysinfo-l1-1-0.dll
new file mode 100644
index 00000000..a299aff9
Binary files /dev/null and b/bld/Redist/api-ms-win-core-sysinfo-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-timezone-l1-1-0.dll b/bld/Redist/api-ms-win-core-timezone-l1-1-0.dll
new file mode 100644
index 00000000..6f427d17
Binary files /dev/null and b/bld/Redist/api-ms-win-core-timezone-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-core-util-l1-1-0.dll b/bld/Redist/api-ms-win-core-util-l1-1-0.dll
new file mode 100644
index 00000000..d08b7d3d
Binary files /dev/null and b/bld/Redist/api-ms-win-core-util-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-conio-l1-1-0.dll b/bld/Redist/api-ms-win-crt-conio-l1-1-0.dll
new file mode 100644
index 00000000..02a70617
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-conio-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-convert-l1-1-0.dll b/bld/Redist/api-ms-win-crt-convert-l1-1-0.dll
new file mode 100644
index 00000000..af0a1ae5
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-convert-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-environment-l1-1-0.dll b/bld/Redist/api-ms-win-crt-environment-l1-1-0.dll
new file mode 100644
index 00000000..7d08ad05
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-environment-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-filesystem-l1-1-0.dll b/bld/Redist/api-ms-win-crt-filesystem-l1-1-0.dll
new file mode 100644
index 00000000..8e6306a9
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-filesystem-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-heap-l1-1-0.dll b/bld/Redist/api-ms-win-crt-heap-l1-1-0.dll
new file mode 100644
index 00000000..b2c83625
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-heap-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-locale-l1-1-0.dll b/bld/Redist/api-ms-win-crt-locale-l1-1-0.dll
new file mode 100644
index 00000000..fe4419f1
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-locale-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-math-l1-1-0.dll b/bld/Redist/api-ms-win-crt-math-l1-1-0.dll
new file mode 100644
index 00000000..8f1a078c
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-math-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-multibyte-l1-1-0.dll b/bld/Redist/api-ms-win-crt-multibyte-l1-1-0.dll
new file mode 100644
index 00000000..7325d34e
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-multibyte-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-private-l1-1-0.dll b/bld/Redist/api-ms-win-crt-private-l1-1-0.dll
new file mode 100644
index 00000000..e5422f0f
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-private-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-process-l1-1-0.dll b/bld/Redist/api-ms-win-crt-process-l1-1-0.dll
new file mode 100644
index 00000000..6b729e63
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-process-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-runtime-l1-1-0.dll b/bld/Redist/api-ms-win-crt-runtime-l1-1-0.dll
new file mode 100644
index 00000000..c8a92f0a
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-runtime-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-stdio-l1-1-0.dll b/bld/Redist/api-ms-win-crt-stdio-l1-1-0.dll
new file mode 100644
index 00000000..4c17e534
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-stdio-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-string-l1-1-0.dll b/bld/Redist/api-ms-win-crt-string-l1-1-0.dll
new file mode 100644
index 00000000..780ea39f
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-string-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-time-l1-1-0.dll b/bld/Redist/api-ms-win-crt-time-l1-1-0.dll
new file mode 100644
index 00000000..fae1379f
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-time-l1-1-0.dll differ
diff --git a/bld/Redist/api-ms-win-crt-utility-l1-1-0.dll b/bld/Redist/api-ms-win-crt-utility-l1-1-0.dll
new file mode 100644
index 00000000..5bf4200d
Binary files /dev/null and b/bld/Redist/api-ms-win-crt-utility-l1-1-0.dll differ
diff --git a/bld/Redist/concrt140.dll b/bld/Redist/concrt140.dll
new file mode 100644
index 00000000..ae6d6f5a
Binary files /dev/null and b/bld/Redist/concrt140.dll differ
diff --git a/bld/Redist/msvcp140.dll b/bld/Redist/msvcp140.dll
new file mode 100644
index 00000000..3ebae12a
Binary files /dev/null and b/bld/Redist/msvcp140.dll differ
diff --git a/bld/Redist/msvcp140_1.dll b/bld/Redist/msvcp140_1.dll
new file mode 100644
index 00000000..e874501b
Binary files /dev/null and b/bld/Redist/msvcp140_1.dll differ
diff --git a/bld/Redist/msvcp140_2.dll b/bld/Redist/msvcp140_2.dll
new file mode 100644
index 00000000..b5212bde
Binary files /dev/null and b/bld/Redist/msvcp140_2.dll differ
diff --git a/bld/Redist/msvcp140_atomic_wait.dll b/bld/Redist/msvcp140_atomic_wait.dll
new file mode 100644
index 00000000..6a88b92d
Binary files /dev/null and b/bld/Redist/msvcp140_atomic_wait.dll differ
diff --git a/bld/Redist/msvcp140_codecvt_ids.dll b/bld/Redist/msvcp140_codecvt_ids.dll
new file mode 100644
index 00000000..cd30c7ba
Binary files /dev/null and b/bld/Redist/msvcp140_codecvt_ids.dll differ
diff --git a/bld/Redist/ucrtbase.dll b/bld/Redist/ucrtbase.dll
new file mode 100644
index 00000000..98c744d4
Binary files /dev/null and b/bld/Redist/ucrtbase.dll differ
diff --git a/bld/Redist/vccorlib140.dll b/bld/Redist/vccorlib140.dll
new file mode 100644
index 00000000..256e08d0
Binary files /dev/null and b/bld/Redist/vccorlib140.dll differ
diff --git a/bld/Redist/vcruntime140.dll b/bld/Redist/vcruntime140.dll
new file mode 100644
index 00000000..9ab53348
Binary files /dev/null and b/bld/Redist/vcruntime140.dll differ
diff --git a/bld/gen_full.iss b/bld/gen_full.iss
index 10e67d5c..0015360c 100644
--- a/bld/gen_full.iss
+++ b/bld/gen_full.iss
@@ -8,7 +8,6 @@
#define MyAppExeName "TweetDuck.exe"
#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
-#define VCRedistLink "releases/download/1.13/vc_redist.x86.exe"
[Setup]
AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
@@ -66,18 +65,14 @@ AdditionalTasks=Additional shortcuts and components:
[Code]
var UpdatePath: String;
-var ForceRedistPrompt: String;
var VisitedTasksPage: Boolean;
function TDGetNetFrameworkVersion: Cardinal; forward;
-function TDIsVCMissing: Boolean; forward;
-procedure TDInstallVCRedist; forward;
{ Check .NET Framework version on startup, ask user if they want to proceed if older than 4.7.2. }
function InitializeSetup: Boolean;
begin
UpdatePath := ExpandConstant('{param:UPDATEPATH}')
- ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
VisitedTasksPage := False
if (TDGetNetFrameworkVersion() < 461808) and (MsgBox('{#MyAppName} requires .NET Framework 4.7.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
@@ -86,11 +81,6 @@ begin
Exit
end;
- if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
- begin
- idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'))
- end;
-
Result := True
end;
@@ -124,15 +114,6 @@ begin
end;
end;
-{ Install VC++ if downloaded. }
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
- if CurStep = ssInstall then
- begin
- TDInstallVCRedist()
- end;
-end;
-
{ Ask user if they want to delete 'AppData\TweetDuck' and 'plugins' folders after uninstallation. }
procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
var ProfileDataFolder: String;
@@ -172,65 +153,3 @@ begin
Result := 0
end;
-
-{ Check if Visual C++ 2015 or 2017 is installed. }
-function TDIsVCMissing: Boolean;
-var Keys: TArrayOfString;
-var Index: Integer;
-var Key: String;
-var DisplayName: String;
-
-begin
- if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies', Keys) then
- begin
- for Index := 0 to GetArrayLength(Keys)-1 do
- begin
- Key := Keys[Index]
-
- if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
- begin
- if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
- begin
- Result := False
- Exit
- end;
- end;
- end;
- end;
-
- Result := True
-end;
-
-{ Run the Visual C++ installer if downloaded. }
-procedure TDInstallVCRedist;
-var InstallFile: String;
-var ResultCode: Integer;
-
-begin
- InstallFile := ExpandConstant('{tmp}\{#MyAppName}.VC.exe')
-
- if FileExists(InstallFile) then
- begin
- WizardForm.ProgressGauge.Style := npbstMarquee
-
- try
- if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
- begin
- if ResultCode <> 0 then
- begin
- DeleteFile(InstallFile)
- Exit
- end;
- end else
- begin
- MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
-
- DeleteFile(InstallFile)
- Exit
- end;
- finally
- WizardForm.ProgressGauge.Style := npbstNormal
- DeleteFile(InstallFile)
- end;
- end;
-end;
diff --git a/bld/gen_port.iss b/bld/gen_port.iss
index 7a0c2a82..7323f81e 100644
--- a/bld/gen_port.iss
+++ b/bld/gen_port.iss
@@ -8,7 +8,6 @@
#define MyAppExeName "TweetDuck.exe"
#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
-#define VCRedistLink "releases/download/1.13/vc_redist.x86.exe"
[Setup]
AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
@@ -52,17 +51,13 @@ AdditionalTasks=Additional components:
[Code]
var UpdatePath: String;
-var ForceRedistPrompt: String;
function TDGetNetFrameworkVersion: Cardinal; forward;
-function TDIsVCMissing: Boolean; forward;
-procedure TDInstallVCRedist; forward;
{ Check .NET Framework version on startup, ask user if they want to proceed if older than 4.7.2. }
function InitializeSetup: Boolean;
begin
UpdatePath := ExpandConstant('{param:UPDATEPATH}')
- ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
if (TDGetNetFrameworkVersion() < 461808) and (MsgBox('{#MyAppName} requires .NET Framework 4.7.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
begin
@@ -70,11 +65,6 @@ begin
Exit
end;
- if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
- begin
- idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'))
- end;
-
Result := True
end;
@@ -98,13 +88,10 @@ begin
Result := (PageID = wpSelectDir) and (UpdatePath <> '')
end;
-{ Install VC++ if downloaded, and create a 'makeportable' file for portable installs. }
+{ Create a 'makeportable' file for portable installs. }
procedure CurStepChanged(CurStep: TSetupStep);
begin
- if CurStep = ssInstall then
- begin
- TDInstallVCRedist();
- end else if CurStep = ssPostInstall then
+ if CurStep = ssPostInstall then
begin
while not SaveStringToFile(ExpandConstant('{app}\makeportable'), '', False) do
begin
@@ -129,65 +116,3 @@ begin
Result := 0
end;
-
-{ Check if Visual C++ 2015 or 2017 is installed. }
-function TDIsVCMissing: Boolean;
-var Keys: TArrayOfString;
-var Index: Integer;
-var Key: String;
-var DisplayName: String;
-
-begin
- if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies', Keys) then
- begin
- for Index := 0 to GetArrayLength(Keys)-1 do
- begin
- Key := Keys[Index]
-
- if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
- begin
- if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
- begin
- Result := False
- Exit
- end;
- end;
- end;
- end;
-
- Result := True
-end;
-
-{ Run the Visual C++ installer if downloaded. }
-procedure TDInstallVCRedist;
-var InstallFile: String;
-var ResultCode: Integer;
-
-begin
- InstallFile := ExpandConstant('{tmp}\{#MyAppName}.VC.exe')
-
- if FileExists(InstallFile) then
- begin
- WizardForm.ProgressGauge.Style := npbstMarquee
-
- try
- if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
- begin
- if ResultCode <> 0 then
- begin
- DeleteFile(InstallFile)
- Exit
- end;
- end else
- begin
- MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
-
- DeleteFile(InstallFile)
- Exit
- end;
- finally
- WizardForm.ProgressGauge.Style := npbstNormal
- DeleteFile(InstallFile)
- end;
- end;
-end;
diff --git a/packages.config b/packages.config
index 3033060b..dcde44fa 100644
--- a/packages.config
+++ b/packages.config
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="cef.redist.x64" version="92.0.26" targetFramework="net472" />
- <package id="cef.redist.x86" version="92.0.26" targetFramework="net472" />
- <package id="CefSharp.Common" version="92.0.260" targetFramework="net472" />
- <package id="CefSharp.WinForms" version="92.0.260" targetFramework="net472" />
+ <package id="cef.redist.x64" version="96.0.18" targetFramework="net472" />
+ <package id="cef.redist.x86" version="96.0.18" targetFramework="net472" />
+ <package id="CefSharp.Common" version="96.0.180" targetFramework="net472" />
+ <package id="CefSharp.WinForms" version="96.0.180" targetFramework="net472" />
<package id="Microsoft.Net.Compilers" version="3.0.0" targetFramework="net472" developmentDependency="true" />
</packages>
\ No newline at end of file
diff --git a/subprocess/TweetDuck.Browser.csproj b/subprocess/TweetDuck.Browser.csproj
index 69d5e1cd..e4c57640 100644
--- a/subprocess/TweetDuck.Browser.csproj
+++ b/subprocess/TweetDuck.Browser.csproj
@@ -29,13 +29,13 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
- <Reference Include="CefSharp, Version=92.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
+ <Reference Include="CefSharp, Version=96.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\CefSharp.Common.92.0.260\lib\net452\CefSharp.dll</HintPath>
+ <HintPath>..\packages\CefSharp.Common.96.0.180\lib\net452\CefSharp.dll</HintPath>
</Reference>
- <Reference Include="CefSharp.BrowserSubprocess.Core, Version=92.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
+ <Reference Include="CefSharp.BrowserSubprocess.Core, Version=96.0.260, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\packages\CefSharp.Common.92.0.260\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+ <HintPath>..\packages\CefSharp.Common.96.0.180\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
</ItemGroup>