Skip to content

Commit 4119254

Browse files
tuaruatuarua
authored
Merge pull request #293 from tuarua/development
Development
2 parents f8300bf + 20bc9e0 commit 4119254

File tree

23 files changed

+59
-60
lines changed

23 files changed

+59
-60
lines changed

Diff for: ‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
### 2.23.0
2+
- WIN: Updated to CefSharp 95.7.14
3+
- iOS/macOS: Updated to FreSwift 5.5.1
4+
- macOS: Support Apple M1
5+
16
### 2.22.0
27
- WIN/macOS: add `settings.disableFileDialog`
38

Diff for: ‎example-desktop-as3/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.22.0",
3+
"version": "2.23.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.22.0",
13+
"com.tuarua.WebViewANE": "2.23.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.0"
15+
"com.tuarua.FreSwift": "5.5.1"
1616
}
1717
}

Diff for: ‎example-desktop-complete/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.22.0",
3+
"version": "2.23.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.22.0",
13+
"com.tuarua.WebViewANE": "2.23.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.0"
15+
"com.tuarua.FreSwift": "5.5.1"
1616
}
1717
}

Diff for: ‎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.22.0</versionNumber>
7+
<versionNumber>2.23.0</versionNumber>
88
<initialWindow>
99
<content>[This value will be overwritten by Flash Builder in the output app.xml]</content>
1010
<resizable>false</resizable>

Diff for: ‎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.22.0</versionNumber>
6+
<versionNumber>2.23.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>

Diff for: ‎example-desktop-flex/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.21.0",
3+
"version": "2.23.0",
44
"appDescriptor": "src/Main-app.xml",
55
"variables": {
66
},
@@ -10,8 +10,8 @@
1010
"url": "https://tuarua.github.io/air/air_packages.json"
1111
},
1212
"dependencies": {
13-
"com.tuarua.WebViewANE": "2.21.0",
13+
"com.tuarua.WebViewANE": "2.23.0",
1414
"com.tuarua.FreSharp": "2.5.0",
15-
"com.tuarua.FreSwift": "5.5.0"
15+
"com.tuarua.FreSwift": "5.5.1"
1616
}
1717
}

Diff for: ‎example-mobile/air_package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "webview-sample",
3-
"version": "2.22.0",
3+
"version": "2.23.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.22.0",
13+
"com.tuarua.WebViewANE": "2.23.0",
1414
"com.google.code.gson.gson": "2.8.6",
1515
"com.tuarua.frekotlin": "1.42.0",
16-
"com.tuarua.iOS.FreSwift": "5.5.0",
17-
"com.tuarua.WebViewANE.IosDependencies": "2.22.0"
16+
"com.tuarua.iOS.FreSwift": "5.5.1",
17+
"com.tuarua.WebViewANE.IosDependencies": "2.23.0"
1818
}
1919
}

Diff for: ‎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.22.0</versionNumber> <!-- Required. -->
7+
<versionNumber>2.23.0</versionNumber> <!-- Required. -->
88

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

Diff for: ‎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.22.0",
3+
"version": "2.23.0",
44
"repository": {
55
"url": "https://tuarua.github.io/air/air_packages.json"
66
},

Diff for: ‎native_extension/ane/build_multi.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PROJECTNAME=WebViewANE
88
fwSuffix="_FW"
99
libSuffix="_LIB"
1010

11-
AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.345"
11+
AIR_SDK="/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633"
1212

1313
if [ ! -d "$pathtome/../../native_library/apple/$PROJECTNAME/Build/Products/Release-iphonesimulator/" ]; then
1414
echo "No Simulator build. Build using Xcode"

Diff for: ‎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.22.0</versionNumber>
6+
<versionNumber>2.23.0</versionNumber>
77
<platforms>
88
<platform name="iPhone-x86">
99
<applicationDeployment>

Diff for: ‎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.22.0</versionNumber>
6+
<versionNumber>2.23.0</versionNumber>
77
<platforms>
88
<platform name="Windows-x86">
99
<applicationDeployment>

Diff for: ‎native_extension/ane/platforms/ios/platform-sim.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
3-
<sdkVersion>14.4</sdkVersion>
3+
<sdkVersion>15.0</sdkVersion>
44
<linkerOptions>
55
<option>-w</option>
66
<option>-ObjC</option>

Diff for: ‎native_extension/ane/platforms/ios/platform.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<platform xmlns="http://ns.adobe.com/air/extension/19.0">
3-
<sdkVersion>14.4</sdkVersion>
3+
<sdkVersion>15.0</sdkVersion>
44
<linkerOptions>
55
<option>-ios_version_min 9.0</option>
66
<option>-w</option>

Diff for: ‎native_extension/ane/platforms/win/x64/release/WebViewANE.dll

0 Bytes
Binary file not shown.

Diff for: ‎native_extension/ane/platforms/win/x64/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

Diff for: ‎native_extension/ane/platforms/win/x86/release/WebViewANE.dll

0 Bytes
Binary file not shown.

Diff for: ‎native_extension/ane/platforms/win/x86/release/WebViewANELib.dll

0 Bytes
Binary file not shown.

Diff for: ‎native_library/apple/WebViewANE/Cartfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.5.0/FreSwift.json" ~> 5.5.0
1+
binary "https://github.com/tuarua/Swift-IOS-ANE/releases/download/5.5.1/FreSwift.json" ~> 5.5.1

Diff for: ‎native_library/apple/WebViewANE/WebViewANE.xcodeproj/project.pbxproj

+12-18
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
CE6C07E22079713400393167 /* WebViewVC+UIScrollViewDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6534E202798370034C691 /* WebViewVC+UIScrollViewDelegate.swift */; platformFilter = ios; };
3535
CE6C07E32079716200393167 /* FreMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = CE0014D11F648344000AE663 /* FreMacros.h */; platformFilter = ios; };
3636
CE6C07F9207974DB00393167 /* FreSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C07F8207974DB00393167 /* FreSwift.framework */; };
37-
CE6C07FC2079759400393167 /* Adobe AIR_64 in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C07FA2079759400393167 /* Adobe AIR_64 */; };
38-
CE6C07FD2079759400393167 /* Adobe AIR in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6C07FB2079759400393167 /* Adobe AIR */; };
3937
CE6C07FE2079765500393167 /* WebViewANE_oc.h in Headers */ = {isa = PBXBuildFile; fileRef = 285FEBB3CADF8D704FAB5E4D /* WebViewANE_oc.h */; };
4038
CE6C07FF2079765500393167 /* FreMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = CE0014D11F648344000AE663 /* FreMacros.h */; };
4139
CE6C08012079767800393167 /* Popup.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE6C07E5207972F800393167 /* Popup.swift */; };
@@ -87,8 +85,7 @@
8785
CE6C07E5207972F800393167 /* Popup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Popup.swift; sourceTree = "<group>"; };
8886
CE6C07EB2079744700393167 /* WebViewANE.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = WebViewANE.framework; sourceTree = BUILT_PRODUCTS_DIR; };
8987
CE6C07F8207974DB00393167 /* FreSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FreSwift.framework; path = Carthage/Build/Mac/FreSwift.framework; sourceTree = "<group>"; };
90-
CE6C07FA2079759400393167 /* Adobe AIR_64 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR_64"; path = "../../../../../SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR_64"; sourceTree = "<group>"; };
91-
CE6C07FB2079759400393167 /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "../../../../../SDKs/AIRSDK_32/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = "<group>"; };
88+
CE6C07FB2079759400393167 /* Adobe AIR */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "Adobe AIR"; path = "../../../../../SDKs/AIRSDK_33.1.1.633/runtimes/air-captive/mac/Adobe AIR.framework/Versions/1.0/Adobe AIR"; sourceTree = "<group>"; };
9289
CE886FC62047491300B2C8FF /* URL.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URL.swift; sourceTree = "<group>"; };
9390
CE886FC8204749BC00B2C8FF /* .swiftlint.yml */ = {isa = PBXFileReference; lastKnownFileType = text; path = .swiftlint.yml; sourceTree = "<group>"; };
9491
CEA65344202797B50034C691 /* PopupBehaviour.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PopupBehaviour.swift; sourceTree = "<group>"; };
@@ -124,8 +121,6 @@
124121
isa = PBXFrameworksBuildPhase;
125122
buildActionMask = 2147483647;
126123
files = (
127-
CE6C07FD2079759400393167 /* Adobe AIR in Frameworks */,
128-
CE6C07FC2079759400393167 /* Adobe AIR_64 in Frameworks */,
129124
907FA02A2396D4DA00A02384 /* SwiftyJSON in Frameworks */,
130125
CE6C07F9207974DB00393167 /* FreSwift.framework in Frameworks */,
131126
);
@@ -138,7 +133,6 @@
138133
isa = PBXGroup;
139134
children = (
140135
CE6C07FB2079759400393167 /* Adobe AIR */,
141-
CE6C07FA2079759400393167 /* Adobe AIR_64 */,
142136
CE6C07F8207974DB00393167 /* FreSwift.framework */,
143137
CE0014D61F648483000AE663 /* FreSwift.framework */,
144138
);
@@ -328,7 +322,7 @@
328322
CE3980631E58BA7F0062485B /* Project object */ = {
329323
isa = PBXProject;
330324
attributes = {
331-
LastUpgradeCheck = 1300;
325+
LastUpgradeCheck = 1310;
332326
ORGANIZATIONNAME = "Tua Rua Ltd";
333327
TargetAttributes = {
334328
CE3980891E58BAA90062485B = {
@@ -640,7 +634,7 @@
640634
"@executable_path/Frameworks",
641635
"@loader_path/Frameworks",
642636
);
643-
MARKETING_VERSION = 2.22.0;
637+
MARKETING_VERSION = 2.23.0;
644638
ONLY_ACTIVE_ARCH = NO;
645639
OTHER_LDFLAGS = "-ObjC";
646640
PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.WebViewANE;
@@ -687,7 +681,7 @@
687681
"@executable_path/Frameworks",
688682
"@loader_path/Frameworks",
689683
);
690-
MARKETING_VERSION = 2.22.0;
684+
MARKETING_VERSION = 2.23.0;
691685
ONLY_ACTIVE_ARCH = NO;
692686
OTHER_LDFLAGS = "-ObjC";
693687
PRODUCT_BUNDLE_IDENTIFIER = com.tuarua.WebViewANE;
@@ -767,7 +761,7 @@
767761
CE6C07F12079744700393167 /* Debug */ = {
768762
isa = XCBuildConfiguration;
769763
buildSettings = {
770-
ARCHS = x86_64;
764+
ARCHS = "$(ARCHS_STANDARD)";
771765
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
772766
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
773767
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -783,7 +777,7 @@
783777
DYLIB_INSTALL_NAME_BASE = "@rpath";
784778
FRAMEWORK_SEARCH_PATHS = (
785779
"$(inherited)",
786-
/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac,
780+
/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac,
787781
"$(PROJECT_DIR)/Carthage/Build/Mac",
788782
);
789783
FRAMEWORK_VERSION = A;
@@ -795,9 +789,9 @@
795789
"@executable_path/../Frameworks",
796790
"@loader_path/Frameworks",
797791
);
798-
LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
792+
LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac;
799793
MACOSX_DEPLOYMENT_TARGET = 10.10;
800-
MARKETING_VERSION = 2.22.0;
794+
MARKETING_VERSION = 2.23.0;
801795
OTHER_LDFLAGS = (
802796
"-weak_framework",
803797
"\"Adobe AIR\"",
@@ -820,7 +814,7 @@
820814
CE6C07F22079744700393167 /* Release */ = {
821815
isa = XCBuildConfiguration;
822816
buildSettings = {
823-
ARCHS = x86_64;
817+
ARCHS = "$(ARCHS_STANDARD)";
824818
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
825819
CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
826820
CLANG_ENABLE_OBJC_WEAK = YES;
@@ -836,7 +830,7 @@
836830
DYLIB_INSTALL_NAME_BASE = "@rpath";
837831
FRAMEWORK_SEARCH_PATHS = (
838832
"$(inherited)",
839-
/Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac,
833+
/Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac,
840834
"$(PROJECT_DIR)/Carthage/Build/Mac",
841835
);
842836
FRAMEWORK_VERSION = A;
@@ -848,9 +842,9 @@
848842
"@executable_path/../Frameworks",
849843
"@loader_path/Frameworks",
850844
);
851-
LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_32/runtimes/air/mac;
845+
LIBRARY_SEARCH_PATHS = /Users/eoinlandy/SDKs/AIRSDK_33.1.1.633/runtimes/air/mac;
852846
MACOSX_DEPLOYMENT_TARGET = 10.10;
853-
MARKETING_VERSION = 2.22.0;
847+
MARKETING_VERSION = 2.23.0;
854848
OTHER_LDFLAGS = (
855849
"-weak_framework",
856850
"\"Adobe AIR\"",

Diff for: ‎native_library/apple/WebViewANE/WebViewANE.xcodeproj/xcshareddata/xcschemes/WebViewANE (OSX).xcscheme

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1310"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

Diff for: ‎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.94.4.110\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.props')" />
4-
<Import Project="..\..\packages\cef.redist.x86.94.4.11\build\cef.redist.x86.props" Condition="Exists('..\..\packages\cef.redist.x86.94.4.11\build\cef.redist.x86.props')" />
5-
<Import Project="..\..\packages\cef.redist.x64.94.4.11\build\cef.redist.x64.props" Condition="Exists('..\..\packages\cef.redist.x64.94.4.11\build\cef.redist.x64.props')" />
3+
<Import Project="..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.props" Condition="Exists('..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.props')" />
4+
<Import Project="..\..\packages\cef.redist.x86.95.7.14\build\cef.redist.x86.props" Condition="Exists('..\..\packages\cef.redist.x86.95.7.14\build\cef.redist.x86.props')" />
5+
<Import Project="..\..\packages\cef.redist.x64.95.7.14\build\cef.redist.x64.props" Condition="Exists('..\..\packages\cef.redist.x64.95.7.14\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=94.4.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
69-
<HintPath>..\..\packages\CefSharp.Common.94.4.110\lib\net452\CefSharp.dll</HintPath>
68+
<Reference Include="CefSharp, Version=95.7.141.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
69+
<HintPath>..\..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.dll</HintPath>
7070
</Reference>
71-
<Reference Include="CefSharp.Core, Version=94.4.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
72-
<HintPath>..\..\packages\CefSharp.Common.94.4.110\lib\net452\CefSharp.Core.dll</HintPath>
71+
<Reference Include="CefSharp.Core, Version=95.7.141.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
72+
<HintPath>..\..\packages\CefSharp.Common.95.7.141\lib\net452\CefSharp.Core.dll</HintPath>
7373
</Reference>
74-
<Reference Include="CefSharp.WinForms, Version=94.4.110.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\CefSharp.WinForms.94.4.110\lib\net462\CefSharp.WinForms.dll</HintPath>
74+
<Reference Include="CefSharp.WinForms, Version=95.7.141.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
75+
<HintPath>..\..\packages\CefSharp.WinForms.95.7.141\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.94.4.11\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.94.4.11\build\cef.redist.x64.props'))" />
175-
<Error Condition="!Exists('..\..\packages\cef.redist.x86.94.4.11\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.94.4.11\build\cef.redist.x86.props'))" />
176-
<Error Condition="!Exists('..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.props'))" />
177-
<Error Condition="!Exists('..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.targets'))" />
174+
<Error Condition="!Exists('..\..\packages\cef.redist.x64.95.7.14\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x64.95.7.14\build\cef.redist.x64.props'))" />
175+
<Error Condition="!Exists('..\..\packages\cef.redist.x86.95.7.14\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\cef.redist.x86.95.7.14\build\cef.redist.x86.props'))" />
176+
<Error Condition="!Exists('..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.props'))" />
177+
<Error Condition="!Exists('..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\CefSharp.Common.95.7.141\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.94.4.110\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.94.4.110\build\CefSharp.Common.targets')" />
180+
<Import Project="..\..\packages\CefSharp.Common.95.7.141\build\CefSharp.Common.targets" Condition="Exists('..\..\packages\CefSharp.Common.95.7.141\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">

Diff for: ‎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="94.4.11" targetFramework="net462" />
4-
<package id="cef.redist.x86" version="94.4.11" targetFramework="net462" />
5-
<package id="CefSharp.Common" version="94.4.110" targetFramework="net462" />
6-
<package id="CefSharp.WinForms" version="94.4.110" targetFramework="net462" />
3+
<package id="cef.redist.x64" version="95.7.14" targetFramework="net462" />
4+
<package id="cef.redist.x86" version="95.7.14" targetFramework="net462" />
5+
<package id="CefSharp.Common" version="95.7.141" targetFramework="net462" />
6+
<package id="CefSharp.WinForms" version="95.7.141" 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>

0 commit comments

Comments
 (0)