Bug, 解决.net x86时Platform值错误导致VC-LTL无法生效

Chuyu-Team · Jul 14, 2024 · 883a326 · 883a326
1 parent fba5260
commit 883a326
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Nuget/VC-LTL.nuspec b/Nuget/VC-LTL.nuspec
@@ -27,10 +27,10 @@
     <dependencies>
       <group targetFramework="native">
         <dependency id="YY.NuGet.Import.Helper" version="1.0.0.4" />
-        <dependency id="YY-Thunks" version="[1.1.1-Beta1,)"/>
+        <dependency id="YY-Thunks" version="1.1.2-Beta4"/>
       </group>
       <group targetFramework="net8.0-windows7.0">
-        <dependency id="YY-Thunks" version="[1.1.1-Beta1,)"/>
+        <dependency id="YY-Thunks" version="1.1.2-Beta4"/>
       </group>
     </dependencies>
   </metadata>

diff --git a/Nuget/build/net8.0-windows7.0/VC-LTL.targets b/Nuget/build/net8.0-windows7.0/VC-LTL.targets
@@ -6,8 +6,7 @@
       <LTLPlatform Condition="'$(RuntimeIdentifier)'=='win-arm64'">ARM64</LTLPlatform>
       <LTLPlatform Condition="'$(RuntimeIdentifier)'=='win-arm'">ARM</LTLPlatform>
       <LTLPlatform Condition="'$(RuntimeIdentifier)'=='win-x64'">x64</LTLPlatform>
-      <LTLPlatform Condition="'$(RuntimeIdentifier)'=='win-x86'">x86</LTLPlatform>
-
+      <LTLPlatform Condition="'$(RuntimeIdentifier)'=='win-x86'">Win32</LTLPlatform>
 
       <!--默认兼容到Windows Vista-->
       <LTLSupportedOSPlatformVersion>6.0.6000.0</LTLSupportedOSPlatformVersion>
@@ -20,7 +19,7 @@
       <LTLWindowsTargetPlatformMinVersion Condition="'$(LTLWindowsTargetPlatformMinVersion)' == '' and '$(LTLPlatform)'=='ARM'">6.2.9200.0</LTLWindowsTargetPlatformMinVersion>
       <LTLWindowsTargetPlatformMinVersion Condition="'$(LTLWindowsTargetPlatformMinVersion)' == '' and $([MSBuild]::VersionGreaterThanOrEquals($(LTLSupportedOSPlatformVersion), 6.0))">6.0.6000.0</LTLWindowsTargetPlatformMinVersion>
       <LTLWindowsTargetPlatformMinVersion Condition="'$(LTLWindowsTargetPlatformMinVersion)' == '' and '$(LTLPlatform)'=='x64'">5.2.3790.0</LTLWindowsTargetPlatformMinVersion>
-      <LTLWindowsTargetPlatformMinVersion Condition="'$(LTLWindowsTargetPlatformMinVersion)' == '' and '$(LTLPlatform)'=='x86'">5.1.2600.0</LTLWindowsTargetPlatformMinVersion>
+      <LTLWindowsTargetPlatformMinVersion Condition="'$(LTLWindowsTargetPlatformMinVersion)' == '' and '$(LTLPlatform)'=='Win32'">5.1.2600.0</LTLWindowsTargetPlatformMinVersion>
     </PropertyGroup>
     <ItemGroup Condition="'$(LTLWindowsTargetPlatformMinVersion)' != '' and '$(LTLPlatform)' != ''">
       <AdditionalNativeLibraryDirectories Include="$(MSBuildThisFileDirectory)..\native\TargetPlatform\$(LTLWindowsTargetPlatformMinVersion)\lib\$(LTLPlatform)" />