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

Merge branch 'release/2.1' into dev

This commit is contained in:
John Luo 2018-02-06 09:46:09 -08:00
parent 0ec2266d65 0732f9379f
commit f15d0f7567
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Publish.targets
View File

@ -3,6 +3,7 @@
<PropertyGroup>
<DependencyAssetsDir>$(RepositoryRoot).deps\assets\</DependencyAssetsDir>
<DependencyPackagesDir>$(RepositoryRoot).deps\packages\</DependencyPackagesDir>
<DependencySymbolsDir>$(RepositoryRoot).deps\symbols\</DependencySymbolsDir>
<!-- This file is used by the dotnet/cli to determine if our shared framework aligns with the version they pull. -->
<BaseRuntimeVersionFileName>aspnetcore_base_runtime.version</BaseRuntimeVersionFileName>
<BaseRuntimeVersionFile>$(IntermediateDir)$(BaseRuntimeVersionFileName)</BaseRuntimeVersionFile>
@ -73,6 +74,8 @@
<ManifestArtifactData>ShipInstaller=dotnetcli</ManifestArtifactData>
</FilesToPublish>
<PackagesToPublishToTransport Include="$(DependencySymbolsDir)\**\*.symbols.nupkg" />
<!-- Intermediate files passed on to the dotnet-CLI. -->
<FilesToPublish Include="$(DependencyAssetsDir)$(PackageArchiveFileName)" >
<RelativeBlobPath>$(BlobBasePath)$(PackageArchiveFileName)</RelativeBlobPath>

1
build/repo.targets
View File

@ -93,6 +93,7 @@
<_LineupPackages Include="@(ExternalDependency)" />
<_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " />
<_LineupPackages Include="Microsoft.AspNetCore.All" Version="$(PackageVersion)" />
<_LineupPackages Include="Microsoft.AspNetCore.App" Version="$(PackageVersion)" />
<_RestoreSources Include="$(DotNetAdditionalRestoreSources)" Condition="'$(DotNetAdditionalRestoreSources)' != ''" />
<_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" />

47
build/tasks/AddArchiveReferences.cs
View File

@ -52,12 +52,31 @@ namespace RepoTasks
foreach (var package in archiveArtifacts)
{
var packageName = package.ItemSpec;
var packageVersion = string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase) ?
MetaPackageVersion :
buildArtifacts
.Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase))
.PackageInfo.Version.ToString();
string packageVersion;
if (string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase)
|| string.Equals(packageName, "Microsoft.AspNetCore.App", StringComparison.OrdinalIgnoreCase))
{
packageVersion = MetaPackageVersion;
}
else
{
var packageVersionCandidates = buildArtifacts.Where(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase));
if (!packageVersionCandidates.Any())
{
Log.LogError($"Missing Package: {packageName} from artifacts archive.");
return false;
}
else if (packageVersionCandidates.Count() > 1)
{
Log.LogError($"Duplicate Packages: {packageName} from artifacts archive.");
return false;
}
packageVersion = packageVersionCandidates.Single().PackageInfo.Version.ToString();
}
Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersion}");
var packageReferenceElement = xmlDoc.CreateElement("PackageReference");
@ -83,9 +102,21 @@ namespace RepoTasks
foreach (var package in archiveTools)
{
var packageName = package.ItemSpec;
var packageVersion = buildArtifacts
.Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase))
.PackageInfo.Version.ToString();
var packageVersionCandidates = buildArtifacts.Where(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase));
if (!packageVersionCandidates.Any())
{
Log.LogError($"Missing Package: {packageName} from tools archive.");
return false;
}
else if (packageVersionCandidates.Count() > 1)
{
Log.LogError($"Duplicate Packages: {packageName} from tools archive.");
return false;
}
var packageVersion = packageVersionCandidates.Single().PackageInfo.Version.ToString();
Log.LogMessage(MessageImportance.High, $" - Tool: {packageName} Version: {packageVersion}");