From 523c5fa201eee3d9202103a04fbcbc037e86328c Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Fri, 25 Sep 2026 17:59:59 -0400
Subject: [PATCH 1/9] Import monobuild LKG versions from parent

Preserve standalone package defaults while allowing an explicitly staged mono-build version source to override internal dependency versions.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 Directory.Packages.props | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 53d89afeec..73ad6b9849 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -11,6 +11,10 @@
 
     Mono-build override: when $(WindowsAppSDKVersionPinned) is set, all internal WinAppSDK
     package versions are pinned to that value instead of their fallback defaults.
+
+    When this repository is checked out beneath a mono-build package configuration, the parent
+    package-version file is imported last for LKG overrides. Its CPM settings and item list are
+    suppressed so this repository retains its own package inventory and metadata.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
@@ -123,4 +127,14 @@
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <_WindowsAppSDKParentDirectoryPackagesProps Condition="'$(WindowsAppSDKUseParentPackageVersions)' == 'true'">$([MSBuild]::GetPathOfFileAbove('WindowsAppSDK.ParentPackageVersions.props', '$(MSBuildThisFileDirectory)..\'))</_WindowsAppSDKParentDirectoryPackagesProps>
+    <WindowsAppSDKImportLkgPropertiesOnly Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''">true</WindowsAppSDKImportLkgPropertiesOnly>
+  </PropertyGroup>
+  <Import Project="$(_WindowsAppSDKParentDirectoryPackagesProps)" Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''" />
+  <PropertyGroup Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''">
+    <MicrosoftWindowsAppSDKBasePackageVersion>$(MicrosoftWindowsAppSDKBasePackagePackageVersion)</MicrosoftWindowsAppSDKBasePackageVersion>
+    <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$(MicrosoftWindowsAppSDKInteractiveExperiencesPackagePackageVersion)</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
+  </PropertyGroup>
 </Project>
\ No newline at end of file

From 7c62269e2798403ec2929b8a652486cf607f44b2 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sat, 26 Sep 2026 12:42:16 -0400
Subject: [PATCH 2/9] Chain monobuild package versions from parent

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 Directory.Packages.props | 43 +++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 73ad6b9849..1c42946583 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -13,13 +13,13 @@
     package versions are pinned to that value instead of their fallback defaults.
 
     When this repository is checked out beneath a mono-build package configuration, the parent
-    package-version file is imported last for LKG overrides. Its CPM settings and item list are
-    suppressed so this repository retains its own package inventory and metadata.
+    Directory.Packages.props is imported last and supplies the package inventory and versions.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
+    <WindowsAppSDKParentDirectoryPackagesProps>$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)..\'))</WindowsAppSDKParentDirectoryPackagesProps>
   </PropertyGroup>
 
   <!-- ═══════════════════════════════════════════════════════════════════════
@@ -49,7 +49,7 @@
        and by eng/PackageReference/*.csproj PackageDownload items.
        ValueOrDefault resolves to $(WindowsAppSDKVersionPinned) when set (mono-build),
        otherwise falls back to the pinned version literal. -->
-  <PropertyGroup Label="WindowsAppSDK Package Version Properties">
+  <PropertyGroup Label="WindowsAppSDK Package Version Properties" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''">
     <MicrosoftWindowsAppSDKBasePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '2.0.6-dev.experimental1'))</MicrosoftWindowsAppSDKBasePackageVersion>
     <MicrosoftFrameworkUdkPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftFrameworkUdkPackageVersion>
     <MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>
@@ -79,7 +79,7 @@
        ═══════════════════════════════════════════════════════════════════════ -->
 
   <!-- WindowsAppSDK packages — IsInternal metadata is used by build/RestoreInternalPackages.proj -->
-  <ItemGroup Label="WindowsAppSDK Packages">
+  <ItemGroup Label="WindowsAppSDK Packages" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''">
     <PackageVersion Include="Microsoft.WindowsAppSDK.Base" Version="$(MicrosoftWindowsAppSDKBasePackageVersion)" IsInternal="true" />
     <PackageVersion Include="Microsoft.FrameworkUdk" Version="$(MicrosoftFrameworkUdkPackageVersion)" IsInternal="true" />
     <PackageVersion Include="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="$(MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion)" IsInternal="true" />
@@ -89,28 +89,28 @@
 
   <!-- Build tooling and SDK -->
   <ItemGroup Label="Build Tools and SDK">
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSDKBuildToolsVersion)" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="$(MicrosoftWindowsSDKBuildToolsMSIXVersion)" />
-    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(MicrosoftWindowsCppWinRTVersion)" />
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
-    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(MicrosoftWindowsImplementationLibraryVersion)" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSDKBuildToolsVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="$(MicrosoftWindowsSDKBuildToolsMSIXVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(MicrosoftWindowsCppWinRTVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(MicrosoftWindowsImplementationLibraryVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
   </ItemGroup>
 
   <!-- Source link -->
   <ItemGroup Label="Source Link">
-    <PackageVersion Include="Microsoft.Build.Tasks.Git" Version="$(MicrosoftBuildTasksGitVersion)" />
-    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Git" Version="$(MicrosoftBuildTasksGitVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
   </ItemGroup>
 
   <!-- Test frameworks -->
   <ItemGroup Label="Test Frameworks">
-    <PackageVersion Include="Microsoft.Taef" Version="$(MicrosoftTaefVersion)" />
+    <PackageVersion Include="Microsoft.Taef" Version="$(MicrosoftTaefVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
   </ItemGroup>
 
   <!-- Runtime dependencies -->
   <ItemGroup Label="Runtime Dependencies">
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="$(MicrosoftWebWebView2Version)" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="$(MicrosoftWebWebView2Version)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
     <PackageVersion Include="Microsoft.Telemetry.Inbox.Native" Version="$(MicrosoftTelemetryInboxNativeVersion)" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Protobuf" Version="$(MicrosoftWindowsAppSDKProtobufVersion)" />
   </ItemGroup>
@@ -128,13 +128,16 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <_WindowsAppSDKParentDirectoryPackagesProps Condition="'$(WindowsAppSDKUseParentPackageVersions)' == 'true'">$([MSBuild]::GetPathOfFileAbove('WindowsAppSDK.ParentPackageVersions.props', '$(MSBuildThisFileDirectory)..\'))</_WindowsAppSDKParentDirectoryPackagesProps>
-    <WindowsAppSDKImportLkgPropertiesOnly Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''">true</WindowsAppSDKImportLkgPropertiesOnly>
-  </PropertyGroup>
-  <Import Project="$(_WindowsAppSDKParentDirectoryPackagesProps)" Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''" />
-  <PropertyGroup Condition="'$(_WindowsAppSDKParentDirectoryPackagesProps)' != ''">
+  <Import Project="$(WindowsAppSDKParentDirectoryPackagesProps)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''" />
+  <PropertyGroup Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''">
     <MicrosoftWindowsAppSDKBasePackageVersion>$(MicrosoftWindowsAppSDKBasePackagePackageVersion)</MicrosoftWindowsAppSDKBasePackageVersion>
     <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$(MicrosoftWindowsAppSDKInteractiveExperiencesPackagePackageVersion)</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
   </PropertyGroup>
+  <ItemGroup Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''">
+    <PackageVersion Update="Microsoft.FrameworkUdk" IsInternal="true" />
+    <PackageVersion Update="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" IsInternal="true" />
+    <PackageVersion Update="Microsoft.WindowsAppSDK.AppLicensingInternal.TransportPackage" IsInternal="true" />
+    <PackageVersion Update="Microsoft.WindowsAppSDK.Base" IsInternal="true" />
+    <PackageVersion Update="Microsoft.WindowsAppSDK.InteractiveExperiences" IsInternal="true" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From d780d7a148b3760f9f8eea5c4b90680812e1ed94 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sat, 26 Sep 2026 13:01:45 -0400
Subject: [PATCH 3/9] Import monobuild package versions directly

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 Directory.Packages.props | 48 ++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1c42946583..0de85a18f0 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,14 +12,14 @@
     Mono-build override: when $(WindowsAppSDKVersionPinned) is set, all internal WinAppSDK
     package versions are pinned to that value instead of their fallback defaults.
 
-    When this repository is checked out beneath a mono-build package configuration, the parent
-    Directory.Packages.props is imported last and supplies the package inventory and versions.
+    When this repository is checked out beneath a mono-build package configuration,
+    WindowsAppSDK.PackageVersion.props is imported last and supplies internal package versions.
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <WindowsAppSDKParentDirectoryPackagesProps>$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)..\'))</WindowsAppSDKParentDirectoryPackagesProps>
+    <WindowsAppSDKPackageVersionProps>$([MSBuild]::GetPathOfFileAbove('WindowsAppSDK.PackageVersion.props', '$(MSBuildThisFileDirectory)..\'))</WindowsAppSDKPackageVersionProps>
   </PropertyGroup>
 
   <!-- ═══════════════════════════════════════════════════════════════════════
@@ -49,7 +49,7 @@
        and by eng/PackageReference/*.csproj PackageDownload items.
        ValueOrDefault resolves to $(WindowsAppSDKVersionPinned) when set (mono-build),
        otherwise falls back to the pinned version literal. -->
-  <PropertyGroup Label="WindowsAppSDK Package Version Properties" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''">
+  <PropertyGroup Label="WindowsAppSDK Package Version Properties" Condition="'$(WindowsAppSDKPackageVersionProps)' == ''">
     <MicrosoftWindowsAppSDKBasePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '2.0.6-dev.experimental1'))</MicrosoftWindowsAppSDKBasePackageVersion>
     <MicrosoftFrameworkUdkPackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftFrameworkUdkPackageVersion>
     <MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>$([MSBuild]::ValueOrDefault('$(WindowsAppSDKVersionPinned)', '3.0.0-experimental-27300.1896.260713-1015.0'))</MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion>
@@ -73,13 +73,19 @@
     <MicrosoftWindowsAppSDKProtobufVersion>3.21.12</MicrosoftWindowsAppSDKProtobufVersion>
   </PropertyGroup>
 
+  <Import Project="$(WindowsAppSDKPackageVersionProps)" Condition="'$(WindowsAppSDKPackageVersionProps)' != ''" />
+  <PropertyGroup Condition="'$(WindowsAppSDKPackageVersionProps)' != ''">
+    <MicrosoftWindowsAppSDKBasePackageVersion>$(MicrosoftWindowsAppSDKBasePackagePackageVersion)</MicrosoftWindowsAppSDKBasePackageVersion>
+    <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$(MicrosoftWindowsAppSDKInteractiveExperiencesPackagePackageVersion)</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
+  </PropertyGroup>
+
   <!-- ═══════════════════════════════════════════════════════════════════════
        CPM PackageVersion items: reference the properties above.
        Each version is defined exactly once (in the PropertyGroups).
        ═══════════════════════════════════════════════════════════════════════ -->
 
   <!-- WindowsAppSDK packages — IsInternal metadata is used by build/RestoreInternalPackages.proj -->
-  <ItemGroup Label="WindowsAppSDK Packages" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''">
+  <ItemGroup Label="WindowsAppSDK Packages">
     <PackageVersion Include="Microsoft.WindowsAppSDK.Base" Version="$(MicrosoftWindowsAppSDKBasePackageVersion)" IsInternal="true" />
     <PackageVersion Include="Microsoft.FrameworkUdk" Version="$(MicrosoftFrameworkUdkPackageVersion)" IsInternal="true" />
     <PackageVersion Include="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="$(MicrosoftProjectReunionInteractiveExperiencesTransportPackagePackageVersion)" IsInternal="true" />
@@ -89,28 +95,28 @@
 
   <!-- Build tooling and SDK -->
   <ItemGroup Label="Build Tools and SDK">
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSDKBuildToolsVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="$(MicrosoftWindowsSDKBuildToolsMSIXVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(MicrosoftWindowsCppWinRTVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(MicrosoftWindowsImplementationLibraryVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="$(MicrosoftWindowsSDKBuildToolsVersion)" />
+    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="$(MicrosoftWindowsSDKBuildToolsMSIXVersion)" />
+    <PackageVersion Include="Microsoft.Windows.CppWinRT" Version="$(MicrosoftWindowsCppWinRTVersion)" />
+    <PackageVersion Include="Microsoft.Windows.CsWinRT" Version="$(MicrosoftWindowsCsWinRTPackageVersion)" />
+    <PackageVersion Include="Microsoft.Windows.ImplementationLibrary" Version="$(MicrosoftWindowsImplementationLibraryVersion)" />
   </ItemGroup>
 
   <!-- Source link -->
   <ItemGroup Label="Source Link">
-    <PackageVersion Include="Microsoft.Build.Tasks.Git" Version="$(MicrosoftBuildTasksGitVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Git" Version="$(MicrosoftBuildTasksGitVersion)" />
+    <PackageVersion Include="Microsoft.SourceLink.Common" Version="$(MicrosoftSourceLinkCommonVersion)" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkGitHubVersion)" />
   </ItemGroup>
 
   <!-- Test frameworks -->
   <ItemGroup Label="Test Frameworks">
-    <PackageVersion Include="Microsoft.Taef" Version="$(MicrosoftTaefVersion)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Taef" Version="$(MicrosoftTaefVersion)" />
   </ItemGroup>
 
   <!-- Runtime dependencies -->
   <ItemGroup Label="Runtime Dependencies">
-    <PackageVersion Include="Microsoft.Web.WebView2" Version="$(MicrosoftWebWebView2Version)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' == ''" />
+    <PackageVersion Include="Microsoft.Web.WebView2" Version="$(MicrosoftWebWebView2Version)" />
     <PackageVersion Include="Microsoft.Telemetry.Inbox.Native" Version="$(MicrosoftTelemetryInboxNativeVersion)" />
     <PackageVersion Include="Microsoft.WindowsAppSDK.Protobuf" Version="$(MicrosoftWindowsAppSDKProtobufVersion)" />
   </ItemGroup>
@@ -128,16 +134,4 @@
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
 
-  <Import Project="$(WindowsAppSDKParentDirectoryPackagesProps)" Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''" />
-  <PropertyGroup Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''">
-    <MicrosoftWindowsAppSDKBasePackageVersion>$(MicrosoftWindowsAppSDKBasePackagePackageVersion)</MicrosoftWindowsAppSDKBasePackageVersion>
-    <MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>$(MicrosoftWindowsAppSDKInteractiveExperiencesPackagePackageVersion)</MicrosoftWindowsAppSDKInteractiveExperiencesPackageVersion>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(WindowsAppSDKParentDirectoryPackagesProps)' != ''">
-    <PackageVersion Update="Microsoft.FrameworkUdk" IsInternal="true" />
-    <PackageVersion Update="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" IsInternal="true" />
-    <PackageVersion Update="Microsoft.WindowsAppSDK.AppLicensingInternal.TransportPackage" IsInternal="true" />
-    <PackageVersion Update="Microsoft.WindowsAppSDK.Base" IsInternal="true" />
-    <PackageVersion Update="Microsoft.WindowsAppSDK.InteractiveExperiences" IsInternal="true" />
-  </ItemGroup>
 </Project>
\ No newline at end of file

From bf68280153d8f5e1c95c88943374e33ad13b836c Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sat, 26 Sep 2026 14:58:06 -0400
Subject: [PATCH 4/9] Discover shared versions from repository root

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0de85a18f0..6efdd6028d 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -19,7 +19,7 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
-    <WindowsAppSDKPackageVersionProps>$([MSBuild]::GetPathOfFileAbove('WindowsAppSDK.PackageVersion.props', '$(MSBuildThisFileDirectory)..\'))</WindowsAppSDKPackageVersionProps>
+    <WindowsAppSDKPackageVersionProps>$([MSBuild]::GetPathOfFileAbove('WindowsAppSDK.PackageVersion.props', '$(MSBuildThisFileDirectory)'))</WindowsAppSDKPackageVersionProps>
   </PropertyGroup>
 
   <!-- ═══════════════════════════════════════════════════════════════════════

From 61720fd403f49c3daf226dd8f21357f1ef06f84a Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sat, 26 Sep 2026 17:59:09 -0400
Subject: [PATCH 5/9] Evaluate imported package versions for packing

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 BuildAll.ps1 | 69 +++++++++++++++++++---------------------------------
 1 file changed, 25 insertions(+), 44 deletions(-)

diff --git a/BuildAll.ps1 b/BuildAll.ps1
index 97c5a19879..ad54550ac1 100644
--- a/BuildAll.ps1
+++ b/BuildAll.ps1
@@ -88,55 +88,36 @@ if ([string]::IsNullOrEmpty($ComponentPackageVersion))
     Write-Host "Updating ComponentPackageVersion from MicrosoftWindowsAppSDKVersionPackageVersion in Directory.Packages.props: $ComponentPackageVersion"
 }
 
-# Build a lookup of package versions from Directory.Packages.props for nuspec dependency updates.
-# The XML defines properties in PropertyGroups and references them in PackageVersion items.
-# Internal packages have IsInternal="true" metadata; when -WindowsAppSDKVersionPinned is set,
-# those use the pinned version (matching MSBuild behavior).
+# Build a lookup of evaluated package versions from Directory.Packages.props for nuspec
+# dependency updates. MSBuild evaluation is required because the package versions may come
+# from an imported WindowsAppSDK.PackageVersion.props supplied by the mono-build.
 $dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
-[xml]$dppXmlForVersions = [xml](Get-Content -Path $dppPath -Raw)
-
-# First, build a property lookup from all PropertyGroups.
-# Properties may contain ValueOrDefault expressions — extract the fallback value,
-# or use the pinned version when WindowsAppSDKVersionPinned is set.
-$msbuildProps = @{}
-$vodPattern = [regex]"ValueOrDefault\([^,]+,\s*'([^']+)'\)"
-foreach ($pg in $dppXmlForVersions.Project.PropertyGroup) {
-    foreach ($prop in $pg.ChildNodes) {
-        if ($prop.NodeType -eq 'Element' -and -not [string]::IsNullOrEmpty($prop.InnerText)) {
-            $value = $prop.InnerText
-            $vodMatch = $vodPattern.Match($value)
-            if ($vodMatch.Success) {
-                if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
-                    $value = $WindowsAppSDKVersionPinned
-                } else {
-                    $value = $vodMatch.Groups[1].Value
-                }
-            }
-            $msbuildProps[$prop.Name] = $value
-        }
-    }
+$msbuildArguments = @(
+    'msbuild',
+    $dppPath,
+    '-nologo',
+    '-verbosity:quiet',
+    '-getItem:PackageVersion'
+)
+if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+    $msbuildArguments += "-p:WindowsAppSDKVersionPinned=$WindowsAppSDKVersionPinned"
 }
 
-# Then resolve PackageVersion items
-$internalPackageVersions = @{}
-foreach ($ig in $dppXmlForVersions.Project.ItemGroup) {
-    foreach ($pv in $ig.SelectNodes("*[local-name()='PackageVersion']")) {
-        $pkgName = $pv.GetAttribute("Include")
-        $versionExpr = $pv.GetAttribute("Version")
-
-        # Resolve $(PropertyName) references
-        $resolved = $versionExpr
-        if ($versionExpr -match '\$\(') {
-            foreach ($propMatch in [regex]::Matches($versionExpr, '\$\(([^)]+)\)')) {
-                $propName = $propMatch.Groups[1].Value
-                if ($msbuildProps.ContainsKey($propName)) {
-                    $resolved = $msbuildProps[$propName]
-                }
-            }
-        }
+$evaluationOutput = & dotnet @msbuildArguments
+if ($LASTEXITCODE -ne 0) {
+    throw "Failed to evaluate package versions from '$dppPath'."
+}
 
-        $internalPackageVersions[$pkgName] = $resolved
+$evaluation = ($evaluationOutput | Out-String | ConvertFrom-Json)
+$internalPackageVersions = @{}
+foreach ($packageVersion in @($evaluation.Items.PackageVersion)) {
+    if ($internalPackageVersions.ContainsKey($packageVersion.Identity)) {
+        throw "Duplicate evaluated PackageVersion item '$($packageVersion.Identity)' in '$dppPath'."
+    }
+    if ([string]::IsNullOrWhiteSpace($packageVersion.Version)) {
+        throw "Evaluated PackageVersion '$($packageVersion.Identity)' has no Version."
     }
+    $internalPackageVersions[$packageVersion.Identity] = $packageVersion.Version
 }
 if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
     Write-Host "Pinned internal WindowsAppSDK packages to version '$WindowsAppSDKVersionPinned' for nuspec dependency rewriting."

From fc10e831bbdfe6964ba654b05ce07863271e4572 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sun, 27 Sep 2026 03:46:55 -0400
Subject: [PATCH 6/9] Use Visual Studio MSBuild for package evaluation

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 BuildAll.ps1 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/BuildAll.ps1 b/BuildAll.ps1
index ad54550ac1..566acce7c2 100644
--- a/BuildAll.ps1
+++ b/BuildAll.ps1
@@ -91,9 +91,14 @@ if ([string]::IsNullOrEmpty($ComponentPackageVersion))
 # Build a lookup of evaluated package versions from Directory.Packages.props for nuspec
 # dependency updates. MSBuild evaluation is required because the package versions may come
 # from an imported WindowsAppSDK.PackageVersion.props supplied by the mono-build.
+$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath
+write-host "VCToolsInstallDir: $VCToolsInstallDir"
+
+$msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe"
+write-host "msBuildPath: $msBuildPath"
+
 $dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
 $msbuildArguments = @(
-    'msbuild',
     $dppPath,
     '-nologo',
     '-verbosity:quiet',
@@ -103,9 +108,9 @@ if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
     $msbuildArguments += "-p:WindowsAppSDKVersionPinned=$WindowsAppSDKVersionPinned"
 }
 
-$evaluationOutput = & dotnet @msbuildArguments
+$evaluationOutput = & $msBuildPath @msbuildArguments
 if ($LASTEXITCODE -ne 0) {
-    throw "Failed to evaluate package versions from '$dppPath'."
+    throw "Failed to evaluate package versions from '$dppPath':`n$($evaluationOutput | Out-String)"
 }
 
 $evaluation = ($evaluationOutput | Out-String | ConvertFrom-Json)
@@ -126,12 +131,6 @@ if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
 $configurationForMrtAndAnyCPU = "Release"
 $MRTSourcesDirectory = "dev\MRTCore"
 
-$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath
-write-host "VCToolsInstallDir: $VCToolsInstallDir"
-
-$msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe"
-write-host "msBuildPath: $msBuildPath"
-
 # Generate overrides
 # Make sure override directory exists.
 if(-not (test-path "$buildOverridePath"))

From ade2a6d1aac160a2dbf0198c0539d6ab145dd575 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sun, 27 Sep 2026 05:29:49 -0400
Subject: [PATCH 7/9] Resolve shared package props without MSBuild output
 parsing

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 BuildAll.ps1 | 114 +++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 87 insertions(+), 27 deletions(-)

diff --git a/BuildAll.ps1 b/BuildAll.ps1
index 566acce7c2..c88f95a635 100644
--- a/BuildAll.ps1
+++ b/BuildAll.ps1
@@ -88,41 +88,95 @@ if ([string]::IsNullOrEmpty($ComponentPackageVersion))
     Write-Host "Updating ComponentPackageVersion from MicrosoftWindowsAppSDKVersionPackageVersion in Directory.Packages.props: $ComponentPackageVersion"
 }
 
-# Build a lookup of evaluated package versions from Directory.Packages.props for nuspec
-# dependency updates. MSBuild evaluation is required because the package versions may come
-# from an imported WindowsAppSDK.PackageVersion.props supplied by the mono-build.
-$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath
-write-host "VCToolsInstallDir: $VCToolsInstallDir"
+# Build a lookup of package versions for nuspec dependency updates. Process both the local
+# CPM file and the optional shared props file because raw XML does not evaluate MSBuild imports.
+$dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
+[xml]$dppXmlForVersions = Get-Content -Path $dppPath -Raw
+$msbuildProps = @{}
+$vodPattern = [regex]"ValueOrDefault\([^,]+,\s*'([^']+)'\)"
+
+function Add-VersionProperties([xml]$PropsXml, [bool]$HasSharedProps, [bool]$ApplyImportConditions) {
+    foreach ($propertyGroup in $PropsXml.Project.PropertyGroup) {
+        if ($ApplyImportConditions) {
+            $condition = $propertyGroup.GetAttribute('Condition')
+            if (($condition -match 'WindowsAppSDKPackageVersionProps.*!=' -and -not $HasSharedProps) -or
+                ($condition -match 'WindowsAppSDKPackageVersionProps.*==' -and $HasSharedProps)) {
+                continue
+            }
+        }
 
-$msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe"
-write-host "msBuildPath: $msBuildPath"
+        foreach ($property in $propertyGroup.ChildNodes) {
+            if ($property.NodeType -ne 'Element' -or [string]::IsNullOrWhiteSpace($property.InnerText)) {
+                continue
+            }
 
-$dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
-$msbuildArguments = @(
-    $dppPath,
-    '-nologo',
-    '-verbosity:quiet',
-    '-getItem:PackageVersion'
-)
-if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
-    $msbuildArguments += "-p:WindowsAppSDKVersionPinned=$WindowsAppSDKVersionPinned"
+            $value = $property.InnerText
+            $vodMatch = $vodPattern.Match($value)
+            if ($vodMatch.Success) {
+                $value = if ([string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+                    $vodMatch.Groups[1].Value
+                } else {
+                    $WindowsAppSDKVersionPinned
+                }
+            }
+            $msbuildProps[$property.Name] = $value
+        }
+    }
+}
+
+function Resolve-VersionExpression([string]$Value) {
+    $resolved = $Value
+    foreach ($propertyMatch in [regex]::Matches($Value, '\$\(([^)]+)\)')) {
+        $propertyName = $propertyMatch.Groups[1].Value
+        if (-not $msbuildProps.ContainsKey($propertyName)) {
+            throw "Package version property '$propertyName' was not found."
+        }
+        $resolved = $resolved.Replace($propertyMatch.Value, $msbuildProps[$propertyName])
+    }
+    return $resolved
 }
 
-$evaluationOutput = & $msBuildPath @msbuildArguments
-if ($LASTEXITCODE -ne 0) {
-    throw "Failed to evaluate package versions from '$dppPath':`n$($evaluationOutput | Out-String)"
+$sharedPropsPath = $null
+$searchDirectory = Split-Path $dppPath -Parent
+while (-not [string]::IsNullOrWhiteSpace($searchDirectory)) {
+    $candidate = Join-Path $searchDirectory 'WindowsAppSDK.PackageVersion.props'
+    if (Test-Path -LiteralPath $candidate -PathType Leaf) {
+        $sharedPropsPath = $candidate
+        break
+    }
+    $parentDirectory = Split-Path $searchDirectory -Parent
+    if ($parentDirectory -eq $searchDirectory) {
+        break
+    }
+    $searchDirectory = $parentDirectory
+}
+
+Add-VersionProperties $dppXmlForVersions ($null -ne $sharedPropsPath) $true
+if ($sharedPropsPath) {
+    [xml]$sharedPropsXml = Get-Content -LiteralPath $sharedPropsPath -Raw
+    Add-VersionProperties $sharedPropsXml $true $false
+    Add-VersionProperties $dppXmlForVersions $true $true
 }
 
-$evaluation = ($evaluationOutput | Out-String | ConvertFrom-Json)
 $internalPackageVersions = @{}
-foreach ($packageVersion in @($evaluation.Items.PackageVersion)) {
-    if ($internalPackageVersions.ContainsKey($packageVersion.Identity)) {
-        throw "Duplicate evaluated PackageVersion item '$($packageVersion.Identity)' in '$dppPath'."
-    }
-    if ([string]::IsNullOrWhiteSpace($packageVersion.Version)) {
-        throw "Evaluated PackageVersion '$($packageVersion.Identity)' has no Version."
+foreach ($itemGroup in $dppXmlForVersions.Project.ItemGroup) {
+    foreach ($packageVersion in $itemGroup.SelectNodes("*[local-name()='PackageVersion']")) {
+        $packageId = $packageVersion.GetAttribute('Include')
+        if ($internalPackageVersions.ContainsKey($packageId)) {
+            throw "Duplicate PackageVersion item '$packageId' in '$dppPath'."
+        }
+
+        $isInternal = $packageVersion.GetAttribute('IsInternal') -eq 'true'
+        $resolvedVersion = if ($isInternal -and -not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+            $WindowsAppSDKVersionPinned
+        } else {
+            Resolve-VersionExpression $packageVersion.GetAttribute('Version')
+        }
+        if ([string]::IsNullOrWhiteSpace($resolvedVersion) -or $resolvedVersion -match '\$\(') {
+            throw "PackageVersion '$packageId' did not resolve to a version: '$resolvedVersion'."
+        }
+        $internalPackageVersions[$packageId] = $resolvedVersion
     }
-    $internalPackageVersions[$packageVersion.Identity] = $packageVersion.Version
 }
 if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
     Write-Host "Pinned internal WindowsAppSDK packages to version '$WindowsAppSDKVersionPinned' for nuspec dependency rewriting."
@@ -131,6 +185,12 @@ if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
 $configurationForMrtAndAnyCPU = "Release"
 $MRTSourcesDirectory = "dev\MRTCore"
 
+$VCToolsInstallDir = . "${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -Latest -prerelease -requires Microsoft.Component.MSBuild -property InstallationPath
+write-host "VCToolsInstallDir: $VCToolsInstallDir"
+
+$msBuildPath = "$VCToolsInstallDir\MSBuild\Current\Bin\msbuild.exe"
+write-host "msBuildPath: $msBuildPath"
+
 # Generate overrides
 # Make sure override directory exists.
 if(-not (test-path "$buildOverridePath"))

From deca6c044f05f9cbdec758a02ee8b2a8fa6fd976 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sun, 27 Sep 2026 07:11:36 -0400
Subject: [PATCH 8/9] Avoid PackageVersion parameter collision

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 BuildAll.ps1 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/BuildAll.ps1 b/BuildAll.ps1
index c88f95a635..8bd00baada 100644
--- a/BuildAll.ps1
+++ b/BuildAll.ps1
@@ -160,17 +160,17 @@ if ($sharedPropsPath) {
 
 $internalPackageVersions = @{}
 foreach ($itemGroup in $dppXmlForVersions.Project.ItemGroup) {
-    foreach ($packageVersion in $itemGroup.SelectNodes("*[local-name()='PackageVersion']")) {
-        $packageId = $packageVersion.GetAttribute('Include')
+    foreach ($packageVersionItem in $itemGroup.SelectNodes("*[local-name()='PackageVersion']")) {
+        $packageId = $packageVersionItem.GetAttribute('Include')
         if ($internalPackageVersions.ContainsKey($packageId)) {
             throw "Duplicate PackageVersion item '$packageId' in '$dppPath'."
         }
 
-        $isInternal = $packageVersion.GetAttribute('IsInternal') -eq 'true'
+        $isInternal = $packageVersionItem.GetAttribute('IsInternal') -eq 'true'
         $resolvedVersion = if ($isInternal -and -not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
             $WindowsAppSDKVersionPinned
         } else {
-            Resolve-VersionExpression $packageVersion.GetAttribute('Version')
+            Resolve-VersionExpression $packageVersionItem.GetAttribute('Version')
         }
         if ([string]::IsNullOrWhiteSpace($resolvedVersion) -or $resolvedVersion -match '\$\(') {
             throw "PackageVersion '$packageId' did not resolve to a version: '$resolvedVersion'."

From 1ac15065aa00ae2bef63f530be3f8bf190f443e0 Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Sun, 27 Sep 2026 08:56:59 -0400
Subject: [PATCH 9/9] Evaluate package versions only while packing

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 4f305b34-2314-4973-801a-ecaa76c9aa58
---
 BuildAll.ps1 | 151 ++++++++++++++++++++++++++-------------------------
 1 file changed, 77 insertions(+), 74 deletions(-)

diff --git a/BuildAll.ps1 b/BuildAll.ps1
index 8bd00baada..e15d0f9f91 100644
--- a/BuildAll.ps1
+++ b/BuildAll.ps1
@@ -88,99 +88,102 @@ if ([string]::IsNullOrEmpty($ComponentPackageVersion))
     Write-Host "Updating ComponentPackageVersion from MicrosoftWindowsAppSDKVersionPackageVersion in Directory.Packages.props: $ComponentPackageVersion"
 }
 
-# Build a lookup of package versions for nuspec dependency updates. Process both the local
-# CPM file and the optional shared props file because raw XML does not evaluate MSBuild imports.
-$dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
-[xml]$dppXmlForVersions = Get-Content -Path $dppPath -Raw
-$msbuildProps = @{}
-$vodPattern = [regex]"ValueOrDefault\([^,]+,\s*'([^']+)'\)"
-
-function Add-VersionProperties([xml]$PropsXml, [bool]$HasSharedProps, [bool]$ApplyImportConditions) {
-    foreach ($propertyGroup in $PropsXml.Project.PropertyGroup) {
-        if ($ApplyImportConditions) {
-            $condition = $propertyGroup.GetAttribute('Condition')
-            if (($condition -match 'WindowsAppSDKPackageVersionProps.*!=' -and -not $HasSharedProps) -or
-                ($condition -match 'WindowsAppSDKPackageVersionProps.*==' -and $HasSharedProps)) {
-                continue
+$internalPackageVersions = @{}
+if (($AzureBuildStep -eq 'all') -or ($AzureBuildStep -eq 'PackNuget')) {
+    # Build a lookup of package versions for nuspec dependency updates. Process both the local
+    # CPM file and the optional shared props file because raw XML does not evaluate MSBuild imports.
+    $dppPath = Join-Path $env:Build_SourcesDirectory 'Directory.Packages.props'
+    [xml]$dppXmlForVersions = Get-Content -Path $dppPath -Raw
+    $msbuildProps = @{}
+    $vodPattern = [regex]"ValueOrDefault\([^,]+,\s*'([^']+)'\)"
+
+    function Add-VersionProperties([xml]$PropsXml, [bool]$HasSharedProps, [bool]$ApplyImportConditions) {
+        foreach ($propertyGroup in $PropsXml.Project.PropertyGroup) {
+            if ($ApplyImportConditions) {
+                $condition = $propertyGroup.GetAttribute('Condition')
+                if (($condition -match 'WindowsAppSDKPackageVersionProps.*!=' -and -not $HasSharedProps) -or
+                    ($condition -match 'WindowsAppSDKPackageVersionProps.*==' -and $HasSharedProps)) {
+                    continue
+                }
             }
-        }
 
-        foreach ($property in $propertyGroup.ChildNodes) {
-            if ($property.NodeType -ne 'Element' -or [string]::IsNullOrWhiteSpace($property.InnerText)) {
-                continue
-            }
+            foreach ($property in $propertyGroup.ChildNodes) {
+                if ($property.NodeType -ne 'Element' -or [string]::IsNullOrWhiteSpace($property.InnerText)) {
+                    continue
+                }
 
-            $value = $property.InnerText
-            $vodMatch = $vodPattern.Match($value)
-            if ($vodMatch.Success) {
-                $value = if ([string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
-                    $vodMatch.Groups[1].Value
-                } else {
-                    $WindowsAppSDKVersionPinned
+                $value = $property.InnerText
+                $vodMatch = $vodPattern.Match($value)
+                if ($vodMatch.Success) {
+                    $value = if ([string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+                        $vodMatch.Groups[1].Value
+                    } else {
+                        $WindowsAppSDKVersionPinned
+                    }
                 }
+                $msbuildProps[$property.Name] = $value
             }
-            $msbuildProps[$property.Name] = $value
         }
     }
-}
 
-function Resolve-VersionExpression([string]$Value) {
-    $resolved = $Value
-    foreach ($propertyMatch in [regex]::Matches($Value, '\$\(([^)]+)\)')) {
-        $propertyName = $propertyMatch.Groups[1].Value
-        if (-not $msbuildProps.ContainsKey($propertyName)) {
-            throw "Package version property '$propertyName' was not found."
+    function Resolve-VersionExpression([string]$Value) {
+        $resolved = $Value
+        foreach ($propertyMatch in [regex]::Matches($Value, '\$\(([^)]+)\)')) {
+            $propertyName = $propertyMatch.Groups[1].Value
+            if (-not $msbuildProps.ContainsKey($propertyName)) {
+                throw "Package version property '$propertyName' was not found."
+            }
+            $resolved = $resolved.Replace($propertyMatch.Value, $msbuildProps[$propertyName])
         }
-        $resolved = $resolved.Replace($propertyMatch.Value, $msbuildProps[$propertyName])
+        return $resolved
     }
-    return $resolved
-}
 
-$sharedPropsPath = $null
-$searchDirectory = Split-Path $dppPath -Parent
-while (-not [string]::IsNullOrWhiteSpace($searchDirectory)) {
-    $candidate = Join-Path $searchDirectory 'WindowsAppSDK.PackageVersion.props'
-    if (Test-Path -LiteralPath $candidate -PathType Leaf) {
-        $sharedPropsPath = $candidate
-        break
+    $sharedPropsPath = $null
+    $searchDirectory = Split-Path $dppPath -Parent
+    while (-not [string]::IsNullOrWhiteSpace($searchDirectory)) {
+        $candidate = Join-Path $searchDirectory 'WindowsAppSDK.PackageVersion.props'
+        if (Test-Path -LiteralPath $candidate -PathType Leaf) {
+            $sharedPropsPath = $candidate
+            break
+        }
+        $parentDirectory = Split-Path $searchDirectory -Parent
+        if ($parentDirectory -eq $searchDirectory) {
+            break
+        }
+        $searchDirectory = $parentDirectory
     }
-    $parentDirectory = Split-Path $searchDirectory -Parent
-    if ($parentDirectory -eq $searchDirectory) {
-        break
+
+    Add-VersionProperties $dppXmlForVersions ($null -ne $sharedPropsPath) $true
+    if ($sharedPropsPath) {
+        [xml]$sharedPropsXml = Get-Content -LiteralPath $sharedPropsPath -Raw
+        Add-VersionProperties $sharedPropsXml $true $false
+        Add-VersionProperties $dppXmlForVersions $true $true
     }
-    $searchDirectory = $parentDirectory
-}
 
-Add-VersionProperties $dppXmlForVersions ($null -ne $sharedPropsPath) $true
-if ($sharedPropsPath) {
-    [xml]$sharedPropsXml = Get-Content -LiteralPath $sharedPropsPath -Raw
-    Add-VersionProperties $sharedPropsXml $true $false
-    Add-VersionProperties $dppXmlForVersions $true $true
-}
+    foreach ($itemGroup in $dppXmlForVersions.Project.ItemGroup) {
+        foreach ($packageVersionItem in $itemGroup.SelectNodes("*[local-name()='PackageVersion']")) {
+            $packageId = $packageVersionItem.GetAttribute('Include')
+            if ($internalPackageVersions.ContainsKey($packageId)) {
+                throw "Duplicate PackageVersion item '$packageId' in '$dppPath'."
+            }
 
-$internalPackageVersions = @{}
-foreach ($itemGroup in $dppXmlForVersions.Project.ItemGroup) {
-    foreach ($packageVersionItem in $itemGroup.SelectNodes("*[local-name()='PackageVersion']")) {
-        $packageId = $packageVersionItem.GetAttribute('Include')
-        if ($internalPackageVersions.ContainsKey($packageId)) {
-            throw "Duplicate PackageVersion item '$packageId' in '$dppPath'."
+            $isInternal = $packageVersionItem.GetAttribute('IsInternal') -eq 'true'
+            $resolvedVersion = if ($isInternal -and -not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+                $WindowsAppSDKVersionPinned
+            } else {
+                Resolve-VersionExpression $packageVersionItem.GetAttribute('Version')
+            }
+            if ([string]::IsNullOrWhiteSpace($resolvedVersion) -or $resolvedVersion -match '\$\(') {
+                throw "PackageVersion '$packageId' did not resolve to a version: '$resolvedVersion'."
+            }
+            $internalPackageVersions[$packageId] = $resolvedVersion
         }
+    }
 
-        $isInternal = $packageVersionItem.GetAttribute('IsInternal') -eq 'true'
-        $resolvedVersion = if ($isInternal -and -not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
-            $WindowsAppSDKVersionPinned
-        } else {
-            Resolve-VersionExpression $packageVersionItem.GetAttribute('Version')
-        }
-        if ([string]::IsNullOrWhiteSpace($resolvedVersion) -or $resolvedVersion -match '\$\(') {
-            throw "PackageVersion '$packageId' did not resolve to a version: '$resolvedVersion'."
-        }
-        $internalPackageVersions[$packageId] = $resolvedVersion
+    if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
+        Write-Host "Pinned internal WindowsAppSDK packages to version '$WindowsAppSDKVersionPinned' for nuspec dependency rewriting."
     }
 }
-if (-not [string]::IsNullOrEmpty($WindowsAppSDKVersionPinned)) {
-    Write-Host "Pinned internal WindowsAppSDK packages to version '$WindowsAppSDKVersionPinned' for nuspec dependency rewriting."
-}
 
 $configurationForMrtAndAnyCPU = "Release"
 $MRTSourcesDirectory = "dev\MRTCore"