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.

Sign up for GitHub

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

Jump to bottom

Fix incremental servicing condition #95119

Merged
merged 6 commits into from Nov 22, 2023
Merged

Fix incremental servicing condition #95119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b02b1d4
Fix incremental servicing condition
ViktorHofer Nov 22, 2023
00c5bd1
Update packaging.targets
ViktorHofer Nov 22, 2023
6f1f9eb
Update Directory.Build.props
ViktorHofer Nov 22, 2023
0882aa8
Update Microsoft.Internal.Runtime.AspNetCore.Transport.proj
ViktorHofer Nov 22, 2023
e2aff1d
Update Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj
ViktorHofer Nov 22, 2023
12a4302
Update packaging.targets
ViktorHofer Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 10 additions & 3 deletions eng/packaging.targets
View file
Open in desktop
Expand Up @@ -21,13 +21,20 @@
<ApiCompatIgnoreTargetPlatformMoniker Condition="'$(SuppressDependenciesWhenPacking)' == 'true'">true</ApiCompatIgnoreTargetPlatformMoniker>
<PackageDesignerMarkerFile>$(MSBuildThisFileDirectory)useSharedDesignerContext.txt</PackageDesignerMarkerFile>
<PackageReadmeFile Condition="'$(PackageReadmeFile)' == '' and Exists('PACKAGE.md')">PACKAGE.md</PackageReadmeFile>
<!-- Non-shipping packages shouldn't incrementally serviced. -->
<PackageUseIncrementalServicingVersion Condition="'$(IsShipping)' != 'true'">false</PackageUseIncrementalServicingVersion>
<!-- Generate packages for rid specific projects or for allconfigurations during build. -->
<!-- A package isn't generated if in servicing or in runtimelab. Intended to be overridden at project level. -->
<IsRIDSpecificProject Condition="$(MSBuildProjectName.StartsWith('runtime.')) and
!$(MSBuildProjectName.StartsWith('runtime.native'))">true</IsRIDSpecificProject>
<GeneratePackageOnBuild Condition="('$(BuildAllConfigurations)' == 'true' or
'$(IsRIDSpecificProject)' == 'true') and
'$(PreReleaseVersionLabel)' != 'servicing' and
<GeneratePackageOnBuild Condition="(
'$(BuildAllConfigurations)' == 'true' or
'$(IsRIDSpecificProject)' == 'true'
) and
(
'$(PreReleaseVersionLabel)' != 'servicing' or
'$(PackageUseIncrementalServicingVersion)' != 'true'
) and
'$(GitHubRepositoryName)' != 'runtimelab'">true</GeneratePackageOnBuild>
<!-- When in source-build we need to generate all packages when building for all configurations even in servicing. -->
<GeneratePackageOnBuild Condition="'$(GeneratePackageOnBuild)' != 'true' and
Expand Down
6 changes: 0 additions & 6 deletions ...nal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
View file
Open in desktop
Expand Up @@ -13,12 +13,6 @@
<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
6 changes: 0 additions & 6 deletions ...ime.WindowsDesktop.Transport/src/Microsoft.Internal.Runtime.WindowsDesktop.Transport.proj
View file
Open in desktop
Expand Up @@ -12,12 +12,6 @@
<NoWarn>$(NoWarn);NU5131;NU5128</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