Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

如果源代码包被目标项目引用了,打出的目标项目的源代码包将会包含引用依赖 #76

Merged
merged 4 commits into from
Jun 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/PublishNuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: publish nuget

on:
push:
branches:
- master
tags:
- '*'

jobs:
build:
Expand All @@ -16,7 +16,14 @@ jobs:
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.201
dotnet-version: 3.1.202

- name: Install tool
run: dotnet tool install -g dotnetCampus.TagToVersion

- name: Set tag to version
run: dotnet TagToVersion -t ${{ github.ref }}

- name: Build with dotnet
run: dotnet build --configuration Release
- name: Install Nuget
Expand Down
2 changes: 1 addition & 1 deletion build/Version.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<PropertyGroup>
<Version>0.1.19031-alpha</Version>
<Version>0.1.19051-alpha</Version>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/dotnetCampus.SourceYard/Assets/Current/Core.targets
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

<PackageReferenceVersionFile>$(SourcePackingDirectory)PackageReferenceVersionFile.txt</PackageReferenceVersionFile>
<SourceProjectPackageFile>$(SourcePackingDirectory)SourceProjectPackageFile.txt</SourceProjectPackageFile>
<SourceYardPackageReferenceFile>$(SourcePackingDirectory)SourceYardPackageReferenceFile.txt</SourceYardPackageReferenceFile>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -98,7 +99,7 @@
<WriteLinesToFile File="$(SourceProjectPackageFile)" Lines=">;RepositoryUrl;$(RepositoryUrl);"></WriteLinesToFile>

<WriteLinesToFile File="$(PackageReferenceVersionFile)" Lines="@(_PackageReferenceVersion)" Overwrite="true" />

<WriteLinesToFile File="$(SourceYardPackageReferenceFile)" Lines="$(SourceYardPackageReference)" Overwrite="true"></WriteLinesToFile>
</Target>

<Target Name="SourceYardStep3">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@
<ShouldFixNuGetImportingBugForWpfProjects Condition=" '$(ShouldFixNuGetImportingBugForWpfProjects)' == '' ">True</ShouldFixNuGetImportingBugForWpfProjects>
</PropertyGroup>

<PropertyGroup>
<SourceYardPackageReference>$(SourceYardPackageReference);#(PackageId)</SourceYardPackageReference>
</PropertyGroup>
</Project>
42 changes: 26 additions & 16 deletions src/dotnetCampus.SourceYard/PackFlow/NuspecFileGenerator.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -37,19 +38,19 @@ private void Write(NuspecPackage nuspecPackage, string fileName)
var ns = new XmlSerializerNamespaces();
ns.Add("", "");

//#if DEBUG
//#if DEBUG

// var str = new StringBuilder();
// using (var xmlWriter = XmlWriter.Create(str))
// {
// var xmlSerializer = new XmlSerializer(typeof(NuspecPackage));
// xmlSerializer.Serialize(xmlWriter, nuspecPackage, ns);
// }
// var str = new StringBuilder();
// using (var xmlWriter = XmlWriter.Create(str))
// {
// var xmlSerializer = new XmlSerializer(typeof(NuspecPackage));
// xmlSerializer.Serialize(xmlWriter, nuspecPackage, ns);
// }

// var rawceeyopereSuwhisa = str.ToString();
// var rawceeyopereSuwhisa = str.ToString();

// rawceeyopereSuwhisa = rawceeyopereSuwhisa;
//#endif
// rawceeyopereSuwhisa = rawceeyopereSuwhisa;
//#endif

using (var stream = file.OpenWrite())
{
Expand Down Expand Up @@ -88,18 +89,20 @@ private NuspecPackage GetNuspec(IPackingContext context)
PackageLicenseUrl = buildProps.PackageLicenseUrl,
PackageTags = buildProps.PackageTags,
PackageReleaseNotes = buildProps.PackageReleaseNotes,
Dependencies = GetDependencies(context.PackageReferenceVersion),
Dependencies = GetDependencies(context.PackageReferenceVersion, buildProps.SourceYardPackageReferenceList),
Repository = repository
}
};
}

private List<NuspecDependency> GetDependencies(string contextPackageVersion)
private List<NuspecDependency> GetDependencies(string contextPackageVersion,
List<string> sourceYardPackageReferenceList)
{
return ParserPackageVersion(contextPackageVersion);
return ParserPackageVersion(contextPackageVersion, sourceYardPackageReferenceList);
}

private List<NuspecDependency> ParserPackageVersion(string packageVersionFile)
private List<NuspecDependency> ParserPackageVersion(string packageVersionFile,
List<string> sourceYardPackageReferenceList)
{
var nuspecDependencyList = new List<NuspecDependency>();
var packageVersionRegex = new Regex(@"Name='(\S+)' Version='([\S|\-]+)' PrivateAssets='(\S*)'");
Expand All @@ -117,7 +120,14 @@ private List<NuspecDependency> ParserPackageVersion(string packageVersionFile)

// 在源代码包如果项目引用的是 private asset 的库,那么就不应该添加引用
// 因为源代码是没有框架的依赖,对 sdk 带的库也不添加
if (!privateAssets.Contains("all")

var isPrivateAssetsAll = privateAssets.Contains("all");

// 解决 https://github.com/dotnet-campus/SourceYard/issues/60
// 即使有某个包标记了使用 private asset 是 All 的,但是这个包是一个源代码包,那么打包的时候就需要添加他的引用依赖
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这?似乎有争议?

争议点在于,privateassets 的包一般是控制编译的,或者是分析器。可能有的不能识别非项目目录下的?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

是的,现在是源代码包标记的,即使写了 PrivateAssets 是 All 也会被添加引用

var includeInSourceYardPackageReference = sourceYardPackageReferenceList.Any(temp => temp.Equals(name, StringComparison.OrdinalIgnoreCase));

if ((!isPrivateAssetsAll || includeInSourceYardPackageReference)
&& !SDKNuget.Contains(name))
{
nuspecDependencyList.Add(new NuspecDependency()
Expand Down
11 changes: 11 additions & 0 deletions src/dotnetCampus.SourceYard/Utils/BuildProps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,17 @@ public void SetSourcePackingDirectory(string packingDirectory)

RepositoryUrl = appConfigurator.Default.GetValue("RepositoryUrl").Trim();
}

var sourceYardPackageReferenceFile = Path.Combine(packingDirectory, "SourceYardPackageReferenceFile.txt");

List<string> sourceYardPackageReferenceList = File.ReadAllLines(sourceYardPackageReferenceFile).Where(temp=>!string.IsNullOrEmpty(temp)).ToList();
SourceYardPackageReferenceList = sourceYardPackageReferenceList;
}

/// <summary>
/// 安装的源代码包列表
/// </summary>
/// 用于解决 https://github.com/dotnet-campus/SourceYard/issues/60
public List<string> SourceYardPackageReferenceList { get; private set; }
}
}