Adding ProjectCapability generation - attempt #2

microsoft · Mar 22, 2021 · c2167df · c2167df
1 parent 6655e4c
commit c2167df
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 18 deletions.
diff --git a/build/FrameworkPackage/MakeFrameworkPackage.ps1 b/build/FrameworkPackage/MakeFrameworkPackage.ps1
@@ -288,21 +288,6 @@ $versionPropsFile =
 
 Set-Content -Value $versionPropsFile $fullOutputPath\MicrosoftUIXamlVersion.props
 
-
-$capabilitiesPropsFile = 
-@"
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ProjectCapability Id="VersionGeneral" Include="WinUI" />
-    <ProjectCapability Id="VersionSpecific" Include="WinUI.$version" />
-  </ItemGroup>
-</Project>
-"@
-
-Set-Content -Value $capabilitiesPropsFile $fullOutputPath\MicrosoftUIXamlCapabilities.props
-
-
 # Also copy in some loose files 
 
 $PackageName = $BasePackageName

diff --git a/build/NuSpecs/MUXControls-Nuget-Common.targets b/build/NuSpecs/MUXControls-Nuget-Common.targets
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildThisFileDirectory)\Microsoft.UI.Xaml\Microsoft.UI.Xaml.Capabilities.props"/>
   <!-- Check TargetPlatformMinVersion during build to block unsupported configurations. -->
   <Target Name="MicrosoftUIXamlCheckTargetPlatformVersion" BeforeTargets="PrepareForBuild" 
       Condition="'$(TargetPlatformVersion)' != '' and '$(TargetPlatformMinVersion)' != '' and '$(SkipMicrosoftUIXamlCheckTargetPlatformVersion)'==''">

diff --git a/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props b/build/NuSpecs/MUXControls-Nuget-FrameworkPackage.props
@@ -1,6 +1,5 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildThisFileDirectory)\MicrosoftUIXamlCapabilities.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\MicrosoftUIXamlVersion.props"/>
   <Import Project="$(MSBuildThisFileDirectory)\Common.targets"/>
   <ItemGroup>

diff --git a/build/NuSpecs/MUXControls.nuspec b/build/NuSpecs/MUXControls.nuspec
@@ -34,5 +34,8 @@
 
     <!-- This is here for C++ based projects, see http://nugetdocsbeta.azurewebsites.net/ndocs/guides/create-uwp-packages -->
     <file target="build\native\$ID$.targets" src="MUXControls-Nuget-Native.targets"/>
+
+    <file target="build" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Microsoft.UI.Xaml.Capabilities.props"/>
+    <file target="buildTransitive" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\Microsoft.UI.Xaml\Microsoft.UI.Xaml.Capabilities.props"/>
   </files>
 </package>
diff --git a/build/NuSpecs/MUXControlsFrameworkPackage.nuspec b/build/NuSpecs/MUXControlsFrameworkPackage.nuspec
@@ -30,9 +30,7 @@
 
     <file target="tools" src="VisualStudioToolsManifest.xml"/>
 
-    <file target="build" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\MicrosoftUIXamlCapabilities.props"/>
     <file target="build" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\MicrosoftUIXamlVersion.props"/>
-    <file target="buildTransitive" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\MicrosoftUIXamlCapabilities.props"/>
     <file target="buildTransitive" src="$BUILDOUTPUT$\$BUILDFLAVOR$\$BUILDARCH$\FrameworkPackage\MicrosoftUIXamlVersion.props"/>
     <file target="build\Common.targets" src="MUXControls-Nuget-Common.targets"/>
     <file target="buildTransitive\Common.targets" src="MUXControls-Nuget-Common.targets"/>

diff --git a/build/NuSpecs/build-nupkg.ps1 b/build/NuSpecs/build-nupkg.ps1
@@ -71,6 +71,22 @@ if (!(Test-Path $OutputDir)) { mkdir $OutputDir }
 
 $nupkgtitle = "Microsoft.UI.Xaml"
 
+
+$capabilitiesPropsFile = 
+@"
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ProjectCapability Id="VersionGeneral" Include="WinUI" />
+    <ProjectCapability Id="VersionSpecific" Include="WinUI.$version" />
+  </ItemGroup>
+</Project>
+"@
+
+Write-Host "Writing Capabilities Props File = $BuildOutput\$BuildFlavor\$BuildArch\Microsoft.UI.Xaml\Microsoft.UI.Xaml.Capabilities.props"
+Set-Content -Value $capabilitiesPropsFile $BuildOutput\$BuildFlavor\$BuildArch\Microsoft.UI.Xaml\Microsoft.UI.Xaml.Capabilities.props
+
+
 function New-TemporaryDirectory {
     $parent = [System.IO.Path]::GetTempPath()
     $name = [System.IO.Path]::GetRandomFileName()