Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
Ftt_Common
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Ftt_Common
Commits
a0193797
Commit
a0193797
authored
Aug 24, 2021
by
tr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、因整包更新效率问题:暂时移除CEF框架
parent
1c70aa27
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
40 deletions
+5
-40
Program.cs
Tools/Program.cs
+0
-7
Tools.csproj
Tools/Tools.csproj
+0
-25
wCefDemo.cs
Tools/UI/wCefDemo.cs
+5
-3
packages.config
Tools/packages.config
+0
-5
No files found.
Tools/Program.cs
View file @
a0193797
...
@@ -5,9 +5,6 @@ using System.IO;
...
@@ -5,9 +5,6 @@ using System.IO;
using
System.Linq
;
using
System.Linq
;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
System.Windows.Forms
;
using
System.Windows.Forms
;
//
using
CefSharp
;
using
CefSharp.WinForms
;
namespace
Tools
namespace
Tools
{
{
...
@@ -19,10 +16,6 @@ namespace Tools
...
@@ -19,10 +16,6 @@ namespace Tools
[
STAThread
]
[
STAThread
]
static
void
Main
()
static
void
Main
()
{
{
CefSettings
cefSettings
=
new
CefSettings
();
cefSettings
.
DisableGpuAcceleration
();
Cef
.
Initialize
(
cefSettings
);
//
Application
.
EnableVisualStyles
();
Application
.
EnableVisualStyles
();
Application
.
SetCompatibleTextRenderingDefault
(
false
);
Application
.
SetCompatibleTextRenderingDefault
(
false
);
Application
.
Run
(
new
wMain
());
Application
.
Run
(
new
wMain
());
...
...
Tools/Tools.csproj
View file @
a0193797
<?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.Common.92.0.251\build\CefSharp.Common.props"
Condition=
"Exists('..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.props')"
/>
<Import
Project=
"..\packages\cef.redist.x86.92.0.25\build\cef.redist.x86.props"
Condition=
"Exists('..\packages\cef.redist.x86.92.0.25\build\cef.redist.x86.props')"
/>
<Import
Project=
"..\packages\cef.redist.x64.92.0.25\build\cef.redist.x64.props"
Condition=
"Exists('..\packages\cef.redist.x64.92.0.25\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>
...
@@ -47,15 +44,6 @@
...
@@ -47,15 +44,6 @@
<Reference
Include=
"BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"
>
<Reference
Include=
"BouncyCastle.Crypto, Version=1.8.6.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL"
>
<HintPath>
..\FunnyPick\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll
</HintPath>
<HintPath>
..\FunnyPick\packages\Portable.BouncyCastle.1.8.6\lib\net40\BouncyCastle.Crypto.dll
</HintPath>
</Reference>
</Reference>
<Reference
Include=
"CefSharp, Version=92.0.251.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"
>
<HintPath>
..\packages\CefSharp.Common.92.0.251\lib\net452\CefSharp.dll
</HintPath>
</Reference>
<Reference
Include=
"CefSharp.Core, Version=92.0.251.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"
>
<HintPath>
..\packages\CefSharp.Common.92.0.251\lib\net452\CefSharp.Core.dll
</HintPath>
</Reference>
<Reference
Include=
"CefSharp.WinForms, Version=92.0.251.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL"
>
<HintPath>
..\packages\CefSharp.WinForms.92.0.251\lib\net452\CefSharp.WinForms.dll
</HintPath>
</Reference>
<Reference
Include=
"ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"
>
<Reference
Include=
"ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL"
>
<HintPath>
..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll
</HintPath>
<HintPath>
..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll
</HintPath>
</Reference>
</Reference>
...
@@ -84,9 +72,6 @@
...
@@ -84,9 +72,6 @@
<Reference
Include=
"System.Net.Http"
/>
<Reference
Include=
"System.Net.Http"
/>
<Reference
Include=
"System.Windows.Forms"
/>
<Reference
Include=
"System.Windows.Forms"
/>
<Reference
Include=
"System.Xml"
/>
<Reference
Include=
"System.Xml"
/>
<Reference
Include=
"TSF.TypeLib, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL"
>
<HintPath>
..\packages\TSF.TypeLib.1.0.1.0\lib\portable-windows8+net45\TSF.TypeLib.dll
</HintPath>
</Reference>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<Compile
Include=
"MyCommon\controls\MyTreeView.cs"
>
<Compile
Include=
"MyCommon\controls\MyTreeView.cs"
>
...
@@ -529,14 +514,4 @@
...
@@ -529,14 +514,4 @@
</ItemGroup>
</ItemGroup>
<ItemGroup
/>
<ItemGroup
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Target
Name=
"EnsureNuGetPackageBuildImports"
BeforeTargets=
"PrepareForBuild"
>
<PropertyGroup>
<ErrorText>
这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。
</ErrorText>
</PropertyGroup>
<Error
Condition=
"!Exists('..\packages\cef.redist.x64.92.0.25\build\cef.redist.x64.props')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x64.92.0.25\build\cef.redist.x64.props'))"
/>
<Error
Condition=
"!Exists('..\packages\cef.redist.x86.92.0.25\build\cef.redist.x86.props')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.92.0.25\build\cef.redist.x86.props'))"
/>
<Error
Condition=
"!Exists('..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.props')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.props'))"
/>
<Error
Condition=
"!Exists('..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.targets')"
Text=
"$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.targets'))"
/>
</Target>
<Import
Project=
"..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.targets"
Condition=
"Exists('..\packages\CefSharp.Common.92.0.251\build\CefSharp.Common.targets')"
/>
</Project>
</Project>
\ No newline at end of file
Tools/UI/wCefDemo.cs
View file @
a0193797
...
@@ -8,8 +8,8 @@ using System.Text;
...
@@ -8,8 +8,8 @@ using System.Text;
using
System.Threading.Tasks
;
using
System.Threading.Tasks
;
using
System.Windows.Forms
;
using
System.Windows.Forms
;
//
//
using
CefSharp
;
//
using CefSharp;
using
CefSharp.WinForms
;
//
using CefSharp.WinForms;
//
//
using
Tools.MyUtils
;
using
Tools.MyUtils
;
...
@@ -17,6 +17,8 @@ namespace Tools.UI
...
@@ -17,6 +17,8 @@ namespace Tools.UI
{
{
public
partial
class
wCefDemo
:
Form
public
partial
class
wCefDemo
:
Form
{
{
/*
private readonly ChromiumWebBrowser browser;
private readonly ChromiumWebBrowser browser;
public wCefDemo()
public wCefDemo()
...
@@ -181,6 +183,6 @@ namespace Tools.UI
...
@@ -181,6 +183,6 @@ namespace Tools.UI
}
}
#endregion
#endregion
*/
}
}
}
}
Tools/packages.config
View file @
a0193797
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<?
xml
version
=
"1.0"
encoding
=
"utf-8"
?>
<
packages
>
<
packages
>
<
package
id
=
"cef.redist.x64"
version
=
"92.0.25"
targetFramework
=
"net48"
/>
<
package
id
=
"cef.redist.x86"
version
=
"92.0.25"
targetFramework
=
"net48"
/>
<
package
id
=
"CefSharp.Common"
version
=
"92.0.251"
targetFramework
=
"net48"
/>
<
package
id
=
"CefSharp.WinForms"
version
=
"92.0.251"
targetFramework
=
"net48"
/>
<
package
id
=
"NPOI"
version
=
"2.5.1"
targetFramework
=
"net461"
/>
<
package
id
=
"NPOI"
version
=
"2.5.1"
targetFramework
=
"net461"
/>
<
package
id
=
"Portable.BouncyCastle"
version
=
"1.8.6"
targetFramework
=
"net461"
/>
<
package
id
=
"Portable.BouncyCastle"
version
=
"1.8.6"
targetFramework
=
"net461"
/>
<
package
id
=
"SharpZipLib"
version
=
"1.3.2"
targetFramework
=
"net461"
/>
<
package
id
=
"SharpZipLib"
version
=
"1.3.2"
targetFramework
=
"net461"
/>
<
package
id
=
"TSF.TypeLib"
version
=
"1.0.1.0"
targetFramework
=
"net48"
/>
</
packages
>
</
packages
>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment