Backport of #15238 (#15240)

dotnet · May 30, 2023 · a860fa9 · a860fa9
1 parent a2bf5b8
commit a860fa9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 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
@@ -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
@@ -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