Skip to content

Commit aadb963

Browse files
xengine-qytxengine-qyt
authored
Merge pull request #46 from libxengine/develop
Release Version
2 parents dd0e608 + ee0ede3 commit aadb963

75 files changed

Lines changed: 687 additions & 2863 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
sudo ./XEngine_LINEnv.sh -i 3
5757
5858
- name: Initialize CodeQL
59-
uses: github/codeql-action/init@v3
59+
uses: github/codeql-action/init@v4
6060
with:
6161
languages: ${{ matrix.language }}
6262

@@ -66,6 +66,6 @@ jobs:
6666
make
6767
6868
- name: Perform CodeQL Analysis
69-
uses: github/codeql-action/analyze@v3
69+
uses: github/codeql-action/analyze@v4
7070
with:
7171
category: "/language:${{ matrix.language }}"

‎.github/workflows/msbuild.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ jobs:
5151
run: |
5252
cd vcpkg
5353
./bootstrap-vcpkg.bat
54-
./vcpkg.exe install lua:x86-windows opencv[contrib]:x86-windows libqrencode:x86-windows
54+
./vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows
5555
./vcpkg.exe integrate install
5656
shell: pwsh
5757
- name: vcpkg install (x64)
5858
if: matrix.platform == 'x64'
5959
run: |
6060
cd vcpkg
6161
./bootstrap-vcpkg.bat
62-
./vcpkg.exe install lua:x64-windows opencv[contrib]:x64-windows libqrencode:x64-windows
62+
./vcpkg.exe install lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows
6363
./vcpkg.exe integrate install
6464
shell: pwsh
6565
- name: vcpkg install (ARM64)
@@ -69,7 +69,7 @@ jobs:
6969
./bootstrap-vcpkg.bat
7070
./vcpkg.exe install lua:Arm64-windows
7171
./vcpkg.exe integrate install
72-
# ./vcpkg.exe install lua:Arm64-windows opencv[contrib]:Arm64-windows libqrencode:Arm64-windows Windows的opencv 有问题
72+
# ./vcpkg.exe install lua:Arm64-windows opencv[contrib,freetype]:Arm64-windows libqrencode:Arm64-windows Windows的opencv 有问题
7373
7474
cd ..
7575
$filePath = "XEngine_Source/XEngine_BuildSwitch.h"
@@ -118,7 +118,7 @@ jobs:
118118

119119
#编译
120120
- name: Build Solution
121-
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }}
121+
run: msbuild XEngine_Source/XEngine.sln /p:Configuration=${{ matrix.configuration }} /p:Platform=${{ matrix.platform }} /p:ExtraDefines="_XENGINE_BUILD_SWITCH_LUA"
122122

123123
#测试
124124
- name: Conditional Step for x86 Release

‎CHANGELOG‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,67 @@
1+
XEngine_APIService V3.14.0.1001
2+
3+
更新:依赖库
4+
修改:屏幕录像从后台服务中独立
5+
修改:不在区分http请求url函数的大小写
6+
修改:屏幕录像支持scale
7+
修改:屏幕录像支持仅音频或者视频
8+
修改:调整插件参数顺序
9+
修正:插件没有加载http消息的问题
10+
修正:构建问题并且移除audio队列
11+
修正:验证响应状态不正确
12+
修正:http验证开关不支持
13+
删除:plugin模块使用submodule的依赖库替代
14+
15+
update:depend library
16+
modify:Separated screen recording from the background service
17+
modify:does not are case-insensitive for http function name
18+
modify:screen capture format support scale
19+
modify:support only audio or video for av record
20+
modify:adjust plugin parameter order
21+
fixed:plugin not load http message buffer
22+
fixed:build error and remove audio fifo
23+
fixed:verification reply status is incorrect
24+
fixed:HTTP authentication switch does not support individual verification
25+
delete:plugin module and use depend library plugin module instead
26+
======================================================================================
27+
XEngine_APIService V3.13.0.1001
28+
29+
ci:增加centos和rockylinux以及debian13支持
30+
ci:MACOS仅支持arm64
31+
增加:http验证启动日志
32+
增加:dns协议服务支持
33+
增加:http验证的基本和摘要支持
34+
修改:ntp 协议服务单独提取
35+
修改:测试api消息输出
36+
修改:不在限制api请求的key名称
37+
修改:守护进程和后台管理验证方法
38+
修改:avformat模块替换了xstream模块
39+
修改:屏幕推流方法
40+
修改:系统声音推流方法
41+
更新:依赖库
42+
更新:启动参数不区分大小写
43+
修正:ntp宏错误
44+
修正:启动日志插件索引错误
45+
删除:不使用的代码
46+
47+
ci:added Centos_build.yml and improved Rocky_build.yml and debian 13
48+
ci:only support arm64 macos build
49+
added:http verification start log
50+
added:dns protocol service support
51+
added:http basic and digest authorize support
52+
modify:ntp protocol service extract individually
53+
modify:print message for d-test api
54+
modify:dont limit api key name
55+
modify:deamon and back verification method
56+
modify:avformat instead xstream
57+
modify:screen stream push support
58+
modify:system sound capture support for back service
59+
update:depend library
60+
update:start parameter are not case sensitive
61+
fixed:ntp macro error
62+
fixed:start log plugin index
63+
delete:not use return
64+
======================================================================================
165
XEngine_APIService V3.12.0.1001
266

367
增加:rockylinux 10 支持

‎README.en.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Modify the database configuration in XSQL in the configuration file to your
8484
The default configuration does not enable database support. If the database interface is required, you need to enable the database yourself
8585

8686
#### Windows
87-
need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows
87+
need to vcpkg configure third-part env.refer vcpkg install guide.after installed and execution:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows
8888
use vs open and compile,suport windows 7sp1 and above
8989
Just Run it
9090

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ git clone https://gitee.com/xengine/XEngine_IPMacData.git XEngine_Source/XEngine
9696
git clone https://gitee.com/xengine/XEngine_PhoneData.git XEngine_Source/XEngine_DependLibrary/XEngine_PhoneData
9797

9898
#### Windows
99-
需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows
99+
需要vcpkg配置第三方环境,具体参考vcpkg安装方式,安装好后执行:vcpkg.exe install lua:x86-windows opencv[contrib,freetype]:x86-windows libqrencode:x86-windows leptonica:x86-windows tesseract:x86-windows lua:x64-windows opencv[contrib,freetype]:x64-windows libqrencode:x64-windows leptonica:x64-windows tesseract:x64-windows
100100
使用VS打开并且编译,支持WINDOWS 7SP1以上系统
101101
直接运行即可
102102

‎XEngine_APPClient/APPClient_ImageExample/APPClient_ImageExample.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <XEngine_Include/XEngine_BaseLib/BaseSafe_Error.h>
2323
#include <XEngine_Include/XEngine_Client/APIClient_Define.h>
2424
#include <XEngine_Include/XEngine_Client/APIClient_Error.h>
25-
#include <XEngine_Include/XEngine_SystemSdk/ProcFile_Define.h>
2625
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Define.h>
2726
#include <XEngine_Include/XEngine_SystemSdk/SystemApi_Error.h>
2827

‎XEngine_Docment/Docment_zh.docx‎

3.06 KB
Binary file not shown.

‎XEngine_Release/XEngine_Config/XEngine_Config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
"nVType": 1,
7070
"bEnable": false,
7171
"st_VerSwitch": {
72-
"bBackService": false,
73-
"bDeamon": false
72+
"bBackService": true,
73+
"bDeamon": true
7474
}
7575
},
7676
"XReport": {

‎XEngine_Source/Makefile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ MODULE_DATABASE_PATH = ./XEngine_ModuleDatabase
99
MODULE_PROTOCOL_PATH = ./XEngine_ModuleProtocol
1010
MODULE_SYSTEM_PATH = ./XEngine_ModuleSystem
1111
MODULE_HELP_PATH = ./XEngine_ModuleHelp
12-
MODULE_PLUGIN_PATH = ./XEngine_ModulePlugin
1312

1413
PLUGIN_MODULE_ZODIAC = ./XEngine_PluginModule/ModulePlugin_Zodiac
1514
PLUGIN_MODULE_PASSWORD = ./XEngine_PluginModule/ModulePlugin_Password
@@ -20,6 +19,7 @@ PLUGIN_MODULE_METER = ./XEngine_PluginModule/ModulePlugin_Meter
2019
THIRDPART_MODULE_JSONCPP = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/jsoncpp
2120
THIRDPART_MODULE_REPORT = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_InfoReport
2221
THIRDPART_MODULE_VERIFICATION = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_Verification
22+
THIRDPART_MODULE_PLUGIN = ./XEngine_DependLibrary/XEngine_OPenSource/XEngine_Module/XEngine_PluginExtension
2323
APIMODULE_PHONE_PATH = ./XEngine_DependLibrary/XEngine_PhoneData/XEngine_Source/XEngine_APIModulePhone
2424
APIMODULE_IPMAC_PATH = ./XEngine_DependLibrary/XEngine_IPMacData/XEngine_Source/XEngine_APIModuleIPMac
2525

@@ -31,8 +31,8 @@ else ifeq ($(PLATFORM),mac)
3131
FILEEXT = dylib
3232
endif
3333

34-
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so libXEngine_Verification.so \
35-
libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleSystem.so libXEngine_ModuleHelp.so libXEngine_ModulePlugin.so \
34+
XENGINE_MODULES = libjsoncpp.so libXEngine_InfoReport.so libXEngine_Verification.so libXEngine_PluginExtension.so \
35+
libXEngine_ModuleConfigure.so libXEngine_ModuleDatabase.so libXEngine_ModuleProtocol.so libXEngine_ModuleSystem.so libXEngine_ModuleHelp.so \
3636
libModulePlugin_Zodiac.so libModulePlugin_Password.so libModulePlugin_Timezone.so libModulePlugin_BMIndex.so libModulePlugin_Meter.so \
3737
libXEngine_APIModulePhone.so libXEngine_APIModuleIPMac.so \
3838
XEngine_HttpApp.exe
@@ -58,6 +58,12 @@ ifeq ($(FLAGS), InstallAll)
5858
else
5959
make -C $(THIRDPART_MODULE_VERIFICATION) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
6060
endif
61+
libXEngine_PluginExtension.so:
62+
ifeq ($(FLAGS), InstallAll)
63+
cp $(THIRDPART_MODULE_PLUGIN)/libXEngine_PluginExtension.$(FILEEXT) ../XEngine_Release/
64+
else
65+
make -C $(THIRDPART_MODULE_PLUGIN) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
66+
endif
6167
libXEngine_APIModulePhone.so:
6268
ifeq ($(FLAGS), InstallAll)
6369
cp $(APIMODULE_PHONE_PATH)/libXEngine_APIModulePhone.$(FILEEXT) ../XEngine_Release/
@@ -81,8 +87,6 @@ libXEngine_ModuleSystem.so:
8187
make -C $(MODULE_SYSTEM_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
8288
libXEngine_ModuleHelp.so:
8389
make -C $(MODULE_HELP_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
84-
libXEngine_ModulePlugin.so:
85-
make -C $(MODULE_PLUGIN_PATH) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)
8690

8791
libModulePlugin_Zodiac.so:
8892
make -C $(PLUGIN_MODULE_ZODIAC) PLATFORM=$(PLATFORM) UNICODE=$(UNICODE) RELEASE=$(RELEASE) $(FLAGS)

‎XEngine_Source/XEngine.sln‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_HttpApp", "XEngine_
2929
{A13B72E7-FC40-4A27-81C3-26DF3C8F4C0A} = {A13B72E7-FC40-4A27-81C3-26DF3C8F4C0A}
3030
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {A8E43EC0-698A-4807-8A61-B2BE5FAB7256}
3131
{BBC4B2B4-1143-45DF-8890-47CE26A61D0E} = {BBC4B2B4-1143-45DF-8890-47CE26A61D0E}
32-
{CB443280-E283-44CD-B956-52C404A51DB6} = {CB443280-E283-44CD-B956-52C404A51DB6}
32+
{D76B9C99-D002-4770-BB33-C24A91ED97E9} = {D76B9C99-D002-4770-BB33-C24A91ED97E9}
3333
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
3434
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
3535
{F6520D2C-BB8E-45BB-964B-F5D6A4318A89} = {F6520D2C-BB8E-45BB-964B-F5D6A4318A89}
@@ -45,8 +45,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleProtocol", "X
4545
EndProject
4646
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModuleHelp", "XEngine_ModuleHelp\XEngine_ModuleHelp.vcxproj", "{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}"
4747
EndProject
48-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_ModulePlugin", "XEngine_ModulePlugin\XEngine_ModulePlugin.vcxproj", "{CB443280-E283-44CD-B956-52C404A51DB6}"
49-
EndProject
5048
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "XEngine_PluginModule", "XEngine_PluginModule", "{D0473C03-9464-4C44-818A-AE212680CD05}"
5149
EndProject
5250
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libModulePlugin_Zodiac", "XEngine_PluginModule\ModulePlugin_Zodiac\ModulePlugin_Zodiac.vcxproj", "{32BB166A-3D3D-45EF-8BED-2E0471274159}"
@@ -88,7 +86,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_APIServiceApp", "XE
8886
{92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505} = {92F971AB-CAC9-4D9B-A9CA-AFD9CA17E505}
8987
{A13B72E7-FC40-4A27-81C3-26DF3C8F4C0A} = {A13B72E7-FC40-4A27-81C3-26DF3C8F4C0A}
9088
{BBC4B2B4-1143-45DF-8890-47CE26A61D0E} = {BBC4B2B4-1143-45DF-8890-47CE26A61D0E}
91-
{CB443280-E283-44CD-B956-52C404A51DB6} = {CB443280-E283-44CD-B956-52C404A51DB6}
9289
{E756B7D2-D40D-4106-9C14-1D90F20A712E} = {E756B7D2-D40D-4106-9C14-1D90F20A712E}
9390
{F1736B3F-03A2-4FC7-B045-A12BA8D724FB} = {F1736B3F-03A2-4FC7-B045-A12BA8D724FB}
9491
{F54F152C-594F-4465-A44E-2DB915B39760} = {F54F152C-594F-4465-A44E-2DB915B39760}
@@ -114,6 +111,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_APIModulePhone", "X
114111
EndProject
115112
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Verification", "XEngine_DependLibrary\XEngine_OPenSource\XEngine_Module\XEngine_Verification\XEngine_Verification.vcxproj", "{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}"
116113
EndProject
114+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_PluginExtension", "XEngine_DependLibrary\XEngine_OPenSource\XEngine_Module\XEngine_PluginExtension\XEngine_PluginExtension.vcxproj", "{D76B9C99-D002-4770-BB33-C24A91ED97E9}"
115+
EndProject
117116
Global
118117
GlobalSection(SolutionConfigurationPlatforms) = preSolution
119118
Debug|ARM64 = Debug|ARM64
@@ -184,18 +183,6 @@ Global
184183
{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}.Release|x64.Build.0 = Release|x64
185184
{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}.Release|x86.ActiveCfg = Release|Win32
186185
{6D0FCB40-D544-4AB2-A239-2FEBC4B98F6D}.Release|x86.Build.0 = Release|Win32
187-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|ARM64.ActiveCfg = Debug|ARM64
188-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|ARM64.Build.0 = Debug|ARM64
189-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|x64.ActiveCfg = Debug|x64
190-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|x64.Build.0 = Debug|x64
191-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|x86.ActiveCfg = Debug|Win32
192-
{CB443280-E283-44CD-B956-52C404A51DB6}.Debug|x86.Build.0 = Debug|Win32
193-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|ARM64.ActiveCfg = Release|ARM64
194-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|ARM64.Build.0 = Release|ARM64
195-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|x64.ActiveCfg = Release|x64
196-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|x64.Build.0 = Release|x64
197-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|x86.ActiveCfg = Release|Win32
198-
{CB443280-E283-44CD-B956-52C404A51DB6}.Release|x86.Build.0 = Release|Win32
199186
{32BB166A-3D3D-45EF-8BED-2E0471274159}.Debug|ARM64.ActiveCfg = Debug|ARM64
200187
{32BB166A-3D3D-45EF-8BED-2E0471274159}.Debug|ARM64.Build.0 = Debug|ARM64
201188
{32BB166A-3D3D-45EF-8BED-2E0471274159}.Debug|x64.ActiveCfg = Debug|x64
@@ -340,6 +327,18 @@ Global
340327
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x64.Build.0 = Release|x64
341328
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.ActiveCfg = Release|Win32
342329
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.Build.0 = Release|Win32
330+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|ARM64.ActiveCfg = Debug|ARM64
331+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|ARM64.Build.0 = Debug|ARM64
332+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x64.ActiveCfg = Debug|x64
333+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x64.Build.0 = Debug|x64
334+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x86.ActiveCfg = Debug|Win32
335+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Debug|x86.Build.0 = Debug|Win32
336+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.ActiveCfg = Release|ARM64
337+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|ARM64.Build.0 = Release|ARM64
338+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x64.ActiveCfg = Release|x64
339+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x64.Build.0 = Release|x64
340+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x86.ActiveCfg = Release|Win32
341+
{D76B9C99-D002-4770-BB33-C24A91ED97E9}.Release|x86.Build.0 = Release|Win32
343342
EndGlobalSection
344343
GlobalSection(SolutionProperties) = preSolution
345344
HideSolutionNode = FALSE
@@ -357,6 +356,7 @@ Global
357356
{FFAC032D-4F8C-4C70-AF36-D79685A6961F} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
358357
{A13B72E7-FC40-4A27-81C3-26DF3C8F4C0A} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
359358
{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
359+
{D76B9C99-D002-4770-BB33-C24A91ED97E9} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
360360
EndGlobalSection
361361
GlobalSection(ExtensibilityGlobals) = postSolution
362362
SolutionGuid = {9B202F91-A601-429E-BB0F-880DDEE096FE}

0 commit comments

Comments
 (0)