Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit cea2df0

Browse files
committed
Exclude UAP from packages in rel/2.0.0
**release/2.0.0 only** do not merge to master.
1 parent 70bd3cf commit cea2df0

File tree

3 files changed

+17
-0
lines changed

3 files changed

+17
-0
lines changed

Packaging.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,6 @@
6363
<SkipPackageFileCheck>true</SkipPackageFileCheck>
6464
</File>
6565
</ItemGroup>
66+
67+
<Import Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Project="$(MSBuildThisFileDirectory)pkg/disableUap10.1.targets" />
6668
</Project>

pkg/Microsoft.Private.CoreFx.UAP/Microsoft.Private.CoreFx.UAP.pkgproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515

1616
<!-- Private packages need symbols -->
1717
<IncludeSymbolsInPackage Condition="'$(IncludeSymbolsInPackage)' == ''">true</IncludeSymbolsInPackage>
18+
19+
<!-- UAP10.1 is stripped out of other packages, but we don't want to do that for the framework package -->
20+
<KeepUAPContent>true</KeepUAPContent>
1821
</PropertyGroup>
1922

2023
<ItemGroup>

pkg/disableUap10.1.targets

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Target Name="RemoveUap101Content"
3+
Condition="'$(KeepUAPContent)' != 'true'"
4+
DependsOnTargets="GetPackageReport"
5+
BeforeTargets="GenerateNuSpec">
6+
<ItemGroup>
7+
<PackageFile Remove="@(PackageFile)" Condition="'%(PackageFile.TargetFramework)' == 'uap10.1'" />
8+
<PackageFile Remove="@(PackageFile)" Condition="$([System.String]::new('%(PackageFile.TargetPath)').Contains('/uap10.1'))" />
9+
<Dependency Remove="@(Dependency)" Condition="'%(Dependency.TargetFramework)' == 'uap10.1'" />
10+
</ItemGroup>
11+
</Target>
12+
</Project>

0 commit comments

Comments
 (0)