Skip to content

Commit

Permalink
Update WindowsAppSDK versions to latest (#10771)
Browse files Browse the repository at this point in the history
Description

This PR updates the following versions for the `Microsoft.ReactNative.WindowsAppSDK` project and the template for apps built against it:

* Upgrade `WindowsTargetPlatformVersion` / `Microsoft.WindowsSDK` to 10.0.19041 from 10.0.18362
* Upgrade `WinUI3` / `Microsoft.WindowsAppSDK` to 1.1.4 from 1.0.0

Type of Change
- Breaking change (fix or feature that would cause existing functionality to not work as expected)
- This change requires a documentation update

Why

Building the `Microsoft.ReactNative.WindowsAppSDK` project with the `WindowsTargetPlatformVersion` at 10.0.18362 means all of the dependencies (like `Microsoft.ReactNative`) also build targeting that version, which causes multiple warnings by the MIDL compiler. Updating to 10.0.19041 aligns WindowsAppSDK with the standard UWP projects.

To make that upgrade/alignment happen, the `Microsoft.WindowsAppSDK` also needed to be bumped.

What
Updated versions in project files, including the WinAppSDK app template.
  • Loading branch information
jonthysell committed Oct 26, 2022
1 parent e19afeb commit 7f04c3a
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 8 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update WindowsAppSDK versions to latest",
"packageName": "@react-native-windows/cli",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Update WindowsAppSDK versions to latest",
"packageName": "react-native-windows",
"email": "jthysell@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ function getWinAppSDKPackages(nugetVersion: string): NugetPackage[] {

winAppSDKPackages.push({
id: 'Microsoft.WindowsAppSDK',
version: '1.0.0',
version: '1.1.4',
});

return winAppSDKPackages;
Expand Down
1 change: 0 additions & 1 deletion vnext/ExperimentalFeatures.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project>
<PropertyGroup Condition="'$(SolutionName)'=='Microsoft.ReactNative.WindowsAppSDK'">
<UseWinUI3>true</UseWinUI3>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(SolutionName)'=='ReactWindows-Desktop'">
<UseFabric>false</UseFabric>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net5.0-windows10.0.18362.0</TargetFramework>
<TargetFramework>net5.0-windows10.0.19041.0</TargetFramework>
<Platforms>x64</Platforms>
</PropertyGroup>

Expand All @@ -16,12 +16,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.3.5" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
<PackageReference Include="Microsoft.Windows.CsWinRT" Version="1.6.5" />
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.4" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.18362.18" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.18362.18" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.26" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.19041.26" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)\..\Microsoft.ReactNative\Microsoft.ReactNative.vcxproj" />
Expand Down
2 changes: 1 addition & 1 deletion vnext/PropertySheets/WinUI.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="WinUI3 versioning">
<!-- This value is also used by the CLI, see /packages/@react-native-windows/generate-windows -->
<WinUI3Version Condition="'$(WinUI3Version)'==''">1.0.0</WinUI3Version>
<WinUI3Version Condition="'$(WinUI3Version)'==''">1.1.4</WinUI3Version>
</PropertyGroup>

<PropertyGroup Label="WinUI2x versioning">
Expand Down
4 changes: 4 additions & 0 deletions vnext/template/cs-app-WinAppSDK/proj/MyApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@
<ItemGroup>
<SDKReference Include="Microsoft.VCLibs, Version=14.0" />
</ItemGroup>
<ItemGroup>
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.26" />
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.19041.26" />
</ItemGroup>
<ItemGroup>
{{#csNugetPackages}}
<PackageReference Include="{{ id }}">
Expand Down

0 comments on commit 7f04c3a

Please sign in to comment.