Skip to content

Commit d5693a6

Browse files
tuaruatuarua
authored
Merge pull request #304 from tuarua/development
Development
2 parents 4f6fd7e + a2d5f1e commit d5693a6

File tree

20 files changed

+47
-41
lines changed

20 files changed

+47
-41
lines changed

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 2.27.0
2+
- WIN: Updated to CefSharp 106.0.29
3+
14
### 2.26.0
25
- AND: Add `AndroidSettings.scrollBarsEnabled`
36

‎example-desktop-as3/air_package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.25.0",
3+
"version": "2.27.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,7 +10,7 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.25.0",
13+
"com.tuarua.WebViewANE": "2.27.0",
1414
"com.tuarua.FreSharp": "2.5.0",
1515
"com.tuarua.FreSwift": "5.5.2"
1616
}

‎example-desktop-complete/air_package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.26.0",
3+
"version": "2.27.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,7 +10,7 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.26.0",
13+
"com.tuarua.WebViewANE": "2.27.0",
1414
"com.tuarua.FreSharp": "2.5.0",
1515
"com.tuarua.FreSwift": "5.5.2"
1616
}

‎example-desktop-complete/src/Main-app-64.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<architecture>64</architecture>
55
<filename>WebViewANESample</filename>
66
<name>webView</name>
7-
<versionNumber>2.26.0</versionNumber>
7+
<versionNumber>2.27.0</versionNumber>
88
<initialWindow>
99
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
1010
<resizable>false</resizable>

‎example-desktop-complete/src/Main-app.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuaura.WebViewANESample</id>
44
<filename>WebViewANESample</filename>
55
<name>webView</name>
6-
<versionNumber>2.26.0</versionNumber>
6+
<versionNumber>2.27.0</versionNumber>
77
<initialWindow>
88
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
99
<title>WebViewANE Example</title>

‎example-desktop-flex/air_package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.25.0",
3+
"version": "2.27.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,7 +10,7 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.25.0",
13+
"com.tuarua.WebViewANE": "2.27.0",
1414
"com.tuarua.FreSharp": "2.5.0",
1515
"com.tuarua.FreSwift": "5.5.2"
1616
}

‎example-mobile/air_package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.26.0",
3+
"version": "2.27.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,10 +10,10 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.26.0",
13+
"com.tuarua.WebViewANE": "2.27.0",
1414
"com.google.code.gson.gson": "2.8.6",
1515
"com.tuarua.frekotlin": "1.42.0",
1616
"com.tuarua.iOS.FreSwift": "5.5.2",
17-
"com.tuarua.WebViewANE.IosDependencies": "2.26.0"
17+
"com.tuarua.WebViewANE.IosDependencies": "2.27.0"
1818
}
1919
}

‎example-mobile/src/Main-app.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>com.eoinlandy.webview</id> <!-- Bundle Identifier. Required. -->
55
<filename>WebViewANESampleMobile</filename> <!-- Used as the filename for the application. Required. -->
66
<name>WebViewANESampleMobile</name> <!-- The name that is displayed below the app icon. -->
7-
<versionNumber>2.26.0</versionNumber> <!-- Required. -->
7+
<versionNumber>2.27.0</versionNumber> <!-- Required. -->
88

99
<!-- Settings for the application's initial window. Required. -->
1010
<initialWindow>

‎native_extension/ane/air_package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.tuarua.WebViewANE",
3-
"version": "2.26.0",
3+
"version": "2.27.0",
44
"repository": {
55
"url": "https://tuarua.github.io/air/air_packages.json"
66
},

‎native_extension/ane/extension_multi.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuarua.WebViewANE</id>
44
<name>WebView ANE</name>
55
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
6-
<versionNumber>2.26.0</versionNumber>
6+
<versionNumber>2.27.0</versionNumber>
77
<platforms>
88
<platform name="iPhone-x86">
99
<applicationDeployment>

‎native_extension/ane/extension_win.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<id>com.tuarua.WebViewANE</id>
44
<name>WebView ANE</name>
55
<copyright>This work is licensed under Apache License, Copyright (c) 2017 Tua Rua Ltd.</copyright>
6-
<versionNumber>2.26.0</versionNumber>
6+
<versionNumber>2.27.0</versionNumber>
77
<platforms>
88
<platform name="Windows-x86">
99
<applicationDeployment>

‎native_extension/ane/platforms/win/x64/release/WebViewANE.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x64/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/WebViewANE.dll

0 Bytes
Binary file not shown.

‎native_extension/ane/platforms/win/x86/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

‎native_library/win/WebViewANE/WebViewANELib/WebViewANELib/CefSharp/DialogHandler.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ public class DialogHandler : IDialogHandler
1010
{
1111
public bool Disabled { get; internal set; }
1212

13-
public bool OnFileDialog(IWebBrowser chromiumWebBrowser, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback)
14-
{
13+
public bool OnFileDialog(IWebBrowser chromiumWebBrowser, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, IFileDialogCallback callback) {
1514
return Disabled;
1615
}
1716
}

‎native_library/win/WebViewANE/WebViewANELib/WebViewANELib/CefSharp/DownloadHandler.cs

+4
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,9 @@ public void OnDownloadUpdated(IWebBrowser chromiumWebBrowser, IBrowser browser,
3131
IDownloadItemCallback callback) {
3232
OnDownloadUpdatedFired?.Invoke(chromiumWebBrowser, downloadItem);
3333
}
34+
35+
public bool CanDownload(IWebBrowser chromiumWebBrowser, IBrowser browser, string url, string requestMethod) {
36+
return true;
37+
}
3438
}
3539
}

‎native_library/win/WebViewANE/WebViewANELib/WebViewANELib/WebViewANELib.csproj

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.props')" />
4-
<Import Project="..\..\packages\cef.redist.x86.98.1.21\build\cef.redist.x86.props" Condition="Exists('..\..\packages\cef.redist.x86.98.1.21\build\cef.redist.x86.props')" />
5-
<Import Project="..\..\packages\cef.redist.x64.98.1.21\build\cef.redist.x64.props" Condition="Exists('..\..\packages\cef.redist.x64.98.1.21\build\cef.redist.x64.props')" />
3+
<Import Project="..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.props')" />
4+
<Import Project="..\..\packages\cef.redist.x86.106.0.29\build\cef.redist.x86.props" Condition="Exists('..\..\packages\cef.redist.x86.106.0.29\build\cef.redist.x86.props')" />
5+
<Import Project="..\..\packages\cef.redist.x64.106.0.29\build\cef.redist.x64.props" Condition="Exists('..\..\packages\cef.redist.x64.106.0.29\build\cef.redist.x64.props')" />
66
<Import Project="..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.props" Condition="Exists('..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.props')" />
77
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
88
<PropertyGroup>
@@ -65,14 +65,14 @@
6565
<Prefer32Bit>false</Prefer32Bit>
6666
</PropertyGroup>
6767
<ItemGroup>
68-
<Reference Include="CefSharp, Version=98.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\CefSharp.Common.98.1.210\lib\net452\CefSharp.dll</HintPath>
68+
<Reference Include="CefSharp, Version=106.0.290.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\CefSharp.Common.106.0.290\lib\net452\CefSharp.dll</HintPath>
7070
</Reference>
71-
<Reference Include="CefSharp.Core, Version=98.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\CefSharp.Common.98.1.210\lib\net452\CefSharp.Core.dll</HintPath>
71+
<Reference Include="CefSharp.Core, Version=106.0.290.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
72+
<HintPath>..\..\packages\CefSharp.Common.106.0.290\lib\net452\CefSharp.Core.dll</HintPath>
7373
</Reference>
74-
<Reference Include="CefSharp.WinForms, Version=98.1.210.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\CefSharp.WinForms.98.1.210\lib\net462\CefSharp.WinForms.dll</HintPath>
74+
<Reference Include="CefSharp.WinForms, Version=106.0.290.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
75+
<HintPath>..\..\packages\CefSharp.WinForms.106.0.290\lib\net462\CefSharp.WinForms.dll</HintPath>
7676
</Reference>
7777
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
7878
<HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -171,13 +171,13 @@
171171
</PropertyGroup>
172172
<Error Condition="!Exists('..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.props'))" />
173173
<Error Condition="!Exists('..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.targets'))" />
174-
<Error Condition="!Exists('..\..\packages\cef.redist.x64.98.1.21\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.98.1.21\build\cef.redist.x64.props'))" />
175-
<Error Condition="!Exists('..\..\packages\cef.redist.x86.98.1.21\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.98.1.21\build\cef.redist.x86.props'))" />
176-
<Error Condition="!Exists('..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.props'))" />
177-
<Error Condition="!Exists('..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.targets'))" />
174+
<Error Condition="!Exists('..\..\packages\cef.redist.x64.106.0.29\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.106.0.29\build\cef.redist.x64.props'))" />
175+
<Error Condition="!Exists('..\..\packages\cef.redist.x86.106.0.29\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.106.0.29\build\cef.redist.x86.props'))" />
176+
<Error Condition="!Exists('..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.props'))" />
177+
<Error Condition="!Exists('..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.targets'))" />
178178
</Target>
179179
<Import Project="..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.targets" Condition="Exists('..\..\packages\TuaRua.FreSharp.2.5.0\build\TuaRua.FreSharp.targets')" />
180-
<Import Project="..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.98.1.210\build\CefSharp.Common.targets')" />
180+
<Import Project="..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.106.0.290\build\CefSharp.Common.targets')" />
181181
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
182182
Other similar extension points exist, see Microsoft.Common.targets.
183183
<Target Name="BeforeBuild">

‎native_library/win/WebViewANE/WebViewANELib/WebViewANELib/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cef.redist.x64" version="98.1.21" targetFramework="net462" />
4-
<package id="cef.redist.x86" version="98.1.21" targetFramework="net462" />
5-
<package id="CefSharp.Common" version="98.1.210" targetFramework="net462" />
6-
<package id="CefSharp.WinForms" version="98.1.210" targetFramework="net462" />
3+
<package id="cef.redist.x64" version="106.0.29" targetFramework="net462" />
4+
<package id="cef.redist.x86" version="106.0.29" targetFramework="net462" />
5+
<package id="CefSharp.Common" version="106.0.290" targetFramework="net462" />
6+
<package id="CefSharp.WinForms" version="106.0.290" targetFramework="net462" />
77
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
88
<package id="TuaRua.FreSharp" version="2.5.0" targetFramework="net462" />
99
</packages>

‎win_installer/scripts/products/vcredist2015.iss

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
; http://www.microsoft.com/en-us/download/details.aspx?id=48145
33

44
[CustomMessages]
5-
vcredist2015_title=Visual C++ 2015 Redistributable
6-
vcredist2015_title_x64=Visual C++ 2015 64-Bit Redistributable
5+
vcredist2015_title=Visual C++ 2015-2022 Redistributable 32-Bit
6+
vcredist2015_title_x64=Visual C++ 2015-2022 Redistributable 64-Bit
77

8-
vcredist2015_size=13.8 MB
9-
vcredist2015_size_x64=14.6 MB
8+
vcredist2015_size=13.1 MB
9+
vcredist2015_size_x64=24.1 MB
1010

1111
[Code]
1212
const
13-
vcredist2015_url = 'http://download.microsoft.com/download/d/e/c/dec58546-c2f5-40a7-b38e-4df8d60b9764/vc_redist.x86.exe';
14-
vcredist2015_url_x64 = 'http://download.microsoft.com/download/2/c/6/2c675af0-2155-4961-b32e-289d7addfcec/vc_redist.x64.exe';
13+
vcredist2015_url = 'https://aka.ms/vs/17/release/vc_redist.x86.exe';
14+
vcredist2015_url_x64 = 'https://aka.ms/vs/17/release/vc_redist.x64.exe';
1515
1616
vcredist2015_upgradecode = '{65E5BD06-6392-3027-8C26-853107D3CF1A}';
1717
vcredist2015_upgradecode_x64 = '{36F68A90-239C-34DF-B58C-64B30153CE35}';

0 commit comments

Comments
 (0)