From d236909b9b12edc856af2b2eca9b12a925a639e1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 11:06:03 +0100
Subject: [PATCH 1/9] Keep apphostpack version in sync with targeting and
 runtime pack version

Unblocks https://github.com/dotnet/sdk/pull/43015

WPF uses a "live" version of the .NETCoreApp targeting and runtime pack. Also use the live version for the apphost pack so that vcxprojs don't depend on the version inside the SDK.
---
 eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index 95cb707750b..77c6463c6dc 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -21,6 +21,10 @@
       <TargetingPackVersion>$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
     </FrameworkReference>
 
+    <KnownAppHostPack Update="Microsoft.NETCore.App"
+                      AppHostPackVersion="$(RuntimeFrameworkVersion)"
+                      Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
+
     <!--
       Workaround - this should be removed when our tests are converted from Microsoft.NET.Sdk.WindowsDesktop => Microsoft.NET.Sdk
       project

From 85a6ae27649db585299b88fa6eca174d837f933f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 17:42:42 +0100
Subject: [PATCH 2/9] Update RuntimeFrameworkReference.targets

---
 .../tools/RuntimeFrameworkReference.targets   | 89 +++++++++++++++----
 1 file changed, 71 insertions(+), 18 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index 77c6463c6dc..9e0c3d2bf01 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -12,19 +12,6 @@
                                 Version="$(MicrosoftNETCorePlatformsVersion)"
                                 Condition="'$(ManagedCxx)'=='true'"/>
 
-    <FrameworkReference Update="Microsoft.NETCore.App"
-                      Condition="'$(MicrosoftNETCoreAppRefVersion)'!=''
-                             And '$(NoTargets)'!='true'
-                             And '$(TargetFrameworkIdentifier)' == '.NETCoreApp'
-                             And $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0'))
-                             And '$(MSBuildProjectExtension)'!='.vcxproj'">
-      <TargetingPackVersion>$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
-    </FrameworkReference>
-
-    <KnownAppHostPack Update="Microsoft.NETCore.App"
-                      AppHostPackVersion="$(RuntimeFrameworkVersion)"
-                      Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
-
     <!--
       Workaround - this should be removed when our tests are converted from Microsoft.NET.Sdk.WindowsDesktop => Microsoft.NET.Sdk
       project
@@ -33,10 +20,76 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <RuntimeFrameworkVersion Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)'!='' And
-                                        '$(NoTargets)'!='true' And
-                                        '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                                        $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '3.0')) And
-                                        '$(MSBuildProjectExtension)'!='.vcxproj'">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimeFrameworkVersion>
+    <UseOOBNETCoreAppTargetingPack>true</UseOOBNETCoreAppTargetingPack>
+    <UseOOBNETCoreAppRuntimePack>true</UseOOBNETCoreAppRuntimePack>
+    <UseOOBNETCoreAppAppHostPack>true</UseOOBNETCoreAppAppHostPack>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- vcxproj don't support restore -->
+    <EnableTargetingPackDownload Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableTargetingPackDownload>
+    <EnableRuntimePackDownload Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableRuntimePackDownload>
+    <GenerateErrorForMissingTargetingPacks Condition="'$(EnableTargetingPackDownload)' == 'false'">false</GenerateErrorForMissingTargetingPacks>
+
+    <EnableAppHostPackDownload Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableAppHostPackDownload>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <KnownFrameworkReference Update="Microsoft.NETCore.App">
+      <TargetingPackVersion Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true'">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
+      <DefaultRuntimeFrameworkVersion Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true'">$(MicrosoftNETCoreAppRuntimewinx64Version)</DefaultRuntimeFrameworkVersion>
+      <LatestRuntimeFrameworkVersion Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true'">$(MicrosoftNETCoreAppRuntimewinx64Version)</LatestRuntimeFrameworkVersion>
+    </KnownFrameworkReference>
+
+    <KnownRuntimePack Update="Microsoft.NETCore.App"
+                      LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                      Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true'" />
+
+    <KnownAppHostPack Update="Microsoft.NETCore.App"
+                      AppHostPackVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                      Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true'" />
+  </ItemGroup>
+
+  <!-- Update paths for resolved packs which is necessary when the packs couldn't be resolved.
+       This happens when package download is disabled and the package isn't available in the SDK's packs folder. -->
+  <Target Name="UpdateOOBPacks"
+          AfterTargets="ResolveFrameworkReferences">
+    <ItemGroup>
+      <Error Text="'MicrosoftNETCoreAppRefVersion' is not set. Please set it to the version of the targeting pack you want to use." Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MicrosoftNETCoreAppRefVersion)' == ''" />
+      <Error Text="'MicrosoftNETCoreAppRuntimewinx64Version' is not set. Please set it to the version of the runtime pack you want to use." Condition="('$(UseOOBNETCoreAppRuntimePack)' == 'true' or '$(UseOOBNETCoreAppAppHostPack)' == 'true') and '$(MicrosoftNETCoreAppRuntimewinx64Version)' == ''" />
+
+      <ResolvedTargetingPack Path="$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)"
+                             NuGetPackageVersion="$(MicrosoftNETCoreAppRefVersion)"
+                             PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)"
+                             Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false' and '%(ResolvedTargetingPack.RuntimeFrameworkName)' == 'Microsoft.NETCore.App'" />
+
+      <ResolvedRuntimePack PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.runtime.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                           NuGetPackageVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                           Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false' and '%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App'" />
+
+      <ResolvedFrameworkReference Condition="'%(Identity)' == 'Microsoft.NETCore.App'">
+        <TargetingPackPath Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)</TargetingPackPath>
+        <TargetingPackVersion Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
+        <RuntimePackPath Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(NuGetPackageRoot)microsoft.netcore.app.runtime.win-x86\$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimePackPath>
+        <RuntimePackVersion Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimePackVersion>
+      </ResolvedFrameworkReference>
+
+      <ResolvedAppHostPack Path="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)\%(ResolvedAppHostPack.PathInPackage)"
+                           PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                           Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(EnableAppHostPackDownload)' == 'false'" />
+
+      <ResolvedIjwHostPack Path="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)\%(ResolvedIjwHostPack.PathInPackage)"
+                           PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.host.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
+                           Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(EnableAppHostPackDownload)' == 'false'" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'@(ResolvedAppHostPack)' != '' And '$(AppHostSourcePath)' == ''">
+      <AppHostSourcePath>@(ResolvedAppHostPack->'%(Path)')</AppHostSourcePath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'@(ResolvedIjwHostPack)' != '' And '$(IjwHostSourcePath)' == ''">
+      <IjwHostSourcePath>@(ResolvedIjwHostPack->'%(Path)')</IjwHostSourcePath>
+    </PropertyGroup>
+  </Target>
+
 </Project>

From 66f5e2485e4cf39d19f0b3d67152e02ea60b0fb4 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 17:43:20 +0100
Subject: [PATCH 3/9] Create Tools.props

---
 eng/Tools.props | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 eng/Tools.props

diff --git a/eng/Tools.props b/eng/Tools.props
new file mode 100644
index 00000000000..86511d101b9
--- /dev/null
+++ b/eng/Tools.props
@@ -0,0 +1,15 @@
+<Project>
+
+  <PropertyGroup>
+    <RuntimeIdentifier Condition="'$(PlatformTarget)' == ''">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(PlatformTarget)' != ''">win-$(PlatformTarget)</RuntimeIdentifier>
+  </PropertyGroup>
+
+  <!-- Pre-download vcxproj dependencies as vcxprojs in this repo don't support NuGet package download. -->
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
+    <PackageDownload Include="Microsoft.NETCore.App.Host.$(RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
+  </ItemGroup>
+
+</Project>

From 6c8871e54f3e999c2dfad92e2b061c7810534578 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 17:55:24 +0100
Subject: [PATCH 4/9] Update RuntimeFrameworkReference.targets

---
 eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index 9e0c3d2bf01..ce6fed3b1b5 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -53,6 +53,7 @@
   <!-- Update paths for resolved packs which is necessary when the packs couldn't be resolved.
        This happens when package download is disabled and the package isn't available in the SDK's packs folder. -->
   <Target Name="UpdateOOBPacks"
+          Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"
           AfterTargets="ResolveFrameworkReferences">
     <ItemGroup>
       <Error Text="'MicrosoftNETCoreAppRefVersion' is not set. Please set it to the version of the targeting pack you want to use." Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MicrosoftNETCoreAppRefVersion)' == ''" />
@@ -66,11 +67,17 @@
       <ResolvedRuntimePack PackageDirectory="$(NuGetPackageRoot)microsoft.netcore.app.runtime.%(RuntimeIdentifier)\$(MicrosoftNETCoreAppRuntimewinx64Version)"
                            NuGetPackageVersion="$(MicrosoftNETCoreAppRuntimewinx64Version)"
                            Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false' and '%(ResolvedRuntimePack.FrameworkName)' == 'Microsoft.NETCore.App'" />
+    </ItemGroup>
+
+    <PropertyGroup>
+      <_ResolvedRuntimePackPath>@(ResolvedRuntimePack->WithMetdataValue('FrameworkName', 'Microsoft.NETCore.App')->Metadata('Path'))</_ResolvedRuntimePackPath>
+    </PropertyGroup>
 
+    <ItemGroup>
       <ResolvedFrameworkReference Condition="'%(Identity)' == 'Microsoft.NETCore.App'">
         <TargetingPackPath Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(NuGetPackageRoot)microsoft.netcore.app.ref\$(MicrosoftNETCoreAppRefVersion)</TargetingPackPath>
         <TargetingPackVersion Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(EnableTargetingPackDownload)' == 'false'">$(MicrosoftNETCoreAppRefVersion)</TargetingPackVersion>
-        <RuntimePackPath Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(NuGetPackageRoot)microsoft.netcore.app.runtime.win-x86\$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimePackPath>
+        <RuntimePackPath Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(_ResolvedRuntimePackPath)</RuntimePackPath>
         <RuntimePackVersion Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(EnableRuntimePackDownload)' == 'false'">$(MicrosoftNETCoreAppRuntimewinx64Version)</RuntimePackVersion>
       </ResolvedFrameworkReference>
 

From 64ba013780ce90d23a3f313ece20d43f46c31684 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 17:57:40 +0100
Subject: [PATCH 5/9] Update RuntimeFrameworkReference.targets

---
 eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index ce6fed3b1b5..2b0a2c1f4ed 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -70,7 +70,7 @@
     </ItemGroup>
 
     <PropertyGroup>
-      <_ResolvedRuntimePackPath>@(ResolvedRuntimePack->WithMetdataValue('FrameworkName', 'Microsoft.NETCore.App')->Metadata('Path'))</_ResolvedRuntimePackPath>
+      <_ResolvedRuntimePackPath>@(ResolvedRuntimePack->WithMetadataValue('FrameworkName', 'Microsoft.NETCore.App')->Metadata('Path'))</_ResolvedRuntimePackPath>
     </PropertyGroup>
 
     <ItemGroup>

From b009de8bd9c7f30c3926138d8e1d4d16193a87e3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 18:02:44 +0100
Subject: [PATCH 6/9] Update RuntimeFrameworkReference.targets

---
 eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index 2b0a2c1f4ed..4df0e7c7843 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -20,9 +20,9 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <UseOOBNETCoreAppTargetingPack>true</UseOOBNETCoreAppTargetingPack>
-    <UseOOBNETCoreAppRuntimePack>true</UseOOBNETCoreAppRuntimePack>
-    <UseOOBNETCoreAppAppHostPack>true</UseOOBNETCoreAppAppHostPack>
+    <UseOOBNETCoreAppTargetingPack Condition="'$(UseOOBNETCoreAppTargetingPack)' == ''">true</UseOOBNETCoreAppTargetingPack>
+    <UseOOBNETCoreAppRuntimePack Condition="'$(UseOOBNETCoreAppRuntimePack)' == ''">true</UseOOBNETCoreAppRuntimePack>
+    <UseOOBNETCoreAppAppHostPack Condition="'$(UseOOBNETCoreAppAppHostPack)' == ''">true</UseOOBNETCoreAppAppHostPack>
   </PropertyGroup>
 
   <PropertyGroup>

From bfd70fb9a4f8449ec440129abb8c5d213aa73495 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 18:14:40 +0100
Subject: [PATCH 7/9] Update Tools.props

---
 eng/Tools.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index 86511d101b9..e55788a3d5e 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,8 +1,8 @@
 <Project>
 
   <PropertyGroup>
-    <RuntimeIdentifier Condition="'$(PlatformTarget)' == ''">win-x86</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(PlatformTarget)' != ''">win-$(PlatformTarget)</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(Platform)' == ''">win-x86</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="'$(Platform)' != ''">win-$(Platform)</RuntimeIdentifier>
   </PropertyGroup>
 
   <!-- Pre-download vcxproj dependencies as vcxprojs in this repo don't support NuGet package download. -->

From 2b27f14246d62e855ab7cf0ff01f5b5f8cf8c969 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 19:01:47 +0100
Subject: [PATCH 8/9] PR feedback and adding comments

---
 eng/Tools.props                                          | 8 ++++----
 eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/eng/Tools.props b/eng/Tools.props
index e55788a3d5e..1393e1776e8 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,15 +1,15 @@
 <Project>
 
   <PropertyGroup>
-    <RuntimeIdentifier Condition="'$(Platform)' == ''">win-x86</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="'$(Platform)' != ''">win-$(Platform)</RuntimeIdentifier>
+    <_RuntimeIdentifier Condition="'$(Platform)' == ''">win-x86</_RuntimeIdentifier>
+    <_RuntimeIdentifier Condition="'$(Platform)' != ''">win-$(Platform)</_RuntimeIdentifier>
   </PropertyGroup>
 
   <!-- Pre-download vcxproj dependencies as vcxprojs in this repo don't support NuGet package download. -->
   <ItemGroup>
     <PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
-    <PackageDownload Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
-    <PackageDownload Include="Microsoft.NETCore.App.Host.$(RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
+    <PackageDownload Include="Microsoft.NETCore.App.Runtime.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
+    <PackageDownload Include="Microsoft.NETCore.App.Host.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRuntimewinx64Version)]" Condition="'$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''" />
   </ItemGroup>
 
 </Project>
diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index 4df0e7c7843..b22776fa2be 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -19,6 +19,7 @@
     <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
+  <!-- The below logic intentionally doesn't consider multiple .NETCoreApp TFMs as that isn't necessary at this point. -->
   <PropertyGroup>
     <UseOOBNETCoreAppTargetingPack Condition="'$(UseOOBNETCoreAppTargetingPack)' == ''">true</UseOOBNETCoreAppTargetingPack>
     <UseOOBNETCoreAppRuntimePack Condition="'$(UseOOBNETCoreAppRuntimePack)' == ''">true</UseOOBNETCoreAppRuntimePack>
@@ -51,7 +52,8 @@
   </ItemGroup>
 
   <!-- Update paths for resolved packs which is necessary when the packs couldn't be resolved.
-       This happens when package download is disabled and the package isn't available in the SDK's packs folder. -->
+       This happens when package download is disabled and the package isn't available in the SDK's packs folder.
+       This entire target can be removed when vcxproj's NuGet support gets enabled. -->
   <Target Name="UpdateOOBPacks"
           Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"
           AfterTargets="ResolveFrameworkReferences">

From 47d4ec2ceee3d243560f5cdd28296235a810bb16 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 4 Nov 2024 20:07:19 +0100
Subject: [PATCH 9/9] Add more comments and consider version properties in
 conditions

---
 .../tools/RuntimeFrameworkReference.targets   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
index b22776fa2be..6dd7eb19ed8 100644
--- a/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
+++ b/eng/WpfArcadeSdk/tools/RuntimeFrameworkReference.targets
@@ -21,18 +21,9 @@
 
   <!-- The below logic intentionally doesn't consider multiple .NETCoreApp TFMs as that isn't necessary at this point. -->
   <PropertyGroup>
-    <UseOOBNETCoreAppTargetingPack Condition="'$(UseOOBNETCoreAppTargetingPack)' == ''">true</UseOOBNETCoreAppTargetingPack>
-    <UseOOBNETCoreAppRuntimePack Condition="'$(UseOOBNETCoreAppRuntimePack)' == ''">true</UseOOBNETCoreAppRuntimePack>
-    <UseOOBNETCoreAppAppHostPack Condition="'$(UseOOBNETCoreAppAppHostPack)' == ''">true</UseOOBNETCoreAppAppHostPack>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <!-- vcxproj don't support restore -->
-    <EnableTargetingPackDownload Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableTargetingPackDownload>
-    <EnableRuntimePackDownload Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableRuntimePackDownload>
-    <GenerateErrorForMissingTargetingPacks Condition="'$(EnableTargetingPackDownload)' == 'false'">false</GenerateErrorForMissingTargetingPacks>
-
-    <EnableAppHostPackDownload Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableAppHostPackDownload>
+    <UseOOBNETCoreAppTargetingPack Condition="'$(UseOOBNETCoreAppTargetingPack)' == '' and '$(MicrosoftNETCoreAppRefVersion)' != ''">true</UseOOBNETCoreAppTargetingPack>
+    <UseOOBNETCoreAppRuntimePack Condition="'$(UseOOBNETCoreAppRuntimePack)' == '' and '$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''">true</UseOOBNETCoreAppRuntimePack>
+    <UseOOBNETCoreAppAppHostPack Condition="'$(UseOOBNETCoreAppAppHostPack)' == '' and '$(MicrosoftNETCoreAppRuntimewinx64Version)' != ''">true</UseOOBNETCoreAppAppHostPack>
   </PropertyGroup>
 
   <ItemGroup>
@@ -51,6 +42,15 @@
                       Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true'" />
   </ItemGroup>
 
+  <!-- These properties can be removed when vcxproj's NuGet support gets enabled. -->
+  <PropertyGroup>
+    <EnableTargetingPackDownload Condition="'$(UseOOBNETCoreAppTargetingPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableTargetingPackDownload>
+    <EnableRuntimePackDownload Condition="'$(UseOOBNETCoreAppRuntimePack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableRuntimePackDownload>
+    <GenerateErrorForMissingTargetingPacks Condition="'$(EnableTargetingPackDownload)' == 'false'">false</GenerateErrorForMissingTargetingPacks>
+
+    <EnableAppHostPackDownload Condition="'$(UseOOBNETCoreAppAppHostPack)' == 'true' and '$(MSBuildProjectExtension)' == '.vcxproj'">false</EnableAppHostPackDownload>
+  </PropertyGroup>
+
   <!-- Update paths for resolved packs which is necessary when the packs couldn't be resolved.
        This happens when package download is disabled and the package isn't available in the SDK's packs folder.
        This entire target can be removed when vcxproj's NuGet support gets enabled. -->