Skip to content

Commit

Permalink
Flow internal transport packages during servicing (#75979)
Browse files Browse the repository at this point in the history
This makes sure that partner repositories have their internal transport
packages available. This needs to be set explicitly as during servicing,
libraries only publish on demand.

This also fixes broken 7.0 servicing builds which require at least one
package to be published.

Manual, partial backport of c5a20f9.

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
  • Loading branch information
github-actions[bot] and ViktorHofer committed Sep 26, 2022
1 parent 5429eb1 commit 97faf12
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
3 changes: 1 addition & 2 deletions eng/packaging.targets
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
'$(IsRIDSpecificProject)' == 'true') and
'$(PreReleaseVersionLabel)' != 'servicing' and
'$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>
<GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)' != 'true'">false</GeneratePackageOnBuild>
<!-- When in source-build we need to generate all packages when building for all configurations even in servicing. -->
<GeneratePackageOnBuild Condition="!$(GeneratePackageOnBuild) and
<GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)' != 'true' and
'$(BuildAllConfigurations)' == 'true' and
'$(DotNetBuildFromSource)' == 'true'">true</GeneratePackageOnBuild>
<!-- Search for the documentation file in the intellisense package and otherwise pick up the generated one. -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<NoWarn>$(NoWarn);NU5131</NoWarn>
</PropertyGroup>

<!-- Always generate this package during servicing to flow the dependency to AspNetCore. -->
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>$(PatchVersion)</ServicingVersion>
</PropertyGroup>

<ItemGroup>
<!-- Requires Private=true to calculate ReferenceCopyLocalPaths items. -->
<ProjectReference Include="@(AspNetCoreAppLibrary->'$(LibrariesProjectRoot)%(Identity)\src\%(Identity).csproj')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<NoWarn>$(NoWarn);NU5131</NoWarn>
</PropertyGroup>

<!-- Always generate this package during servicing to flow the dependency to WindowsDesktop. -->
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<ServicingVersion>$(PatchVersion)</ServicingVersion>
</PropertyGroup>

<ItemGroup>
<!-- Requires Private=true to calculate ReferenceCopyLocalPaths items.
ReferringTargetFramework is set to $(NetCoreAppCurrent)-windows so that we pack the Windows specific implementation assemblies -->
Expand Down

0 comments on commit 97faf12

Please sign in to comment.