huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Push lineup packages and put symbols in a separate directory

This commit is contained in:
Nate McMaster 2017-09-29 14:14:57 -07:00
parent 586d3c99c7
commit e7c5ce6bb9
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/push.targets
View File

@ -5,7 +5,7 @@
<ItemGroup> <ItemGroup>
<_PackagesToPush Include="$(BuildDir)*.nupkg" /> <_PackagesToPush Include="$(BuildDir)*.nupkg" />
<_PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" /> <_PackagesToPush Include="$(ArtifactsDir)mirror\*.nupkg" />
<_LineupPackagesToPush Include="$(BuildDir)*.nupkg" /> <_LineupPackagesToPush Include="$(LineupBuildDir)*.nupkg" />
</ItemGroup> </ItemGroup>
<PushNuGetPackages <PushNuGetPackages

2
build/repo.targets
View File

@ -253,7 +253,7 @@
<Target Name="CopyPackagesByCategory"> <Target Name="CopyPackagesByCategory">
<ItemGroup> <ItemGroup>
<PackageArtifactFile Include="$(BuildDir)*.nupkg" Exclude="$(BuildDir)*.symbols.nupkg" /> <PackageArtifactFile Include="$(BuildDir)*.nupkg" />
<ExternalDependencyPackage Include="@(ExternalDependency->WithMetadataValue('Mirror', 'true'))" Category="mirror" /> <ExternalDependencyPackage Include="@(ExternalDependency->WithMetadataValue('Mirror', 'true'))" Category="mirror" />
<_MirroredPackageFiles Include="$(IntermediateMirrorPackageDir)*.nupkg" /> <_MirroredPackageFiles Include="$(IntermediateMirrorPackageDir)*.nupkg" />
</ItemGroup> </ItemGroup>

19
build/tasks/CopyPackagesToSplitFolders.cs
View File

@ -44,16 +44,26 @@ namespace RepoTasks
foreach (var file in Files) foreach (var file in Files)
{ {
var isSymbolsPackage = file.ItemSpec.EndsWith(".symbols.nupkg", StringComparison.OrdinalIgnoreCase);
PackageIdentity identity; PackageIdentity identity;
using (var reader = new PackageArchiveReader(file.ItemSpec)) using (var reader = new PackageArchiveReader(file.ItemSpec))
{ {
identity = reader.GetIdentity(); identity = reader.GetIdentity();
} }
if (!expectedPackages.TryGetCategory(identity.Id, out var category)) PackageCategory category;
if (isSymbolsPackage)
{ {
Log.LogError($"Unexpected package artifact with id: {identity.Id}"); category = PackageCategory.Symbols;
continue; }
else
{
if (!expectedPackages.TryGetCategory(identity.Id, out category))
{
Log.LogError($"Unexpected package artifact with id: {identity.Id}");
continue;
}
} }
string destDir; string destDir;
@ -73,6 +83,9 @@ namespace RepoTasks
case PackageCategory.Mirror: case PackageCategory.Mirror:
destDir = Path.Combine(DestinationFolder, "mirror"); destDir = Path.Combine(DestinationFolder, "mirror");
break; break;
case PackageCategory.Symbols:
destDir = Path.Combine(DestinationFolder, "symbols");
break;
default: default:
throw new NotImplementedException(); throw new NotImplementedException();
} }

1
build/tasks/ProjectModel/PackageCategory.cs
View File

@ -11,5 +11,6 @@ namespace RepoTasks.ProjectModel
NoShip, NoShip,
ShipOob, ShipOob,
Mirror, Mirror,
Symbols,
} }
} }