From 7159d15f7f2b3213d291819c5c39bd58509b678b Mon Sep 17 00:00:00 2001
From: ailee <leej95@163.com>
Date: Wed, 2 Jul 2025 19:12:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=20.NET=20Framewor?=
 =?UTF-8?q?k=20=E9=A1=B9=E7=9B=AE=E4=B8=8B=20NuGet=20=E5=8C=85=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=87=AA=E5=8A=A8=E5=B0=86=E9=9D=9E=E6=89=98=E7=AE=A1?=
 =?UTF-8?q?=20mmdeploy.dll=20=E5=A4=8D=E5=88=B6=E5=88=B0=E5=8F=AF=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E6=96=87=E4=BB=B6=E7=9B=AE=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 csrc/mmdeploy/apis/csharp/MMDeploy.sln        | 15 +------------
 .../csharp/MMDeploy/MMDeployCSharp.csproj     |  9 ++++++++
 .../apis/csharp/MMDeploy/MMDeployCSharp.props |  6 +++++
 .../MMDeploy/build/net48/mmdeploy.targets     | 22 +++++++++++++++++++
 4 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 csrc/mmdeploy/apis/csharp/MMDeploy/build/net48/mmdeploy.targets

diff --git a/csrc/mmdeploy/apis/csharp/MMDeploy.sln b/csrc/mmdeploy/apis/csharp/MMDeploy.sln
index 72cbead791..5a1aa61357 100644
--- a/csrc/mmdeploy/apis/csharp/MMDeploy.sln
+++ b/csrc/mmdeploy/apis/csharp/MMDeploy.sln
@@ -3,9 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31729.503
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MMDeploy", "MMDeploy\MMDeployCSharp.csproj", "{3DC914EB-A8FB-4A89-A7CF-7DF9CC5284A6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MMDeployCSharp", "MMDeploy\MMDeployCSharp.csproj", "{3DC914EB-A8FB-4A89-A7CF-7DF9CC5284A6}"
 EndProject
-
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -28,18 +27,6 @@ Global
 		{3DC914EB-A8FB-4A89-A7CF-7DF9CC5284A6}.Release|x64.Build.0 = Release|Any CPU
 		{3DC914EB-A8FB-4A89-A7CF-7DF9CC5284A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{3DC914EB-A8FB-4A89-A7CF-7DF9CC5284A6}.Release|x86.Build.0 = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|x64.Build.0 = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Debug|x86.Build.0 = Debug|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|x64.ActiveCfg = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|x64.Build.0 = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|x86.ActiveCfg = Release|Any CPU
-		{661A4295-68CF-41C6-85B8-B11748113A6F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
index ac140348d9..55b306d5cd 100644
--- a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
+++ b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
@@ -28,6 +28,12 @@
       <PackagePath>build\net48\MMDeployCSharp.props</PackagePath>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <!-- 包含 targets -->
+    <None Include="build\net48\mmdeploy.targets"
+          Pack="true"
+          PackagePath="build\net48\" />
+  </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -37,6 +43,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|x64'">
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.props b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.props
index f893a03766..2d4eee3e7c 100644
--- a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.props
+++ b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.props
@@ -8,4 +8,10 @@
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</Content>
 	</ItemGroup>
+	<ItemGroup>
+	<!-- 包含 targets -->
+	<None Include="build\net48\mmdeploy.targets"
+			Pack="true"
+			PackagePath="build\net48\" />
+	</ItemGroup>
 </Project>
diff --git a/csrc/mmdeploy/apis/csharp/MMDeploy/build/net48/mmdeploy.targets b/csrc/mmdeploy/apis/csharp/MMDeploy/build/net48/mmdeploy.targets
new file mode 100644
index 0000000000..f3c91cb8b4
--- /dev/null
+++ b/csrc/mmdeploy/apis/csharp/MMDeploy/build/net48/mmdeploy.targets
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- 
+    MSBuildThisFileDirectory 在消费端项目里会被解析为
+    packages\<YourPackage>.<version>\build\net48\
+  -->
+  <ItemGroup>
+    <!-- 定位到包中 runtimes\win-x64\native\mmdeploy.dll -->
+    <MMDeployNativeDll Include="$(MSBuildThisFileDirectory)..\runtimes\win-x64\native\mmdeploy.dll" />
+  </ItemGroup>
+
+  <!-- 在经典 .NET Framework 项目编译完成后复制到输出目录 -->
+  <Target Name="CopyMMDeployNative" AfterTargets="Build">
+    <Message Text="Copying mmdeploy.dll to $(OutputPath)" Importance="Low" />
+    <Copy
+      SourceFiles="@(MMDeployNativeDll)"
+      DestinationFolder="$(OutputPath)"
+      SkipUnchangedFiles="true" />
+  </Target>
+
+</Project>

From df06965d36ee588144f3092d599b7455931ea88a Mon Sep 17 00:00:00 2001
From: ailee <leej95@163.com>
Date: Wed, 2 Jul 2025 20:05:26 +0800
Subject: [PATCH 2/2] add supported for net472

---
 .../apis/csharp/MMDeploy/MMDeployCSharp.csproj       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
index 55b306d5cd..3d797cb927 100644
--- a/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
+++ b/csrc/mmdeploy/apis/csharp/MMDeploy/MMDeployCSharp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net48;</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net48;net472;</TargetFrameworks>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
     <AssemblyName>MMDeployCSharp</AssemblyName>
@@ -27,12 +27,20 @@
       <Pack>true</Pack>
       <PackagePath>build\net48\MMDeployCSharp.props</PackagePath>
     </Content>
+    <Content Include="MMDeployCSharp.props">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Pack>true</Pack>
+      <PackagePath>build\net472\MMDeployCSharp.props</PackagePath>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <!-- 包含 targets -->
-    <None Include="build\net48\mmdeploy.targets"
+    <None Include="build\net48\MMDeployCSharp.targets"
           Pack="true"
           PackagePath="build\net48\" />
+    <None Include="build\net48\MMDeployCSharp.targets"
+          Pack="true"
+          PackagePath="build\net472\" />
   </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">