diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-11-24 02:08:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 02:08:08 +0300 |
| commit | 90b8f7ee5816d5288fa3d63cca880360bc81719b (patch) | |
| tree | 9fb70fe6754a736dc951bfb23afb55c44840c322 /eng | |
| parent | e564220b5228e7d26a959dcecec62e6c98d8cbb7 (diff) | |
[release/5.0] Throw when reader is completed with an exception (#43903)
* Throw when reader is completed with an exception
* fb
* some infra
* Update the assembly version as well
* add assembly version
* fix system.io.pipelines packageindex entry
* Fix package harvesting by passing correct versions
Co-authored-by: BrennanConroy <brecon@microsoft.com>
Co-authored-by: Anirudh Agnihotry <anirudhagnihotry098@gmail.com>
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/restore/harvestPackages.targets | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/eng/restore/harvestPackages.targets b/eng/restore/harvestPackages.targets index a7fc8aa3465..2e9a8155be6 100644 --- a/eng/restore/harvestPackages.targets +++ b/eng/restore/harvestPackages.targets @@ -1,16 +1,21 @@ -<Project InitialTargets="AddPackageDownload"> +<Project InitialTargets="AddPackageDownload"> <UsingTask TaskName="GetLastStablePackage" AssemblyFile="$(PackagingTaskAssembly)"/> - <Target Name="AddPackageDownload"> - <ItemGroup> - <_AllPkgProjs Include="$(LibrariesProjectRoot)*\pkg\**\*.pkgproj" /> - </ItemGroup> - <!-- Need separate ItemGroups so right metadata gets populated --> + + <Target Name="_GetBuildingPackageVersions"> <ItemGroup> - <_AllPkgProjsToPackageIdentity Include="@(_AllPkgProjs -> '%(Filename)')" /> + <_AllPkgProjs Include="$(LibrariesProjectRoot)*\pkg\**\*.pkgproj"> + <UndefineProperties>MSBuildRestoreSessionId</UndefineProperties> + </_AllPkgProjs> </ItemGroup> + + <MSBuild Projects="@(_AllPkgProjs)" Targets="GetPackageIdentityIfStable" Properties="$(ProjectProperties)"> + <Output TaskParameter="TargetOutputs" ItemName="_AllPkgProjsWithVersion" /> + </MSBuild> + </Target> + <Target Name="AddPackageDownload" DependsOnTargets="_GetBuildingPackageVersions"> <GetLastStablePackage - LatestPackages="@(_AllPkgProjsToPackageIdentity)" + LatestPackages="@(_AllPkgProjsWithVersion)" PackageIndexes="$(PackageIndexFile)" DoNotAllowVersionsFromSameRelease="true"> <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" /> |