mirror of
https://github.com/space-wizards/RobustToolbox.git
synced 2026-06-09 10:06:34 +02:00
Update CEF to 147
OpenDream is BACK
This commit is contained in:
@@ -8,6 +8,7 @@
|
|||||||
We use Directory.Build.props to get copy the state *after* our MSBuild config but before Nuget's config.
|
We use Directory.Build.props to get copy the state *after* our MSBuild config but before Nuget's config.
|
||||||
-->
|
-->
|
||||||
<ManagePackageVersionsCentrally />
|
<ManagePackageVersionsCentrally />
|
||||||
|
<CefNativeVersion>147.0.10</CefNativeVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
|
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
|
||||||
@@ -49,7 +50,8 @@
|
|||||||
<PackageVersion Include="Pidgin" Version="3.5.1" />
|
<PackageVersion Include="Pidgin" Version="3.5.1" />
|
||||||
<PackageVersion Include="Robust.Natives" Version="0.2.3" />
|
<PackageVersion Include="Robust.Natives" Version="0.2.3" />
|
||||||
<PackageVersion Include="Robust.Natives.Zstd" Version="0.1.1-zstd1.5.7" />
|
<PackageVersion Include="Robust.Natives.Zstd" Version="0.1.1-zstd1.5.7" />
|
||||||
<PackageVersion Include="Robust.Natives.Cef" Version="131.3.5" />
|
<PackageVersion Include="Robust.Natives.Cef.win-x64" Version="$(CefNativeVersion)" />
|
||||||
|
<PackageVersion Include="Robust.Natives.Cef.linux-x64" Version="$(CefNativeVersion)" />
|
||||||
<PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
|
<PackageVersion Include="Robust.Shared.AuthLib" Version="0.1.2" />
|
||||||
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
|
<PackageVersion Include="SQLitePCLRaw.bundle_e_sqlite3" Version="3.0.2" />
|
||||||
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
|
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ namespace Robust.Client.WebView.Cef
|
|||||||
settings.UserAgent = userAgentOverride;
|
settings.UserAgent = userAgentOverride;
|
||||||
}
|
}
|
||||||
|
|
||||||
_sawmill.Info($"CEF Version: {CefRuntime.ChromeVersion}");
|
_sawmill.Info($"CEF Build Version: {CefRuntime.ChromeBuildVersion}");
|
||||||
|
|
||||||
_app = new RobustCefApp(_sawmill);
|
_app = new RobustCefApp(_sawmill);
|
||||||
|
|
||||||
@@ -119,6 +119,8 @@ namespace Robust.Client.WebView.Cef
|
|||||||
// The second argument turns off CEF's bullshit error handling, which breaks dotnet's error handling.
|
// The second argument turns off CEF's bullshit error handling, which breaks dotnet's error handling.
|
||||||
CefRuntime.Initialize(new CefMainArgs(new string[]{"binary","--disable-in-process-stack-traces"}), settings, _app, IntPtr.Zero);
|
CefRuntime.Initialize(new CefMainArgs(new string[]{"binary","--disable-in-process-stack-traces"}), settings, _app, IntPtr.Zero);
|
||||||
|
|
||||||
|
_sawmill.Info($"CEF Runtime Version: {CefRuntime.ChromeRuntimeVersion}");
|
||||||
|
|
||||||
if (_cfg.GetCVar(WCVars.WebResProtocol))
|
if (_cfg.GetCVar(WCVars.WebResProtocol))
|
||||||
{
|
{
|
||||||
var handler = new ResourceSchemeFactoryHandler(
|
var handler = new ResourceSchemeFactoryHandler(
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JetBrains.Annotations" />
|
<PackageReference Include="JetBrains.Annotations" />
|
||||||
<PackageReference Include="Robust.Natives.Cef" />
|
<PackageReference Include="Robust.Natives.Cef.win-x64" />
|
||||||
|
<PackageReference Include="Robust.Natives.Cef.linux-x64" />
|
||||||
<PackageReference Include="SixLabors.ImageSharp" />
|
<PackageReference Include="SixLabors.ImageSharp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
+1
-1
Submodule cefglue updated: bceff8482c...6b4dcf1833
Reference in New Issue
Block a user