Skip to content

Commit 7646e5c

Browse files
authored
Nuget 添加 Complete 包 (#2263)
* 移除未使用的 msbuild 属性 BuildPackageVersion * 调整为正确的 TargetFrameworks * 移除 Puerts.Python.NativeAssets.macOS 多余的路径包括 * 添加 Complete 包 * 构建脚本添加 Complete * 调整 props 命名 * 让 Complete 不输出自身程序集
1 parent 94dc2e0 commit 7646e5c

File tree

28 files changed

+175
-32
lines changed

28 files changed

+175
-32
lines changed

unity/nuget/Directory.Build.props

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
<NoWarn>NU5128</NoWarn>
66

7-
<BuildPackageVersion>3.0.0</BuildPackageVersion>
8-
97
<PackageProjectUrl>https://github.com/Tencent/puerts</PackageProjectUrl>
108

119
<Description>Puerts is a library that makes it easy to add scripting to your .NET applications. It currently supports JavaScript (via V8/Nodejs/Quickjs) and Lua.</Description>
File renamed without changes.

unity/nuget/NugetPackages.sln

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1313
ProjectSection(SolutionItems) = preProject
1414
Directory.Build.props = Directory.Build.props
1515
Directory.Packages.props = Directory.Packages.props
16-
NativeAssets.Common.props = NativeAssets.Common.props
16+
NoAssemblyOutputs.Common.props = NoAssemblyOutputs.Common.props
1717
EndProjectSection
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.V8.NativeAssets.Linux", "Puerts.V8.NativeAssets.Linux\Puerts.V8.NativeAssets.Linux.csproj", "{1C136067-7008-4A6C-ABE4-AD307DBBC480}"
@@ -62,6 +62,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.Python.NativeAssets.
6262
EndProject
6363
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.Python.NativeAssets.Linux", "Puerts.Python.NativeAssets.Linux\Puerts.Python.NativeAssets.Linux.csproj", "{5B7125B3-DB23-499C-BEA4-BB7921BC3B68}"
6464
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.Core.Complete", "Puerts.Core.Complete\Puerts.Core.Complete.csproj", "{0833659D-3AFA-4B0F-825C-DA41A3F6CD0A}"
66+
EndProject
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.Lua.Complete", "Puerts.Lua.Complete\Puerts.Lua.Complete.csproj", "{4B924D31-24AE-42ED-9C80-9F8406D35C52}"
68+
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.NodeJS.Complete", "Puerts.NodeJS.Complete\Puerts.NodeJS.Complete.csproj", "{F7A9A87E-9BD5-4E04-91F6-A33176B54F51}"
70+
EndProject
71+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.Python.Complete", "Puerts.Python.Complete\Puerts.Python.Complete.csproj", "{6C4C1E2D-B5DD-4F55-8D23-1BC438651733}"
72+
EndProject
73+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.QuickJS.Complete", "Puerts.QuickJS.Complete\Puerts.QuickJS.Complete.csproj", "{45CF190E-A2A2-4781-AD77-8C4BE6A05684}"
74+
EndProject
75+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Puerts.V8.Complete", "Puerts.V8.Complete\Puerts.V8.Complete.csproj", "{7F398021-BD69-4037-8E5F-C329CAE3F3BB}"
76+
EndProject
6577
Global
6678
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6779
Debug|Any CPU = Debug|Any CPU
@@ -172,6 +184,30 @@ Global
172184
{5B7125B3-DB23-499C-BEA4-BB7921BC3B68}.Debug|Any CPU.Build.0 = Debug|Any CPU
173185
{5B7125B3-DB23-499C-BEA4-BB7921BC3B68}.Release|Any CPU.ActiveCfg = Release|Any CPU
174186
{5B7125B3-DB23-499C-BEA4-BB7921BC3B68}.Release|Any CPU.Build.0 = Release|Any CPU
187+
{0833659D-3AFA-4B0F-825C-DA41A3F6CD0A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
188+
{0833659D-3AFA-4B0F-825C-DA41A3F6CD0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
189+
{0833659D-3AFA-4B0F-825C-DA41A3F6CD0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
190+
{0833659D-3AFA-4B0F-825C-DA41A3F6CD0A}.Release|Any CPU.Build.0 = Release|Any CPU
191+
{4B924D31-24AE-42ED-9C80-9F8406D35C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
192+
{4B924D31-24AE-42ED-9C80-9F8406D35C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
193+
{4B924D31-24AE-42ED-9C80-9F8406D35C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
194+
{4B924D31-24AE-42ED-9C80-9F8406D35C52}.Release|Any CPU.Build.0 = Release|Any CPU
195+
{F7A9A87E-9BD5-4E04-91F6-A33176B54F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
196+
{F7A9A87E-9BD5-4E04-91F6-A33176B54F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
197+
{F7A9A87E-9BD5-4E04-91F6-A33176B54F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
198+
{F7A9A87E-9BD5-4E04-91F6-A33176B54F51}.Release|Any CPU.Build.0 = Release|Any CPU
199+
{6C4C1E2D-B5DD-4F55-8D23-1BC438651733}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
200+
{6C4C1E2D-B5DD-4F55-8D23-1BC438651733}.Debug|Any CPU.Build.0 = Debug|Any CPU
201+
{6C4C1E2D-B5DD-4F55-8D23-1BC438651733}.Release|Any CPU.ActiveCfg = Release|Any CPU
202+
{6C4C1E2D-B5DD-4F55-8D23-1BC438651733}.Release|Any CPU.Build.0 = Release|Any CPU
203+
{45CF190E-A2A2-4781-AD77-8C4BE6A05684}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
204+
{45CF190E-A2A2-4781-AD77-8C4BE6A05684}.Debug|Any CPU.Build.0 = Debug|Any CPU
205+
{45CF190E-A2A2-4781-AD77-8C4BE6A05684}.Release|Any CPU.ActiveCfg = Release|Any CPU
206+
{45CF190E-A2A2-4781-AD77-8C4BE6A05684}.Release|Any CPU.Build.0 = Release|Any CPU
207+
{7F398021-BD69-4037-8E5F-C329CAE3F3BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
208+
{7F398021-BD69-4037-8E5F-C329CAE3F3BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
209+
{7F398021-BD69-4037-8E5F-C329CAE3F3BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
210+
{7F398021-BD69-4037-8E5F-C329CAE3F3BB}.Release|Any CPU.Build.0 = Release|Any CPU
175211
EndGlobalSection
176212
GlobalSection(SolutionProperties) = preSolution
177213
HideSolutionNode = FALSE
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<PackageVersion>$(PuertsCoreVersion)</PackageVersion>
5+
<TargetFrameworks>$(PuertsCurrentTargetFrameworks)</TargetFrameworks>
6+
</PropertyGroup>
7+
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\Puerts.Core.NativeAssets.Linux\Puerts.Core.NativeAssets.Linux.csproj" />
12+
<ProjectReference Include="..\Puerts.Core.NativeAssets.macOS\Puerts.Core.NativeAssets.macOS.csproj" />
13+
<ProjectReference Include="..\Puerts.Core.NativeAssets.Win32\Puerts.Core.NativeAssets.Win32.csproj" />
14+
<ProjectReference Include="..\Puerts.Core\Puerts.Core.csproj" />
15+
</ItemGroup>
16+
17+
</Project>

unity/nuget/Puerts.Core.NativeAssets.Linux/Puerts.Core.NativeAssets.Linux.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<PackageVersion>$(PuertsCoreVersion)</PackageVersion>
5-
<TargetFrameworks>$(PuertsCurrentTargetFrameworks)</TargetFrameworks>
5+
<TargetFrameworks>$(PuertsNativeAssetsLinuxTargetFrameworks)</TargetFrameworks>
66
</PropertyGroup>
77

8-
<Import Project="..\NativeAssets.Common.props" />
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
99

1010
<ItemGroup>
1111
<None Include="lib\**\*.so" Pack="True" PackagePath="runtimes\" />

unity/nuget/Puerts.Core.NativeAssets.Win32/Puerts.Core.NativeAssets.Win32.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>$(PuertsNativeAssetsWin32TargetFrameworks)</TargetFrameworks>
66
</PropertyGroup>
77

8-
<Import Project="..\NativeAssets.Common.props" />
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
99

1010
<ItemGroup>
1111
<None Include="lib\**\*.dll" Pack="True" PackagePath="runtimes\" />

unity/nuget/Puerts.Core.NativeAssets.macOS/Puerts.Core.NativeAssets.macOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>$(PuertsNativeAssetsmacOSTargetFrameworks)</TargetFrameworks>
66
</PropertyGroup>
77

8-
<Import Project="..\NativeAssets.Common.props" />
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
99

1010
<ItemGroup>
1111
<None Include="lib\**\*.dylib" Pack="True" PackagePath="runtimes\" />
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<PackageVersion>$(PuertsLuaVersion)</PackageVersion>
5+
<TargetFrameworks>$(PuertsCurrentTargetFrameworks)</TargetFrameworks>
6+
</PropertyGroup>
7+
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
9+
10+
<ItemGroup>
11+
<ProjectReference Include="..\Puerts.Core.Complete\Puerts.Core.Complete.csproj" />
12+
<ProjectReference Include="..\Puerts.Lua.NativeAssets.Linux\Puerts.Lua.NativeAssets.Linux.csproj" />
13+
<ProjectReference Include="..\Puerts.Lua.NativeAssets.macOS\Puerts.Lua.NativeAssets.macOS.csproj" />
14+
<ProjectReference Include="..\Puerts.Lua.NativeAssets.Win32\Puerts.Lua.NativeAssets.Win32.csproj" />
15+
<ProjectReference Include="..\Puerts.Lua\Puerts.Lua.csproj" />
16+
</ItemGroup>
17+
18+
</Project>

unity/nuget/Puerts.Lua.NativeAssets.Linux/Puerts.Lua.NativeAssets.Linux.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
<PropertyGroup>
44
<PackageVersion>$(PuertsLuaVersion)</PackageVersion>
5-
<TargetFrameworks>$(PuertsCurrentTargetFrameworks)</TargetFrameworks>
5+
<TargetFrameworks>$(PuertsNativeAssetsLinuxTargetFrameworks)</TargetFrameworks>
66
</PropertyGroup>
77

8-
<Import Project="..\NativeAssets.Common.props" />
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
99

1010
<ItemGroup>
1111
<None Include="lib\**\*.so" Pack="True" PackagePath="runtimes\" />

unity/nuget/Puerts.Lua.NativeAssets.Win32/Puerts.Lua.NativeAssets.Win32.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<TargetFrameworks>$(PuertsNativeAssetsWin32TargetFrameworks)</TargetFrameworks>
66
</PropertyGroup>
77

8-
<Import Project="..\NativeAssets.Common.props" />
8+
<Import Project="..\NoAssemblyOutputs.Common.props" />
99

1010
<ItemGroup>
1111
<None Include="lib\**\*.dll" Pack="True" PackagePath="runtimes\" />

0 commit comments

Comments
 (0)