拆分两个项目提供单独的工具

Author: lindexi

DebUOS/Packaging.DebUOS.Tool/Build/package.props renamed to DebUOS/Packaging.DebUOS.NuGet/Build/package.props

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <!-- <BuildOutputTargetFolder>tools</BuildOutputTargetFolder> -->
+    <!-- Suppress warning about lib being empty -->
+    <NoPackageAnalysis>true</NoPackageAnalysis>
+    <!-- <IncludeSymbols>true</IncludeSymbols> -->
+    <!-- <SymbolPackageFormat>snupkg</SymbolPackageFormat> -->
+    <!-- <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> -->
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <DevelopmentDependency>true</DevelopmentDependency>
+    <PackageId>Packaging.DebUOS</PackageId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Packaging.DebUOS.Tool\Packaging.DebUOS.Tool.csproj" ReferenceOutputAssembly="false">
+      <!-- 防止 nuget 引用 -->
+      <PrivateAssets>all</PrivateAssets>
+    </ProjectReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="Build\package.targets" Pack="True" PackagePath="\build\$(PackageId).targets" />
+    <None Include="Build\package.props" Pack="True" PackagePath="\build\$(PackageId).props" />
+
+    <!-- 不能引用自身，因为自身是 DLL 而不是 EXE 输出，将不会带上依赖 -->
+    <None Include="..\Packaging.DebUOS.Tool\bin\$(Configuration)\$(TargetFramework)\**\*" Pack="True" Exclude="..\Packaging.DebUOS.Tool\bin\$(Configuration)\$(TargetFramework)\publish\**\*" PackagePath="\tools\" />
+  </ItemGroup>
+
+</Project>

DebUOS/Packaging.DebUOS.Tool/Build/package.targets renamed to DebUOS/Packaging.DebUOS.NuGet/Build/package.targets

@@ -7,7 +7,6 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <PropertyGroup>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
     <!-- <BuildOutputTargetFolder>tools</BuildOutputTargetFolder> -->
     <!-- Suppress warning about lib being empty -->
     <NoPackageAnalysis>true</NoPackageAnalysis>
@@ -19,12 +18,9 @@
     <DevelopmentDependency>true</DevelopmentDependency>
     <!-- 嵌入源代码到符号文件，方便调试 -->
     <EmbedAllSources>true</EmbedAllSources>
+    <PackAsTool>True</PackAsTool>
+    <ToolCommandName>dotnet-dpkg-debuos</ToolCommandName>
   </PropertyGroup>
-  <ItemGroup>
-    <None Include="Build\package.targets" Pack="True" PackagePath="\build\$(PackageId).targets" />
-    <None Include="Build\package.props" Pack="True" PackagePath="\build\$(PackageId).props" />
-    <None Include="bin\$(Configuration)\$(TargetFramework)\**\*" Pack="True" PackagePath="\tools\"/>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Packaging.DebUOS\Packaging.DebUOS.csproj">
       <!-- 防止 nuget 引用 -->

DebUOS/Packaging.DebUOS.NuGet/Packaging.DebUOS.NuGet.csproj

@@ -8,7 +8,6 @@
 using Packaging.DebUOS;
 using Packaging.DebUOS.Contexts.Configurations;
 using Packaging.DebUOS.Tool;
-using Packing.DebUOS;
 
 var options = CommandLine.Parse(args).As<Options>();
 

DebUOS/Packaging.DebUOS.Tool/Packaging.DebUOS.Tool.csproj

@@ -97,6 +97,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Packaging.DebUOS", "DebUOS\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Packaging.DebUOS.Tool", "DebUOS\Packaging.DebUOS.Tool\Packaging.DebUOS.Tool.csproj", "{A5FDA79F-411A-4AC4-8B59-DA7E122ABAAD}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Packaging.DebUOS.NuGet", "DebUOS\Packaging.DebUOS.NuGet\Packaging.DebUOS.NuGet.csproj", "{977A7109-C37B-4CFC-875B-77E7149EFCCF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -515,6 +517,18 @@ Global
 		{A5FDA79F-411A-4AC4-8B59-DA7E122ABAAD}.Release|x64.Build.0 = Release|Any CPU
 		{A5FDA79F-411A-4AC4-8B59-DA7E122ABAAD}.Release|x86.ActiveCfg = Release|Any CPU
 		{A5FDA79F-411A-4AC4-8B59-DA7E122ABAAD}.Release|x86.Build.0 = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|x64.Build.0 = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Debug|x86.Build.0 = Debug|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|x64.ActiveCfg = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|x64.Build.0 = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|x86.ActiveCfg = Release|Any CPU
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -538,6 +552,7 @@ Global
 		{C69F9A99-8110-4379-A22C-176B3E05E481} = {AC990428-ACB7-46A9-B66A-AF0557A7D0C6}
 		{125615F2-0873-4C66-8FB3-E334D2F5BE9C} = {AC990428-ACB7-46A9-B66A-AF0557A7D0C6}
 		{A5FDA79F-411A-4AC4-8B59-DA7E122ABAAD} = {AC990428-ACB7-46A9-B66A-AF0557A7D0C6}
+		{977A7109-C37B-4CFC-875B-77E7149EFCCF} = {AC990428-ACB7-46A9-B66A-AF0557A7D0C6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A6E377C6-EDE0-4135-951F-78C62B63DE96}