Skip to content

Commit

Permalink
Merge branch 'main' into dev/mazi/uno-50
Browse files Browse the repository at this point in the history
  • Loading branch information
Arlodotexe authored Jan 10, 2024
2 parents ed2baa2 + 9665c46 commit b55c137
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion MultiTarget/AvailableTargetFrameworks.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;</WinAppSdkTargetFramework>

<WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
<LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion MultiTarget/EnabledTargetFrameworks.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<UwpTargetFramework>uap10.0.17763</UwpTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.19041.0;net7.0-windows10.0.19041.0;</WinAppSdkTargetFramework>
<WinAppSdkTargetFramework>net6.0-windows10.0.22621.0;net7.0-windows10.0.22621.0;</WinAppSdkTargetFramework>

<WasmHeadTargetFramework>net7.0</WasmHeadTargetFramework>
<LinuxHeadTargetFramework>net7.0</LinuxHeadTargetFramework>
Expand Down
4 changes: 2 additions & 2 deletions MultiTarget/PackageReferences/WinAppSdk.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
</ItemGroup>
</Project>

0 comments on commit b55c137

Please sign in to comment.