From a860fa98fc7673a9091378d3516bfafafec8a8ee Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 30 May 2023 18:01:23 +0700
Subject: [PATCH] Backport of #15238 (#15240)

---
 .../Sdk/Microsoft.Maui.Core.Sdk.After.targets            | 9 +++++++++
 src/Workload/Microsoft.Maui.Sdk/Sdk/WinUI.targets        | 8 --------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Core.Sdk.After.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Core.Sdk.After.targets
index 41069aa1b56f..b1f3a27ccae8 100644
--- a/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Core.Sdk.After.targets
+++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/Microsoft.Maui.Core.Sdk.After.targets
@@ -5,6 +5,15 @@
     <MSBuildWarningsAsMessages Condition=" '$(TargetPlatformIdentifier)' == 'Android' ">$(MSBuildWarningsAsMessages);XA4218</MSBuildWarningsAsMessages>
   </PropertyGroup>
 
+  <!--
+    Workaround for https://github.com/NuGet/Home/issues/6461
+    By default, Android and iOS set the Version property, so we need to do the same for Windows.
+    This also has to be done outside of the NuGets as this affects the NuGet restore.
+  -->
+  <PropertyGroup Condition=" '$(TargetPlatformIdentifier)' == 'windows' and '$(OutputType)' == 'WinExe' ">
+    <Version Condition=" $([System.Version]::TryParse ('$(ApplicationDisplayVersion)', $([System.Version]::Parse('1.0')))) ">$(ApplicationDisplayVersion)</Version>
+  </PropertyGroup>
+
   <!--
     This double check seems excessive, but importing the WinUI.targets when building for windows is not
     sufficient. The WASDK targets assume everything is WinUI and thus just passes along the TFM of the app.
diff --git a/src/Workload/Microsoft.Maui.Sdk/Sdk/WinUI.targets b/src/Workload/Microsoft.Maui.Sdk/Sdk/WinUI.targets
index e6a9d3e59b13..d82a5b31dbd7 100644
--- a/src/Workload/Microsoft.Maui.Sdk/Sdk/WinUI.targets
+++ b/src/Workload/Microsoft.Maui.Sdk/Sdk/WinUI.targets
@@ -1,14 +1,6 @@
 <!-- Workarounds for WinUI -->
 <Project>
 
-  <!--
-    NOTE: workaround https://github.com/NuGet/Home/issues/6461
-    We should also follow Android, iOS, etc. workloads.
-  -->
-  <PropertyGroup>
-    <Version Condition=" '$(ApplicationDisplayVersion)' != '' ">$(ApplicationDisplayVersion)</Version>
-  </PropertyGroup>
-
   <Target Name="_AddMauiPriFiles" AfterTargets="ResolveAssemblyReferences">
     <ItemGroup>
       <_ReferenceRelatedPaths