增加分版本的package引用和framework引用

Directory.Build.props

@@ -9,7 +9,7 @@
     <!-- 默认是 true，如果指定为 false，那么项目编译输出的 dll 文件将不会被打包到 NuGet 包中。 -->
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <Description>Add a NuGet package only for dll reference? By using dotnetCampus.SourceYard, you can pack a NuGet package with source code. By installing the new source code package, all source codes behaviors just like it is in your project.</Description>
-    <Copyright>Copyright (c) 2020 dotnet-campus</Copyright>
+    <Copyright>Copyright (c) 2019-2021 dotnet-campus</Copyright>
     <PackageProjectUrl>https://github.com/dotnet-campus/dotnetCampus.SourceYard</PackageProjectUrl>
     <RepositoryUrl>https://github.com/dotnet-campus/dotnetCampus.SourceYard.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

README.md

@@ -44,4 +44,8 @@ If you would like to contribute, feel free to create a [Pull Request](https://gi
 
 ## Roadmap
 
-Check out this [Roadmap](https://github.com/dotnet-campus/SourceYard/projects/1) to learn about our development plans for 2020.
+Check out this [Roadmap](https://github.com/dotnet-campus/SourceYard/projects/1) to learn about our development plans for 2021.
+
+## Thanks
+
+- [@Zhuangkh](https://github.com/Zhuangkh)

build/Version.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.19372-alpha</Version>
+    <Version>0.1.19393-alpha13</Version>
   </PropertyGroup>
 </Project>

docs/zh-cn/Behavior.md

@@ -0,0 +1,34 @@
+# 行为和配置
+
+## 术语
+
+源代码包： 将源代码打包到 NuGet 文件，也就是 SourceYard 工具的输出文件
+
+库项目： 用于打出源代码包的项目
+
+目标项目： 安装上某个源代码包的项目
+
+## 特殊配置
+
+在 SourceYard 打出的源代码包中，可以通过一些特殊的配置实现源代码包特殊的功能
+
+### DisableSourcePackageAutoPrivateAssets
+
+禁止自动配置目标全部源代码包自动设置 PrivateAssets 属性，默认的源代码将会自动添加如下代码
+
+```xml
+  <ItemGroup Condition="$(DisableSourcePackageAutoPrivateAssets) != 'true'">
+    <!-- 用于修复设置了 DevelopmentDependency 将不自动添加依赖 -->
+    <!-- 参阅 https://github.com/dotnet-campus/SourceYard/issues/112 -->
+    <PackageReference Update="#(PackageId)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>all</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+```
+
+可以通过在 `目标项目` 上设置 DisableSourcePackageAutoPrivateAssets 属性为 true 禁用当前项目全部安装的源代码包自动设置
+
+以上的 `#(PackageId)` 就是对应的安装的源代码包，如 `TheLib.Source` 等
+
+如需要对具体某个源代码包进行配置，请自行设置更新覆盖即可

sample/App/AppUsingSource/AppUsingSource.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Condition="Exists('obj\AppUsingSource.csproj.nuget.g.props') " Project="obj\AppUsingSource.csproj.nuget.g.props" />
+  <!--<Import Condition="Exists('obj\AppUsingSource.csproj.nuget.g.props') " Project="obj\AppUsingSource.csproj.nuget.g.props" />-->
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFrameworks>net45;net5.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <StartupObject />
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="TheLib.Source" Version="1.0.2" />
+    <PackageReference Include="TheLib.Source" Version="1.0.3-alpha06" />
   </ItemGroup>
-  <Import Condition="Exists('obj\AppUsingSource.csproj.nuget.g.targets') " Project="obj\AppUsingSource.csproj.nuget.g.targets" />
+  <!--<Import Condition="Exists('obj\AppUsingSource.csproj.nuget.g.targets') " Project="obj\AppUsingSource.csproj.nuget.g.targets" />-->
 </Project>

sample/App/AppUsingSource/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Windows;
 using TheLib;
 
 namespace AppUsingSource
@@ -8,6 +9,13 @@ class Program
         static void Main(string[] args)
         {
             var money = new Money(12312);
+            var v = (money, "123");
+            Console.WriteLine(v);
+
+#if NET45
+            var dependencyObject = new DependencyObject();
+#endif
+
             Console.WriteLine(money.ToCapital());
             Console.ReadLine();
         }

sample/App/TheLib/TheLib.csproj

@@ -1,20 +1,45 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45</TargetFrameworks>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="dotnetCampus.SourceYard" Version="0.1.19370-alpha01">
+    <PackageReference Include="dotnetCampus.SourceYard" Version="0.1.19393-alpha13">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <!-- <Target Name="GallikufawhaGebalule" AfterTargets="Build"> -->
+  <!-- 	~1~ <Warning Text="PackingDirectory: $(PackingDirectory)" /> @1@ -->
+  <!-- 	<Warning Text="IntermediateOutputPath: $(IntermediateOutputPath)" /> -->
+  <!--  </Target> -->
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
+    <Reference Include="WindowsBase"></Reference>
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="dotnetCampus.CommandLine" Version="3.3.0" />
+  </ItemGroup>
+
+  <!--<Target Name="_SourceYardFrameworkAssets"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_TfmSpecificFrameworkAssemblyReferences Include="@(ReferencePath->'%(OriginalItemSpec)')"
+                                               Condition="'%(ReferencePath.Pack)' != 'false' AND '%(ReferencePath.ResolvedFrom)' == '{TargetFrameworkDirectory}'">
+      </_TfmSpecificFrameworkAssemblyReferences>
+    </ItemGroup>
+
+    <Warning Text="$(TargetFramework):@(_TfmSpecificFrameworkAssemblyReferences)"/>
+  </Target>-->
+
   <ItemGroup>
     <SourceYardExcludeFileItem Include="foo.coin" />
     <SourceYardExcludeFileItem Include="Resource\F1.md" />
   </ItemGroup>
 
-</Project>
+</Project>

sample/build/Version.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>1.0.3</Version>
+    <Version>1.0.3-alpha06</Version>
   </PropertyGroup>
 </Project>

src/dotnetCampus.SourceYard/Assets/Current/Core.targets

@@ -3,6 +3,17 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- 用于给多框架存放各个框架的信息的文件的文件夹，各个框架将会在写入到各自的文件里面 -->
+    <!-- 选择 BaseIntermediateOutputPath 是因为开发者可以配置不同的框架采用不同的 obj 文件夹，但是对于不同的框架，大部分都是使用相同的 BaseIntermediateOutputPath 文件夹 -->
+    <_SourceYardMultiTargetingPackageInfoFolder>$(BaseIntermediateOutputPath)$(Configuration)\SourceYardMultiTargetingPackageInfoFolder\</_SourceYardMultiTargetingPackageInfoFolder>
+    <!-- 
+	     输出形式如：
+		       - obj\Debug\SourceYardMultiTargetingPackageInfoFolder\net45.txt
+		       - obj\Debug\SourceYardMultiTargetingPackageInfoFolder\net5.0.txt
+	  -->
+  </PropertyGroup>
 
   <!-- 打包核心 -->
 
@@ -16,9 +27,24 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="_SourceYardFrameworkAssets"
+          AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <!-- 参考 [增加分版本的package引用和framework引用 by Zhuangkh · Pull Request #111 · dotnet-campus/SourceYard](https://github.com/dotnet-campus/SourceYard/pull/111 ) -->
+      <_TfmSpecificFrameworkAssemblyReferences Include="@(ReferencePath->'%(OriginalItemSpec)')"
+                                               Condition="'%(ReferencePath.Pack)' != 'false' AND '%(ReferencePath.ResolvedFrom)' == '{TargetFrameworkDirectory}'">
+      </_TfmSpecificFrameworkAssemblyReferences>
+    </ItemGroup>
+  </Target>
+
   <!--打包第一步，将会多个框架分别执行-->
   <Target Name="SourceYardStep1">
     <PropertyGroup>
+      <!-- 用于将各个框架的信息写入的文件 -->
+      <_SourceYardMultiTargetingPackageInfoFile>$(_SourceYardMultiTargetingPackageInfoFolder)$(TargetFramework).txt</_SourceYardMultiTargetingPackageInfoFile>
+
+      <!-- 这里不能使用 $(PackingDirectory) 属性，原因是此属性在未打包时是空 -->
+      <!-- 对于多框架来说，这里的 IntermediateOutputPath 路径格式如 obj\Debug\net45\ -->
       <SourcePackingDirectory>$(IntermediateOutputPath)SourcePacking\</SourcePackingDirectory>
 
       <CompileTextFile>$(SourcePackingDirectory)CompileFile.txt</CompileTextFile>
@@ -34,6 +60,7 @@
       <PackageReleaseNotesFile>$(SourcePackingDirectory)PackageReleaseNotesFile.txt</PackageReleaseNotesFile>
 
       <PackageReferenceVersionFile>$(SourcePackingDirectory)PackageReferenceVersionFile.txt</PackageReferenceVersionFile>
+      <FrameworkReferenceVersionFile>$(SourcePackingDirectory)FrameworkReferenceVersionFile.txt</FrameworkReferenceVersionFile>
       <SourceProjectPackageFile>$(SourcePackingDirectory)SourceProjectPackageFile.txt</SourceProjectPackageFile>
       <SourceYardPackageReferenceFile>$(SourcePackingDirectory)SourceYardPackageReferenceFile.txt</SourceYardPackageReferenceFile>
 
@@ -91,10 +118,9 @@
       <SourceYardPackageId Condition="'$(PackageId)' != ''">--PackageId "$(PackageId) "</SourceYardPackageId>
 
       <SourceMSBuildProjectFullPath>-p "$(MSBuildProjectFullPath) "</SourceMSBuildProjectFullPath>
-      <SourceIntermediateDirectory>-i "$(SourcePackingDirectory)Package "</SourceIntermediateDirectory>
+
       <SourcePackageOutputPath Condition="'$(PackageOutputPath)' != ''">-n "$(PackageOutputPath) "</SourcePackageOutputPath>
       <SourcePackageOutputPath Condition="'$(PackageOutputPath)' == '' and $(OutputPath) != ''">-n "$(OutputPath) "</SourcePackageOutputPath>
-      <SourcePackageReferenceVersion>--PackageReferenceVersion "$(PackageReferenceVersionFile)"</SourcePackageReferenceVersion>
 
     </PropertyGroup>
 
@@ -105,8 +131,14 @@
   <!--打包第二步，将会多个框架分别执行-->
   <Target Name="SourceYardStep2">
 
+    <MakeDir Condition="!Exists($(_SourceYardMultiTargetingPackageInfoFolder))" Directories="$(_SourceYardMultiTargetingPackageInfoFolder)"></MakeDir>
+
     <MakeDir Condition="!Exists($(SourcePackingDirectory))" Directories="$(SourcePackingDirectory)"></MakeDir>
 
+    <!-- 写入框架信息 -->
+    <!--为了支持多框架项目，需要将当前的路径写入保存-->
+    <WriteLinesToFile File="$(_SourceYardMultiTargetingPackageInfoFile)" Lines="$(SourcePackingDirectory)" Overwrite="true"/>
+
     <WriteLinesToFile File="$(CompileTextFile)" Lines="@(Compile)" Overwrite="true" />
     <WriteLinesToFile File="$(ResourceTextFile)" Lines="@(Resource)" Overwrite="true" />
     <WriteLinesToFile File="$(ContentTextFile)" Lines="@(Content)" Overwrite="true" />
@@ -128,6 +160,7 @@
     <WriteLinesToFile File="$(SourceProjectPackageFile)" Lines=">;RepositoryUrl;$(RepositoryUrl);"></WriteLinesToFile>
 
     <WriteLinesToFile File="$(PackageReferenceVersionFile)" Lines="@(_PackageReferenceVersion)" Overwrite="true" />
+    <WriteLinesToFile File="$(FrameworkReferenceVersionFile)" Lines="@(_TfmSpecificFrameworkAssemblyReferences)" Overwrite="true"/>
     <WriteLinesToFile File="$(SourceYardPackageReferenceFile)" Lines="$(SourceYardPackageReference)" Overwrite="true"></WriteLinesToFile>
 
     <WriteLinesToFile File="$(SourceYardCompilePackageFile)" Lines="@(_SourceYardCompilePackage)" Overwrite="true"></WriteLinesToFile>
@@ -152,7 +185,7 @@
 
   <!--打包第三步，无论多框架还是单框架只执行一次-->
   <Target Name="SourceYardStep3">
-
+ 
     <!-- 开发者自己有指定路径，但是路径里面不存在应用 -->
     <Error Text="Can not find SourceYardApplicationFilePath $(SourceYardApplicationFilePath)" Condition="'$(SourceYardApplicationFilePath)' != '' And !Exists($(SourceYardApplicationFilePath))"/>
 
@@ -166,7 +199,7 @@
     </PropertyGroup>
 
     <Exec
-        Command="$(SourceYardApplicationFilePath) $(SourceMSBuildProjectFullPath) $(SourceIntermediateDirectory) $(SourcePackageOutputPath) $(SourceYardPackageVersion) --Compile $(CompileTextFile) --Resource $(ResourceTextFile) --Content $(ContentTextFile) --Page $(PageTextFile) --ApplicationDefinition $(ApplicationDefinitionTextFile) --None $(NoneTextFile) --EmbeddedResource $(EmbeddedResourceTextFile) $(SourceYardAuthors) $(SourceYardRepositoryUrl) $(SourceYardRepositoryType) $(SourceYardPackageProjectUrl) $(SourceYardCopyright) $(SourceYardDescription) $(SourceYardTitle) $(SourceYardPackageLicenseUrl) $(SourceYardPackageReleaseNotes) $(SourceYardPackageTags) $(SourceYardOwner) $(SourceYardPackageId) $(SourcePackageReferenceVersion) --SourcePackingDirectory $(SourcePackingDirectory) --TargetFrameworks &quot;$(TargetFrameworks) &quot; --TargetFramework &quot;$(TargetFramework) &quot;">
+        Command="$(SourceYardApplicationFilePath) $(SourceMSBuildProjectFullPath)  $(SourcePackageOutputPath) $(SourceYardPackageVersion) $(SourceYardAuthors) $(SourceYardRepositoryUrl) $(SourceYardRepositoryType) $(SourceYardPackageProjectUrl) $(SourceYardCopyright) $(SourceYardDescription) $(SourceYardTitle) $(SourceYardPackageLicenseUrl) $(SourceYardPackageReleaseNotes) $(SourceYardPackageTags) $(SourceYardOwner) $(SourceYardPackageId) --TargetFrameworks &quot;$(TargetFrameworks) &quot; --TargetFramework &quot;$(TargetFramework) &quot; --MultiTargetingPackageInfoFolder &quot;$(_SourceYardMultiTargetingPackageInfoFolder) &quot;">
     </Exec>
 
     <Message Text="Finish SourceYardStep3"></Message>

src/dotnetCampus.SourceYard/Assets/Target/build/$(PackageId).targets

@@ -1,5 +1,14 @@
 <Project>
 
+  <ItemGroup Condition="$(DisableSourcePackageAutoPrivateAssets) != 'true'">
+    <!-- 用于修复设置了 DevelopmentDependency 将不自动添加依赖 -->
+    <!-- 参阅 https://github.com/dotnet-campus/SourceYard/issues/112 -->
+    <PackageReference Update="#(PackageId)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>all</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
   <PropertyGroup Condition="!$(DefineConstants.Contains('#(PackageGuid)SOURCE_REFERENCE')) ">
     <_#(PackageGuid)ImportInWpfTempProjectDependsOn>
       _#(PackageGuid)IncludeSourceCodes

src/dotnetCampus.SourceYard/Cli/Options.cs

@@ -10,11 +10,11 @@ internal class Options
         [Option('p', "project", Description = "The full path of the project file.")]
         public string ProjectFile { get; set; } = null!;
 
-        /// <summary>
-        /// 临时的文件夹的路径
-        /// </summary>
-        [Option('i', "intermediate-directory", Description = "The relative path of the project intermediate output path, commonly the 'obj' folder and value in 'obj'.")]
-        public string IntermediateDirectory { get; set; } = null!;
+        ///// <summary>
+        ///// 临时的文件夹的路径
+        ///// </summary>
+        //[Option('i', "intermediate-directory", Description = "The relative path of the project intermediate output path, commonly the 'obj' folder and value in 'obj'.")]
+        //public string IntermediateDirectory { get; set; } = null!;
 
         /// <summary>
         /// 打包输出的文件夹
@@ -30,29 +30,29 @@ internal class Options
             Description = "The package version value.")]
         public string PackageVersion { get; set; } = "1.0.0";
 
-        /// <summary>
-        /// 项目进行编译的文件的列表，因为参数太多，需要将参数写到文件
-        /// </summary>
-        [Option(longName: "Compile", Description = "编译的文件")]
-        public string? CompileFile { get; set; }
+        ///// <summary>
+        ///// 项目进行编译的文件的列表，因为参数太多，需要将参数写到文件
+        ///// </summary>
+        //[Option(longName: "Compile", Description = "编译的文件")]
+        //public string? CompileFile { get; set; }
 
-        /// <summary>
-        /// 存放资源文件参数的文件
-        /// </summary>
-        [Option(longName: "Resource", Description = "资源文件")]
-        public string? ResourceFile { get; set; }
+        ///// <summary>
+        ///// 存放资源文件参数的文件
+        ///// </summary>
+        //[Option(longName: "Resource", Description = "资源文件")]
+        //public string? ResourceFile { get; set; }
 
-        [Option(longName: "Content")]
-        public string? ContentFile { get; set; }
+        //[Option(longName: "Content")]
+        //public string? ContentFile { get; set; }
 
-        [Option(longName: "Page")]
-        public string? Page { get; set; }
+        //[Option(longName: "Page")]
+        //public string? Page { get; set; }
 
-        [Option(longName: "None")]
-        public string? None { get; set; }
+        //[Option(longName: "None")]
+        //public string? None { get; set; }
 
-        [Option(longName: "EmbeddedResource")]
-        public string? EmbeddedResource { get; set; }
+        //[Option(longName: "EmbeddedResource")]
+        //public string? EmbeddedResource { get; set; }
 
         /// <summary>
         /// 打包的公司内容
@@ -82,8 +82,8 @@ internal class Options
         [Option(longName: "DescriptionFile")]
         public string? DescriptionFile { get; set; }
 
-        [Option(longName: "ApplicationDefinition")]
-        public string? ApplicationDefinition { get; set; }
+        //[Option(longName: "ApplicationDefinition")]
+        //public string? ApplicationDefinition { get; set; }
 
         [Option(longName: "Owner")]
         public string? Owner { get; set; }
@@ -106,19 +106,25 @@ internal class Options
         [Option(longName: "PackageId")] 
         public string? PackageId { get; set; }
 
-        [Option(longName: "PackageReferenceVersion")]
-        public string? PackageReferenceVersion { get; set; }
+        //[Option(longName: "PackageReferenceVersion")]
+        //public string? PackageReferenceVersion { get; set; }
 
-        /// <summary>
-        /// 打包用到的文件夹
-        /// </summary>
-        [Option(longName: "SourcePackingDirectory")]
-        public string SourcePackingDirectory { get; set; } = null!;
+        ///// <summary>
+        ///// 打包用到的文件夹
+        ///// </summary>
+        //[Option(longName: "SourcePackingDirectory")]
+        //public string SourcePackingDirectory { get; set; } = null!;
 
         [Option(longName: "TargetFramework")]
         public string? TargetFramework { get; set; }
 
         [Option(longName: "TargetFrameworks")]
         public string? TargetFrameworks { get; set; }
+
+        /// <summary>
+        /// 多框架信息存放的文件夹，即使是单框架项目也会存在此文件夹
+        /// </summary>
+        [Option("MultiTargetingPackageInfoFolder")]
+        public string MultiTargetingPackageInfoFolder { set; get; } = null!;
     }
 }