From f3264faad63986ca6b1d9231d7b5caadb00de4ea Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 18:06:01 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=91=BD=E4=BB=A4?= =?UTF-8?q?=E8=A1=8C=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Cli/Options.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dotnetCampus.SourceYard/Cli/Options.cs b/src/dotnetCampus.SourceYard/Cli/Options.cs index 5b75d2b..d1979c0 100644 --- a/src/dotnetCampus.SourceYard/Cli/Options.cs +++ b/src/dotnetCampus.SourceYard/Cli/Options.cs @@ -7,7 +7,7 @@ internal class Options /// /// 项目文件所在的路径 /// - [Option('p', "project", Description = "The full path of the project file.")] + [Option('p', "Project", Description = "The full path of the project file.")] public string ProjectFile { get; set; } = null!; ///// @@ -19,13 +19,13 @@ internal class Options /// /// 打包输出的文件夹 /// - [Option('n', "package-output-path", Description = "The package output full path of the project.")] + [Option('n', "PackageOutputPath", Description = "The package output full path of the project.")] public string PackageOutputPath { get; set; } = null!; /// /// 当前项目的打包版本 /// - [Option('v', "package-version", + [Option('v', "PackageVersion", // 默认不需要加上打包版本 Description = "The package version value.")] public string PackageVersion { get; set; } = "1.0.0"; From a1071a41ec32659ae6369daf289c0dbc0566aea8 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 18:06:10 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9C=A8=20Linux=20?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Assets/Current/Core.targets | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 45fecec..aaa5fb9 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -7,7 +7,8 @@ - <_SourceYardMultiTargetingPackageInfoFolder>$(BaseIntermediateOutputPath)$(Configuration)\SourceYardMultiTargetingPackageInfoFolder\ + <_SourceYardMultiTargetingPackageInfoFolder>$([System.IO.Path]::Combine($(BaseIntermediateOutputPath),$(Configuration),"SourceYardMultiTargetingPackageInfoFolder")) + - <_SourceYardMultiTargetingPackageInfoFile>$(_SourceYardMultiTargetingPackageInfoFolder)$(TargetFramework).txt + <_SourceYardMultiTargetingPackageInfoFile>$([System.IO.Path]::Combine($(BaseIntermediateOutputPath),$(_SourceYardMultiTargetingPackageInfoFolder),"$(TargetFramework).txt")) @@ -76,6 +77,10 @@ $(SourcePackingDirectory)SourceYardEmbeddedResourcePackageFile.txt + + + + From e4c4cc692b0582be04df9bcc89184ad9de57a110 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:07:08 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=8B=BC=E6=8E=A5=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=9C=A8=20Linux=20=E4=B8=8B=E6=89=BE=E4=B8=8D=E5=88=B0?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Current/Core.targets | 50 +++++++++---------- 1 file changed, 23 insertions(+), 27 deletions(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index aaa5fb9..5c0773a 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -46,41 +46,37 @@ - $(IntermediateOutputPath)SourcePacking\ + $([System.IO.Path]::Combine($(BaseIntermediateOutputPath),$(IntermediateOutputPath),"SourcePacking")) - $(SourcePackingDirectory)CompileFile.txt - $(SourcePackingDirectory)ResourceFile.txt - $(SourcePackingDirectory)ContentFile.txt - $(SourcePackingDirectory)NoneFile.txt - $(SourcePackingDirectory)EmbeddedResourceFile.txt - $(SourcePackingDirectory)PageFile.txt - $(SourcePackingDirectory)ApplicationDefinitionFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"CompileFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"ResourceFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"ContentFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"NoneFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"EmbeddedResourceFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"PageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"ApplicationDefinitionFile.txt")) - $(SourcePackingDirectory)DescriptionFile.txt - $(SourcePackingDirectory)CopyrightFile.txt - $(SourcePackingDirectory)PackageReleaseNotesFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"DescriptionFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"CopyrightFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"PackageReleaseNotesFile.txt")) - $(SourcePackingDirectory)PackageReferenceVersionFile.txt - $(SourcePackingDirectory)FrameworkReferenceVersionFile.txt - $(SourcePackingDirectory)SourceProjectPackageFile.txt - $(SourcePackingDirectory)SourceYardPackageReferenceFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"PackageReferenceVersionFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"FrameworkReferenceVersionFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceProjectPackageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardPackageReferenceFile.txt")) - $(SourcePackingDirectory)SourceYardExcludePackageReferenceFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardExcludePackageReferenceFile.txt")) - $(SourcePackingDirectory)SourceYardExcludeFileItemFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardExcludeFileItemFile.txt")) - $(SourcePackingDirectory)SourceYardCompilePackageFile.txt - $(SourcePackingDirectory)SourceYardResourcePackageFile.txt - $(SourcePackingDirectory)SourceYardContentPackageFile.txt - $(SourcePackingDirectory)SourceYardNonePackageFile.txt - $(SourcePackingDirectory)SourceYardEmbeddedResourcePackageFile.txt + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardCompilePackageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardResourcePackageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardContentPackageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardNonePackageFile.txt")) + $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardEmbeddedResourcePackageFile.txt")) - - - - @@ -216,7 +212,7 @@ - <_SourcePackingDirectory>$(IntermediateOutputPath)SourcePacking\ + <_SourcePackingDirectory>$([System.IO.Path]::Combine($(IntermediateOutputPath),"SourcePacking")) From ba30b1b97fa5a36c92b528a4dd2712bd201e2681 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:14:18 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=BA=86?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=EF=BC=8C=E6=89=BE=E4=B8=8D=E5=88=B0=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Assets/Current/Core.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 5c0773a..7019897 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -200,7 +200,7 @@ + Command="$(SourceYardApplicationFilePath) $(SourceMSBuildProjectFullPath) $(SourcePackageOutputPath) $(SourceYardPackageVersion) $(SourceYardAuthors) $(SourceYardRepositoryUrl) $(SourceYardRepositoryType) $(SourceYardPackageProjectUrl) $(SourceYardCopyright) $(SourceYardDescription) $(SourceYardTitle) $(SourceYardPackageLicenseUrl) $(SourceYardPackageReleaseNotes) $(SourceYardPackageTags) $(SourceYardOwner) $(SourceYardPackageId) --TargetFrameworks "$(TargetFrameworks) " --TargetFramework "$(TargetFramework) " --MultiTargetingPackageInfoFolder "$(_SourceYardMultiTargetingPackageInfoFolder)""> From c3a1aa40d525b1641c29e4b3b3a48c9ceb91daa7 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:23:50 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=AF=B9?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Assets/Current/Core.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 7019897..2257cfc 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -42,7 +42,7 @@ - <_SourceYardMultiTargetingPackageInfoFile>$([System.IO.Path]::Combine($(BaseIntermediateOutputPath),$(_SourceYardMultiTargetingPackageInfoFolder),"$(TargetFramework).txt")) + <_SourceYardMultiTargetingPackageInfoFile>$([System.IO.Path]::Combine($(_SourceYardMultiTargetingPackageInfoFolder),"$(TargetFramework).txt")) @@ -77,6 +77,8 @@ $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardEmbeddedResourcePackageFile.txt")) + + From b572578a025150b60f5ca7b0fae4d35a581f8822 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:26:02 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=9C=AB=E5=B0=BE?= =?UTF-8?q?=E4=B8=8D=E5=B8=A6=E7=A9=BA=E6=A0=BC=E7=9A=84=EF=BC=8C=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E7=A9=BA=E6=A0=BC=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Current/Core.targets | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 2257cfc..2c62e4b 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -106,21 +106,21 @@ RepositoryUrl "$(RepositoryUrl)" RepositoryType "$(RepositoryType)" PackageProjectUrl "$(PackageProjectUrl)"--> - --PackageLicenseUrl "$(PackageLicenseUrl) " + --PackageLicenseUrl "$(PackageLicenseUrl)" --CopyrightFile "$(CopyrightFile)" -v $(PackageVersion) - --DescriptionFile "$(DescriptionFile) " + --DescriptionFile "$(DescriptionFile)" --Title "$(Title)" --Owner "$(Owner)" - --PackageTags "$(PackageTags) " + --PackageTags "$(PackageTags)" --PackageReleaseNotesFile $(PackageReleaseNotesFile) - --PackageId "$(PackageId) " + --PackageId "$(PackageId)" - -p "$(MSBuildProjectFullPath) " + -p "$(MSBuildProjectFullPath)" -n "$(PackageOutputPath) " -n "$(OutputPath) " From d58b7f21f2dcbd0605ea91917ab83f97d632d274 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:28:12 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=88=A0=E6=8E=89=E8=B0=83=E8=AF=95?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Assets/Current/Core.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 2c62e4b..2c275fb 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -77,8 +77,6 @@ $([System.IO.Path]::Combine($(SourcePackingDirectory),"SourceYardEmbeddedResourcePackageFile.txt")) - - From 7e3720e17fad1e5ddaecaa6c0130c9513ee407f1 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:32:00 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E5=88=B0=E7=A9=BA=E6=96=87=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/Assets/Current/Core.targets | 2 +- src/dotnetCampus.SourceYard/Program.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets index 2c275fb..a54300d 100644 --- a/src/dotnetCampus.SourceYard/Assets/Current/Core.targets +++ b/src/dotnetCampus.SourceYard/Assets/Current/Core.targets @@ -121,7 +121,7 @@ -p "$(MSBuildProjectFullPath)" -n "$(PackageOutputPath) " - -n "$(OutputPath) " + -n "$(OutputPath) " diff --git a/src/dotnetCampus.SourceYard/Program.cs b/src/dotnetCampus.SourceYard/Program.cs index c63ace0..770d9a3 100644 --- a/src/dotnetCampus.SourceYard/Program.cs +++ b/src/dotnetCampus.SourceYard/Program.cs @@ -93,6 +93,10 @@ private static void RunOptionsAndReturnExitCode(Options options) // 安装的项目的兼容性无法处理？源代码包有 net45 框架，项目是 net47 框架，如何让项目能兼容使用到 net45 框架？当前没有此生成逻辑 var sourcePackingFolder = GetCommonSourcePackingFolder(multiTargetingPackageInfo, logger); var packageOutputPath = options.PackageOutputPath; + if (!string.IsNullOrEmpty(packageOutputPath)) + { + packageOutputPath = packageOutputPath.Trim(); + } var packageVersion = options.PackageVersion; // logger.Message($@"项目文件 {projectFile} From 21788e3dd54f9e25ebc413eda77f62bb84ec8223 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:37:13 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D=20CI?= =?UTF-8?q?=20=E6=9C=8D=E5=8A=A1=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dotnetCampus.SourceYard/dotnetCampus.SourceYard.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/dotnetCampus.SourceYard/dotnetCampus.SourceYard.csproj b/src/dotnetCampus.SourceYard/dotnetCampus.SourceYard.csproj index 67df931..c7b1dd6 100644 --- a/src/dotnetCampus.SourceYard/dotnetCampus.SourceYard.csproj +++ b/src/dotnetCampus.SourceYard/dotnetCampus.SourceYard.csproj @@ -43,6 +43,9 @@ all runtime; build; native; contentfiles; analyzers + + + From d7fc5b018441fdf3e1033c50c218ba05784b14b9 Mon Sep 17 00:00:00 2001 From: lindexi Date: Mon, 15 Aug 2022 20:37:45 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 86d1b56..d19eeaa 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018-2020 dotnet campus +Copyright (c) 2018-2022 dotnet campus Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal