2024-11-25 23:42:46 +01:00
25 changed files with 42 additions and 66 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,7 +12,6 @@ bld/*
 # Rider
 **/.idea/dictionaries
 **/.idea/misc.xml
-**/.idea/riderMarkupCache.xml

 # User-specific files
 *.suo
--- a/.idea/.idea.TweetDuck/.idea/runConfigurations/TweetDuck.xml
+++ b/.idea/.idea.TweetDuck/.idea/runConfigurations/TweetDuck.xml
@ -12,7 +12,7 @@
    <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
    <option name="PROJECT_KIND" value="DotNetCore" />
-    <option name="PROJECT_TFM" value="net7.0-windows" />
+    <option name="PROJECT_TFM" value="net6.0-windows7.0" />
    <method v="2">
      <option name="Build" />
    </method>
--- a/global.json
+++ b/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "7.0.0",
+    "version": "6.0.0",
    "rollForward": "latestMinor",
    "allowPrerelease": false
  }
--- a/lib/TweetLib.Browser.CEF/TweetLib.Browser.CEF.csproj
+++ b/lib/TweetLib.Browser.CEF/TweetLib.Browser.CEF.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86;x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/lib/TweetLib.Browser/TweetLib.Browser.csproj
+++ b/lib/TweetLib.Browser/TweetLib.Browser.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86;x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/lib/TweetLib.Communication/TweetLib.Communication.csproj
+++ b/lib/TweetLib.Communication/TweetLib.Communication.csproj
@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Platforms>x86</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/lib/TweetLib.Core/TweetLib.Core.csproj
+++ b/lib/TweetLib.Core/TweetLib.Core.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86;x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/lib/TweetLib.Utils/TweetLib.Utils.csproj
+++ b/lib/TweetLib.Utils/TweetLib.Utils.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86;x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/lib/TweetTest.Browser.CEF/TweetTest.Browser.CEF.fsproj
+++ b/lib/TweetTest.Browser.CEF/TweetTest.Browser.CEF.fsproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Platforms>x86</Platforms>
    <RuntimeIdentifiers>win7-x86;linux-x64</RuntimeIdentifiers>
  </PropertyGroup>
--- a/lib/TweetTest.Core/Features/Twitter/TestTwitterUrls.fs
+++ b/lib/TweetTest.Core/Features/Twitter/TestTwitterUrls.fs
@ -7,7 +7,7 @@ open Xunit
 module RegexAccount =

    module IsMatch =
-        let isMatch: string -> bool = TwitterUrls.RegexAccount.IsMatch
+        let isMatch = TwitterUrls.RegexAccount.IsMatch

        [<Fact>]
        let ``accepts HTTP protocol`` () =
--- a/lib/TweetTest.Core/TweetTest.Core.fsproj
+++ b/lib/TweetTest.Core/TweetTest.Core.fsproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Platforms>x86</Platforms>
    <RuntimeIdentifiers>win7-x86;linux-x64</RuntimeIdentifiers>
  </PropertyGroup>
--- a/lib/TweetTest.Utils/TweetTest.Utils.fsproj
+++ b/lib/TweetTest.Utils/TweetTest.Utils.fsproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Platforms>x86</Platforms>
    <RuntimeIdentifiers>win7-x86;linux-x64</RuntimeIdentifiers>
  </PropertyGroup>
--- a/linux/TweetDuck/TweetDuck.csproj
+++ b/linux/TweetDuck/TweetDuck.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <OutputType>WinExe</OutputType>
    <Nullable>enable</Nullable>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
--- a/linux/TweetImpl.CefGlue/TweetImpl.CefGlue.csproj
+++ b/linux/TweetImpl.CefGlue/TweetImpl.CefGlue.csproj
@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x64</Platforms>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>
--- a/linux/global.json
+++ b/linux/global.json
@ -1,6 +1,6 @@
 {
  "sdk": {
-    "version": "7.0.0",
+    "version": "6.0.0",
    "rollForward": "latestMinor",
    "allowPrerelease": false
  }
--- a/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
+++ b/windows/TweetDuck.Browser/TweetDuck.Browser.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86</Platforms>
    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  
@ -33,7 +33,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="CefSharp.WinForms.NETCore" Version="107.1.90" />
+    <PackageReference Include="CefSharp.WinForms.NETCore" Version="105.3.330" />
  </ItemGroup>
  
  <ItemGroup>
--- a/windows/TweetDuck.Video/Controls/LabelTooltip.cs
+++ b/windows/TweetDuck.Video/Controls/LabelTooltip.cs
@ -23,7 +23,7 @@ public void AttachTooltip(Control control, bool followCursor, Func<MouseEventArg

 				string? text = tooltipFunc(args);

-				if (text == null || control.Parent == null) {
+				if (text == null) {
 					Visible = false;
 					return;
 				}
--- a/windows/TweetDuck.Video/Controls/SeekBar.cs
+++ b/windows/TweetDuck.Video/Controls/SeekBar.cs
@ -28,7 +28,7 @@ protected override void OnPaint(PaintEventArgs e) {
 				brushFore.Color = ForeColor;
 				brushHover.Color = Color.FromArgb(128, ForeColor);
 				brushOverlap.Color = Color.FromArgb(80 + ForeColor.R * 11 / 16, 80 + ForeColor.G * 11 / 16, 80 + ForeColor.B * 11 / 16);
-				brushBack.Color = Parent?.BackColor ?? Color.Black;
+				brushBack.Color = Parent.BackColor;
 			}

 			Rectangle rect = new Rectangle(0, 0, Width, Height);
--- a/windows/TweetDuck.Video/TweetDuck.Video.csproj
+++ b/windows/TweetDuck.Video/TweetDuck.Video.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86</Platforms>
    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  
--- a/windows/TweetDuck/Controls/ControlExtensions.cs
+++ b/windows/TweetDuck/Controls/ControlExtensions.cs
@ -95,8 +95,8 @@ public static void Restore(this WindowState state, Form form, bool firstTimeFull
 				form.WindowState = state.IsMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
 			}

-			if (((state.Bounds == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()) && Screen.PrimaryScreen is {} primaryScreen) {
-				form.DesktopBounds = primaryScreen.WorkingArea;
+			if ((state.Bounds == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()) {
+				form.DesktopBounds = Screen.PrimaryScreen.WorkingArea;
 				form.WindowState = FormWindowState.Maximized;
 				state.Save(form);
 			}
--- a/windows/TweetDuck/Dialogs/FormAbout.cs
+++ b/windows/TweetDuck/Dialogs/FormAbout.cs
@ -28,7 +28,7 @@ public FormAbout() {
 		}

 		private void OnLinkClicked(object? sender, LinkLabelLinkClickedEventArgs e) {
-			App.SystemHandler.OpenBrowser(e.Link?.LinkData as string);
+			App.SystemHandler.OpenBrowser(e.Link.LinkData as string);
 		}

 		private void FormAbout_HelpRequested(object? sender, HelpEventArgs hlpevent) {
--- a/windows/TweetDuck/TweetDuck.csproj
+++ b/windows/TweetDuck/TweetDuck.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86</Platforms>
    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  
@ -36,7 +36,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="CefSharp.WinForms.NETCore" Version="107.1.90" />
+    <PackageReference Include="CefSharp.WinForms.NETCore" Version="105.3.330" />
  </ItemGroup>
  
  <ItemGroup>
--- a/windows/TweetImpl.CefSharp/Handlers/CefRequestHandler.cs
+++ b/windows/TweetImpl.CefSharp/Handlers/CefRequestHandler.cs
@ -1,4 +1,3 @@
-using System.Diagnostics;
 using CefSharp;
 using CefSharp.Handler;
 using TweetImpl.CefSharp.Adapters;
@ -8,11 +7,11 @@ namespace TweetImpl.CefSharp.Handlers {
 	sealed class CefRequestHandler : RequestHandler {
 		public RequestHandlerLogic<IRequest> Logic { get; }

-		private readonly AutoReloader? autoReloader;
+		private readonly bool autoReload;

 		public CefRequestHandler(CefLifeSpanHandler lifeSpanHandler, bool autoReload) {
 			this.Logic = new RequestHandlerLogic<IRequest>(CefRequestAdapter.Instance, lifeSpanHandler.Logic);
-			this.autoReloader = autoReload ? new AutoReloader() : null;
+			this.autoReload = autoReload;
 		}

 		protected override bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect) {
@ -24,31 +23,9 @@ protected override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser br
 		}

 		protected override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status) {
-			if (autoReloader?.RequestReload() == true) {
+			if (autoReload) {
 				browser.Reload();
 			}
 		}
-
-		private sealed class AutoReloader {
-			private readonly Stopwatch lastReload = Stopwatch.StartNew();
-			private int rapidReloadCount;
-			
-			public bool RequestReload() {
-				if (rapidReloadCount >= 2) {
-					lastReload.Stop();
-					return false;
-				}
-				
-				if (lastReload.ElapsedMilliseconds < 5000) {
-					++rapidReloadCount;
-				}
-				else {
-					rapidReloadCount = 0;
-				}
-				
-				lastReload.Restart();
-				return true;
-			}
-		}
 	}
 }
--- a/windows/TweetImpl.CefSharp/TweetImpl.CefSharp.csproj
+++ b/windows/TweetImpl.CefSharp/TweetImpl.CefSharp.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86</Platforms>
    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>enable</Nullable>
  </PropertyGroup>
  
@ -28,7 +28,7 @@
  </PropertyGroup>
  
  <ItemGroup>
-    <PackageReference Include="CefSharp.WinForms.NETCore" Version="107.1.90" />
+    <PackageReference Include="CefSharp.WinForms.NETCore" Version="105.3.330" />
  </ItemGroup>
  
  <ItemGroup>
--- a/windows/TweetLib.WinForms.Legacy/TweetLib.WinForms.Legacy.csproj
+++ b/windows/TweetLib.WinForms.Legacy/TweetLib.WinForms.Legacy.csproj
@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  
  <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
    <Configurations>Debug;Release</Configurations>
    <Platforms>x86</Platforms>
    <RuntimeIdentifier>win7-x86</RuntimeIdentifier>
-    <LangVersion>11</LangVersion>
+    <LangVersion>10</LangVersion>
    <Nullable>disable</Nullable>
    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
  </PropertyGroup>