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.

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

Add servicing build targeting pack skip config #230

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,20 @@
<NETCoreAppFrameworkVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>netcoreapp$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
</PropertyGroup>
<!--
Servicing build settings.

* To enable a package build for the current patch release, set PatchVersion to match the current
patch version of that package. (major.minor.patch)

* Do not delete these lines to disable the package build. When PatchVersion is incremented at
the beginning of the next servicing release, the package automatically stops building because
the version no longer matches.
-->
<ItemGroup Condition="'$(StabilizePackageVersion)' == 'true'">
<ProjectServicingConfiguration Include="Microsoft.WindowsDesktop.App.Ref" PatchVersion="0" />
</ItemGroup>

<PropertyGroup>
<MicrosoftDotNetMaestroTasksVersion>1.0.0-beta.18619.4</MicrosoftDotNetMaestroTasksVersion>
</PropertyGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/windowsdesktop/tests/WindowsDesktopNupkgTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ public void WindowsDesktopTargetingPackIsValid()
{
if (CurrentRidShouldCreateNupkg)
{
Assert.NotNull(tester);
// Allow no targeting pack for servicing builds. This is a minor test gap: https://github.com/dotnet/core-setup/issues/8830
if (tester == null)
{
return;
}

tester.IsTargetingPackForPlatform();
tester.HasOnlyTheseDataFiles(
Expand Down