Skip to content

Commit 54f6314

Browse files
committed
Add net8.0-windows10.0.22621.0 and required flags to Uwp TFMs
1 parent 7aa3d5d commit 54f6314

File tree

4 files changed

+6
-3
lines changed

4 files changed

+6
-3
lines changed

MultiTarget/AvailableTargetFrameworks.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
3+
<UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
44
<WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
55

66
<WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>

MultiTarget/EnabledTargetFrameworks.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
3+
<UwpTargetFramework>uap10.0.17763;net8.0-windows10.0.22621.0;</UwpTargetFramework>
44
<WinAppSdkTargetFramework>net8.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;net6.0-windows10.0.22621.0;</WinAppSdkTargetFramework>
55

66
<WasmHeadTargetFramework>net8.0</WasmHeadTargetFramework>

MultiTarget/MultiTargetIdentifiers.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,8 @@
5959
-->
6060
<WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">2</WinUIMajorVersion>
6161
<WinUIMajorVersion Condition="'$(HasWinUI)' == 'true' AND '$(IsWinAppSdk)' == 'true'">3</WinUIMajorVersion>
62+
63+
<UseUwp Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">true</UseUwp>
64+
<UseUwpTools Condition="'$(HasWinUI)' == 'true' AND '$(IsUwp)' == 'true'">true</UseUwpTools>
6265
</PropertyGroup>
6366
</Project>

ProjectHeads/App.Head.Uwp.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
33

44
<PropertyGroup>
5-
<TargetFramework>$(UwpTargetFramework)</TargetFramework>
5+
<TargetFramework>$(UwpTargetFramework.Split(';')[0])</TargetFramework>
66
<DependencyVariant>Uwp</DependencyVariant>
77
</PropertyGroup>
88

0 commit comments

Comments
 (0)