Skip to content

Commit

Permalink
更新基础库版本
Browse files Browse the repository at this point in the history
  • Loading branch information
埃博拉酱 committed Aug 29, 2024
1 parent f97484b commit 5b2c39c
Show file tree
Hide file tree
Showing 10 changed files with 21 additions and 22 deletions.
Binary file modified +MATLAB/+internal/private/Microsoft.Web.WebView2.Core.dll
Binary file not shown.
Binary file modified +MATLAB/+internal/private/Microsoft.Web.WebView2.Core.winmd
Binary file not shown.
Binary file not shown.
Binary file modified +MATLAB/+internal/private/WindowsCall.mexw64
Binary file not shown.
Binary file modified +MATLAB/+internal/提权操作C.exe
Binary file not shown.
21 changes: 11 additions & 10 deletions Windows平台/Windows平台.vcxproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.props" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.props')" />
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
Expand All @@ -25,6 +25,7 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{8fe29544-0044-4726-960e-b0f07194a747}</ProjectGuid>
<RootNamespace>Windows平台</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -130,7 +131,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<LanguageStandard_C>stdclatest</LanguageStandard_C>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<ExceptionHandling>Async</ExceptionHandling>
Expand All @@ -156,7 +157,7 @@
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<LanguageStandard_C>stdclatest</LanguageStandard_C>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<ExceptionHandling>Async</ExceptionHandling>
Expand Down Expand Up @@ -214,10 +215,10 @@
<Import Project="..\packages\libwebp.v140.0.5.0.2\build\native\libwebp.v140.targets" Condition="Exists('..\packages\libwebp.v140.0.5.0.2\build\native\libwebp.v140.targets')" />
<Import Project="..\packages\EbolaChan.LibZip.1.10.1\build\native\EbolaChan.LibZip.targets" Condition="Exists('..\packages\EbolaChan.LibZip.1.10.1\build\native\EbolaChan.LibZip.targets')" />
<Import Project="..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets')" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\packages\native.magic_enum.0.9.5\build\native\native.magic_enum.targets" Condition="Exists('..\packages\native.magic_enum.0.9.5\build\native\native.magic_enum.targets')" />
<Import Project="..\packages\MATLAB.MexTools.7.0.0\build\native\MATLAB.MexTools.targets" Condition="Exists('..\packages\MATLAB.MexTools.7.0.0\build\native\MATLAB.MexTools.targets')" />
<Import Project="..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets" Condition="Exists('..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" />
<Import Project="..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.targets" Condition="Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.targets')" />
<Import Project="..\packages\MATLAB.MexTools.7.0.1\build\native\MATLAB.MexTools.targets" Condition="Exists('..\packages\MATLAB.MexTools.7.0.1\build\native\MATLAB.MexTools.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -228,10 +229,10 @@
<Error Condition="!Exists('..\packages\EbolaChan.LibZip.1.10.1\build\native\EbolaChan.LibZip.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EbolaChan.LibZip.1.10.1\build\native\EbolaChan.LibZip.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.SDK.BuildTools.10.0.26100.1\build\Microsoft.Windows.SDK.BuildTools.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2646-prerelease\build\native\Microsoft.Web.WebView2.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.6.240701003-experimental2\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\packages\native.magic_enum.0.9.5\build\native\native.magic_enum.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\native.magic_enum.0.9.5\build\native\native.magic_enum.targets'))" />
<Error Condition="!Exists('..\packages\MATLAB.MexTools.7.0.0\build\native\MATLAB.MexTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MATLAB.MexTools.7.0.0\build\native\MATLAB.MexTools.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.2739.15\build\native\Microsoft.Web.WebView2.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.WindowsAppSDK.1.6.240807006-preview1\build\native\Microsoft.WindowsAppSDK.targets'))" />
<Error Condition="!Exists('..\packages\MATLAB.MexTools.7.0.1\build\native\MATLAB.MexTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MATLAB.MexTools.7.0.1\build\native\MATLAB.MexTools.targets'))" />
</Target>
</Project>
6 changes: 3 additions & 3 deletions Windows平台/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<package id="EbolaChan.LibZip" version="1.10.1" targetFramework="native" />
<package id="libwebp.v140" version="0.5.0.2" targetFramework="native" />
<package id="libwebp.v140.redist" version="0.5.0.1" targetFramework="native" />
<package id="MATLAB.MexTools" version="7.0.0" targetFramework="native" />
<package id="Microsoft.Web.WebView2" version="1.0.2646-prerelease" targetFramework="native" />
<package id="MATLAB.MexTools" version="7.0.1" targetFramework="native" />
<package id="Microsoft.Web.WebView2" version="1.0.2739.15" targetFramework="native" />
<package id="Microsoft.Windows.SDK.BuildTools" version="10.0.26100.1" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.240701003-experimental2" targetFramework="native" />
<package id="Microsoft.WindowsAppSDK" version="1.6.240807006-preview1" targetFramework="native" />
<package id="native.magic_enum" version="0.9.5" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion 提权操作C/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="PHNT" version="1.0.0" targetFramework="native" />
<package id="PHNT" version="1.1.0" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion 提权操作C/提权操作C.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include<共享头.h>
#include<MATLAB异常.h>
#include<phnt_windows.h>
#define PHNT_VERSION 114
#define PHNT_VERSION PHNT_WIN11_24H2
#include<phnt.h>
#include<AclAPI.h>
import std;
Expand Down
12 changes: 5 additions & 7 deletions 提权操作C/提权操作C.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{e84a0d79-b413-4096-8db9-1c5f0ae5919b}</ProjectGuid>
<RootNamespace>提权操作C</RootNamespace>
<WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
Expand Down Expand Up @@ -72,12 +72,10 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<OutDir>$(SolutionDir)+MATLAB\+internal\</OutDir>
<ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</ExternalIncludePath>
<IncludePath>$(SolutionDir)共享头文件;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(SolutionDir)+MATLAB\+internal\</OutDir>
<ExternalIncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);</ExternalIncludePath>
<IncludePath>$(SolutionDir)共享头文件;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
Expand Down Expand Up @@ -115,7 +113,7 @@
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<LanguageStandard_C>stdclatest</LanguageStandard_C>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand All @@ -137,7 +135,7 @@
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<LanguageStandard>stdcpplatest</LanguageStandard>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<LanguageStandard_C>stdclatest</LanguageStandard_C>
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
Expand All @@ -160,12 +158,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\PHNT.1.0.0\build\native\PHNT.targets" Condition="Exists('..\packages\PHNT.1.0.0\build\native\PHNT.targets')" />
<Import Project="..\packages\PHNT.1.1.0\build\native\PHNT.targets" Condition="Exists('..\packages\PHNT.1.1.0\build\native\PHNT.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\PHNT.1.0.0\build\native\PHNT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PHNT.1.0.0\build\native\PHNT.targets'))" />
<Error Condition="!Exists('..\packages\PHNT.1.1.0\build\native\PHNT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PHNT.1.1.0\build\native\PHNT.targets'))" />
</Target>
</Project>

0 comments on commit 5b2c39c

Please sign in to comment.