From 8f40f9f5b1ef878e3f0173c1c728f5c59d0ccb9d Mon Sep 17 00:00:00 2001
From: mingkuang <mingkuang@live.com>
Date: Sat, 4 May 2024 22:57:53 +0800
Subject: [PATCH] =?UTF-8?q?Fea=EF=BC=8C=E6=B7=BB=E5=8A=A0.NET=20native=20A?=
 =?UTF-8?q?OT=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .editorconfig                                 |  2 +-
 .github/workflows/Build&Test.yml              |  2 +-
 YY-Thunks.nuspec => NuGet/YY-Thunks.nuspec    | 13 ++++++++----
 .../build/native/YY-Thunks.targets            |  0
 ...i_D5D733D3-8829-4509-9C74-021E5685ED18.xml |  0
 .../build/net8.0-windows7.0/YY-Thunks.targets | 21 +++++++++++++++++++
 6 files changed, 32 insertions(+), 6 deletions(-)
 rename YY-Thunks.nuspec => NuGet/YY-Thunks.nuspec (81%)
 rename YY-Thunks.targets => NuGet/build/native/YY-Thunks.targets (100%)
 rename YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml => NuGet/build/native/YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml (100%)
 create mode 100644 NuGet/build/net8.0-windows7.0/YY-Thunks.targets

diff --git a/.editorconfig b/.editorconfig
index a9c528c..96e3729 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -11,6 +11,6 @@ charset = utf-8-bom
 indent_style = space
 indent_size = 4
 
-[*.{vcxproj,xml}]
+[*.{vcxproj,xml,nuspec,targets}]
 indent_style = space
 indent_size = 2
diff --git a/.github/workflows/Build&Test.yml b/.github/workflows/Build&Test.yml
index 65a2574..1a0fc12 100644
--- a/.github/workflows/Build&Test.yml
+++ b/.github/workflows/Build&Test.yml
@@ -73,7 +73,7 @@ jobs:
               git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
               $releaseNotes = & git tag -l --format='%(contents)' $env:GITHUB_REF.Remove(0, 10)
-              $content = [System.IO.File]::ReadAllText("YY-Thunks.nuspec")
+              $content = [System.IO.File]::ReadAllText("NuGet\YY-Thunks.nuspec")
               
               # 使用此文本替换 .nuspec 中的 releaseNotes
               # [System.IO.File]::WriteAllText("YY-Thunks-New.nuspec", $content)
diff --git a/YY-Thunks.nuspec b/NuGet/YY-Thunks.nuspec
similarity index 81%
rename from YY-Thunks.nuspec
rename to NuGet/YY-Thunks.nuspec
index 5ad13d1..02eb70b 100644
--- a/YY-Thunks.nuspec
+++ b/NuGet/YY-Thunks.nuspec
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>YY-Thunks</id>
@@ -17,11 +17,16 @@
     <copyright>Copyright 2021</copyright>
     <tags>Chuyu YY-Thunks native nativepackage</tags>
     <repository type="git" url="https://github.com/Chuyu-Team/YY-Thunks.git" branch="master" commit="$commit$" />
+    <dependencies>
+      <group targetFramework="native">
+      </group>
+      <group targetFramework="net8.0-windows7.0">
+      </group>
+    </dependencies>
   </metadata>
   <files>
     <file src=".\objs\**" target="build\native\objs" />
     <file src=".\Bin\MinimumRequiredVersionHelper.exe" target="build\native\Bin\MinimumRequiredVersionHelper.exe" />
-    <file src=".\YY-Thunks.targets" target="build\native\YY-Thunks.targets" />
-    <file src=".\YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml" target="build\native\YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml" />
+    <file src=".\NuGet\build\**\*" target="build\"/>
   </files>
-</package>
\ No newline at end of file
+</package>
diff --git a/YY-Thunks.targets b/NuGet/build/native/YY-Thunks.targets
similarity index 100%
rename from YY-Thunks.targets
rename to NuGet/build/native/YY-Thunks.targets
diff --git a/YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml b/NuGet/build/native/YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml
similarity index 100%
rename from YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml
rename to NuGet/build/native/YY-Thunks_ui_D5D733D3-8829-4509-9C74-021E5685ED18.xml
diff --git a/NuGet/build/net8.0-windows7.0/YY-Thunks.targets b/NuGet/build/net8.0-windows7.0/YY-Thunks.targets
new file mode 100644
index 0000000..6396f88
--- /dev/null
+++ b/NuGet/build/net8.0-windows7.0/YY-Thunks.targets
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="DotNET_Import_VC-LTL_907ECCAB-58CA-4C11-B809-B53585C6BFE1" BeforeTargets="SetupOSSpecificProps">
+    <PropertyGroup>
+      <YY_Thunks_File></YY_Thunks_File>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
+      <YY_Thunks_File Condition="'$(YY_Thunks_File)' == '' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformMinVersion), 6.0))">x64\YY_Thunks_for_Vista.obj</YY_Thunks_File>
+      <YY_Thunks_File Condition="'$(YY_Thunks_File)' == ''">x64\YY_Thunks_for_WinXP.obj</YY_Thunks_File>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
+      <YY_Thunks_File Condition="'$(YY_Thunks_File)' == '' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformMinVersion), 6.0))">x86\YY_Thunks_for_Vista.obj</YY_Thunks_File>
+      <YY_Thunks_File Condition="'$(YY_Thunks_File)' == '' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetPlatformMinVersion), 5.1))">x86\YY_Thunks_for_WinXP.obj</YY_Thunks_File>
+      <YY_Thunks_File Condition="'$(YY_Thunks_File)' == ''">x86\YY_Thunks_for_Win2K.obj</YY_Thunks_File>
+    </PropertyGroup>
+    <ItemGroup Condition="'$(LTLWindowsTargetPlatformMinVersion)' != '' and '$(LTLPlatform)' != ''">
+      <LinkerArg Include="$(MSBuildThisFileDirectory)..\native\objs\$(YY_Thunks_File)" />
+    </ItemGroup>
+  </Target>
+</Project>