MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-05 14:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

bump cefsharp v85.3.130

Browse Source
This commit is contained in:
pypy
2020-11-07 20:35:42 +09:00
parent 39e685592c
commit ca95e17a97
6 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Browser.cs
+1 -1
View File
@@ -27,7 +27,7 @@ namespace VRCX
Size = new Size(texture.Description.Width, texture.Description.Height); Size = new Size(texture.Description.Width, texture.Description.Height);
RenderHandler.Dispose(); RenderHandler.Dispose();
RenderHandler = new RenderHandler(this, m_Lock); RenderHandler = new RenderHandler(this, m_Lock);
Util.RegisterBindings(JavascriptObjectRepository); Util.ApplyJavascriptBindings(JavascriptObjectRepository);
} }
public new void Dispose() public new void Dispose()
MainForm.cs
+1 -1
View File
@@ -47,7 +47,7 @@ namespace VRCX
}, },
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
}; };
Util.RegisterBindings(Browser.JavascriptObjectRepository); Util.ApplyJavascriptBindings(Browser.JavascriptObjectRepository);
Browser.IsBrowserInitializedChanged += (A, B) => Browser.IsBrowserInitializedChanged += (A, B) =>
{ {
// Browser.ShowDevTools(); // Browser.ShowDevTools();
Util.cs
+9 -12
View File
@@ -4,19 +4,16 @@ namespace VRCX
{ {
public static class Util public static class Util
{ {
public static void RegisterBindings(IJavascriptObjectRepository repository) public static void ApplyJavascriptBindings(IJavascriptObjectRepository repository)
{ {
var options = new BindingOptions() repository.NameConverter = null;
{ repository.Register("VRCX", VRCX.Instance, true);
CamelCaseJavascriptNames = false repository.Register("SharedVariable", SharedVariable.Instance, false);
}; repository.Register("WebApi", WebApi.Instance, true);
repository.Register("VRCX", VRCX.Instance, true, options); repository.Register("VRCXStorage", VRCXStorage.Instance, false);
repository.Register("SharedVariable", SharedVariable.Instance, false, options); repository.Register("SQLite", SQLite.Instance, true);
repository.Register("WebApi", WebApi.Instance, true, options); repository.Register("LogWatcher", LogWatcher.Instance, true);
repository.Register("VRCXStorage", VRCXStorage.Instance, false, options); repository.Register("Discord", Discord.Instance, true);
repository.Register("SQLite", SQLite.Instance, true, options);
repository.Register("LogWatcher", LogWatcher.Instance, true, options);
repository.Register("Discord", Discord.Instance, true, options);
} }
} }
} }
VRCX.csproj
+16 -16
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props')" /> <Import Project="packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.props" Condition="Exists('packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.props')" /> <Import Project="packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.props" Condition="Exists('packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.props')" />
<Import Project="packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props')" /> <Import Project="packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props')" />
<Import Project="packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props')" /> <Import Project="packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props')" />
<Import Project="packages\cef.redist.x64.79.1.36\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.79.1.36\build\cef.redist.x64.props')" /> <Import Project="packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -206,18 +206,18 @@
<PropertyGroup> <PropertyGroup>
<ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText> <ErrorText>이 프로젝트는 이 컴퓨터에 없는 NuGet 패키지를 참조합니다. 해당 패키지를 다운로드하려면 NuGet 패키지 복원을 사용하십시오. 자세한 내용은 http://go.microsoft.com/fwlink/?LinkID=322105를 참조하십시오. 누락된 파일은 {0}입니다.</ErrorText>
</PropertyGroup> </PropertyGroup>
<Error Condition="!Exists('packages\cef.redist.x64.79.1.36\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.79.1.36\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.79.1.36\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.79.1.360\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.props'))" />
<Error Condition="!Exists('packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets'))" />
<Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" /> <Error Condition="!Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
<Error Condition="!Exists('packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.85.3.13\build\cef.redist.x64.props'))" />
<Error Condition="!Exists('packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.85.3.13\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.85.3.130\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.props'))" />
<Error Condition="!Exists('packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.targets'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.props'))" />
<Error Condition="!Exists('packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets'))" />
</Target> </Target>
<Import Project="packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.79.1.360\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.targets" Condition="Exists('packages\CefSharp.OffScreen.79.1.360\build\CefSharp.OffScreen.targets')" />
<Import Project="packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.79.1.360\build\CefSharp.WinForms.targets')" />
<Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" /> <Import Project="packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net451\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
<Import Project="packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.85.3.130\build\CefSharp.Common.targets')" />
<Import Project="packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.targets" Condition="Exists('packages\CefSharp.OffScreen.85.3.130\build\CefSharp.OffScreen.targets')" />
<Import Project="packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.85.3.130\build\CefSharp.WinForms.targets')" />
</Project> </Project>
VRForm.cs
+2 -6
View File
@@ -42,12 +42,8 @@ namespace VRCX
}, },
Dock = DockStyle.Fill, Dock = DockStyle.Fill,
}; };
var options = new BindingOptions() Util.ApplyJavascriptBindings(Browser1.JavascriptObjectRepository);
{ Util.ApplyJavascriptBindings(Browser2.JavascriptObjectRepository);
CamelCaseJavascriptNames = false
};
Util.RegisterBindings(Browser1.JavascriptObjectRepository);
Util.RegisterBindings(Browser2.JavascriptObjectRepository);
panel1.Controls.Add(Browser1); panel1.Controls.Add(Browser1);
panel2.Controls.Add(Browser2); panel2.Controls.Add(Browser2);
} }
packages.config
+5 -5
View File
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="cef.redist.x64" version="79.1.36" targetFramework="net452" /> <package id="cef.redist.x64" version="85.3.13" targetFramework="net452" />
<package id="cef.redist.x86" version="79.1.36" targetFramework="net452" /> <package id="cef.redist.x86" version="85.3.13" targetFramework="net452" />
<package id="CefSharp.Common" version="79.1.360" targetFramework="net452" /> <package id="CefSharp.Common" version="85.3.130" targetFramework="net452" />
<package id="CefSharp.OffScreen" version="79.1.360" targetFramework="net452" /> <package id="CefSharp.OffScreen" version="85.3.130" targetFramework="net452" />
<package id="CefSharp.WinForms" version="79.1.360" targetFramework="net452" /> <package id="CefSharp.WinForms" version="85.3.130" targetFramework="net452" />
<package id="DiscordRichPresence" version="1.0.150" targetFramework="net452" /> <package id="DiscordRichPresence" version="1.0.150" targetFramework="net452" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" /> <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net452" />
<package id="SharpDX" version="4.2.0" targetFramework="net452" /> <package id="SharpDX" version="4.2.0" targetFramework="net452" />