Skip to content

Commit

Permalink
Bump WinAppSDK to 1.6 (#24266)
Browse files Browse the repository at this point in the history
* Bump WinAppSDK version + WebView2 version

* Add WebView2 ref to Controls.Core

* Add another package ref

* Bump SDK versions

* Bump winappsdk version

* Add missing package ref

* Update NuGet.config

* Update Directory.Build.props

* Use SDK v38

* Remove refs to WebView2, use `WindowsAppSDK`

* Add more package refs

* Use the correct way to check for a window style (see: OverlappedPresenter.HasTitlebar impl)

* More pkgs for webview

* Mark test as unstable

* TEST: add monitor info for test context

* Revert change, try manually setting button height...?!

* Move style

* Revert change
Ensure font is the same pre-1.6

* Ensure more fonts are consistant

* Bump SDK version
Add workaround

* Update images for tests

* Update more images

* Huh

* Maybe fix crashes

* Remove package from test cases

* ugh

* www

* Ehh

* Changes for AOT
Revert workaround for items list

* Font test

* Test font again

* Remove refs to winappsdk where it's not needed
Add explicit ref to WebView2 package

* Fix some missing refs

* Remove winappsdk ref in graphics projects

* Add explcit  "Microsoft.Windows.SDK.NET.Ref" versions

* NOP failing test
Fix build issue

* - publish binlogs

* - fix logs

* Update maui-templates.yml

* Fix issue w/ dupe package contents

* Throwing stuff at the wall

* Update winsdk and dotnet versions

* Revert SDK version

* Modify AOT compat check

* Re-add SDK.NET.Ref

* Re-bump winappsdk version

* Fix SDK pack version

* Fix nested partial types

* DOh

* Update test image

* Update Directory.Build.targets

* Remove dupe properties

* Remove work-around

* Fix merge issues

* WTF?

* Blah

---------

Co-authored-by: Mike Corsaro <mikecorsaro@microsoft.com>
Co-authored-by: Matthew Leibowitz <mattleibow@live.com>
Co-authored-by: Shane Neuville <shneuvil@microsoft.com>
Co-authored-by: Rui Marinho <me@ruimarinho.net>
  • Loading branch information
5 people committed Oct 16, 2024
1 parent 4cd89c4 commit a2d2dfd
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,11 @@
<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
</PropertyGroup>

<!-- Windows specific settings -->
<PropertyGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
<WindowsSdkPackageVersion>10.0.19041.44</WindowsSdkPackageVersion>
</PropertyGroup>

<!-- version number information -->
<PropertyGroup>
<!-- Default versions from the SDKs (update when there is a new TFM version) -->
Expand Down
1 change: 0 additions & 1 deletion src/Essentials/src/Essentials.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
<ItemGroup Condition=" $(TargetFramework.Contains('-windows')) ">
<Compile Include="**\*.uwp.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<Compile Include="**\*.uwp.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
<PackageReference Include="Microsoft.WindowsAppSDK" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
<Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.44" TargetingPackVersion="10.0.19041.44" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Graphics.Skia.WPF\Graphics.Skia.WPF.csproj" />
<ProjectReference Include="..\GraphicsTester.Portable\GraphicsTester.Portable.csproj" />
Expand Down
4 changes: 4 additions & 0 deletions src/Graphics/src/Graphics.Skia.WPF/Graphics.Skia.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

<ItemGroup Condition="'$(IncludeWindowsSDKRefFrameworkReferences)' == 'True'">
<FrameworkReference Include="Microsoft.Windows.SDK.NET.Ref" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

<PropertyGroup>
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
<EnableAotAnalyzer>true</EnableAotAnalyzer>
Expand Down
1 change: 0 additions & 1 deletion src/Graphics/src/Graphics/Graphics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
</ItemGroup>

<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
<PackageReference Include="Microsoft.WindowsAppSDK" />
<PackageReference Include="Microsoft.Graphics.Win2D" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
</ItemGroup>
Expand Down

0 comments on commit a2d2dfd

Please sign in to comment.