Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions WinUIGallery/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,9 @@
IsBackButtonVisible="{x:Bind rootFrame.CanGoBack, Mode=OneWay}"
IsPaneToggleButtonVisible="True"
PaneToggleRequested="TitleBar_PaneToggleRequested">
<!-- This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource -->
<TitleBar.LeftHeader>
<ImageIcon
Height="16"
Margin="0,0,8,0"
Source="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.LeftHeader>
<TitleBar.IconSource>
<ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.IconSource>
<TitleBar.Content>
<AutoSuggestBox
x:Name="controlsSearchBox"
Expand Down
14 changes: 5 additions & 9 deletions WinUIGallery/Samples/ControlPages/TitleBarPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,11 @@
Title="{Binding ElementName=TitleBox, Path=Text, Mode=OneWay}"
IsBackButtonVisible="{Binding ElementName=BackButtonToggle, Path=IsOn, Mode=OneWay}"
IsPaneToggleButtonVisible="{Binding ElementName=PaneToggle, Path=IsOn, Mode=OneWay}"
Subtitle="{Binding ElementName=SubtitleBox, Path=Text, Mode=OneWay}"
LayoutUpdated="TitleBar_LayoutUpdated">
<!-- This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource -->
<TitleBar.LeftHeader>
<ImageIcon
Height="16"
Margin="16,0,8,0"
Source="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.LeftHeader>
LayoutUpdated="TitleBar_LayoutUpdated"
Subtitle="{Binding ElementName=SubtitleBox, Path=Text, Mode=OneWay}">
<TitleBar.IconSource>
<ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.IconSource>
<TitleBar.RightHeader>
<PersonPicture
Width="30"
Expand Down
13 changes: 3 additions & 10 deletions WinUIGallery/Samples/SamplePages/TitleBarWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,9 @@
IsPaneToggleButtonVisible="True"
PaneToggleRequested="TitleBar_PaneToggleRequested"
Subtitle="TitleBar sample">
<!-- This is a workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/10374, once fixed we should just be using IconSource -->
<!-- <TitleBar.IconSource>
<ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.IconSource>-->
<TitleBar.LeftHeader>
<ImageIcon
Height="16"
Margin="8,0,8,0"
Source="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.LeftHeader>
<TitleBar.IconSource>
<ImageIconSource ImageSource="/Assets/Tiles/GalleryIcon.ico" />
</TitleBar.IconSource>
<TitleBar.RightHeader>
<PersonPicture
Width="30"
Expand Down
4 changes: 2 additions & 2 deletions WinUIGallery/WinUIGallery.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,11 @@
just add versionless PackageReferences here. They will be updated to their actual versions by either the Packages.props file
in the WinUI repo, or the next ItemGroup below when standalone. -->
<ItemGroup>
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.264">
<PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.269">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.20250806.1">
<PackageReference Include="Microsoft.Windows.SDK.BuildTools.MSIX" Version="1.7.251221100">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions standalone.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<PropertyGroup>
<!-- The NuGet versions of dependencies to build against. -->
<WindowsSdkPackageVersion>10.0.22621.42</WindowsSdkPackageVersion>
<WindowsAppSdkPackageVersion>1.8.250907003</WindowsAppSdkPackageVersion>
<WindowsAppSdkPackageVersion>1.8.260209005</WindowsAppSdkPackageVersion>
<MicrosoftNETCoreUniversalWindowsPlatformVersion>6.2.11</MicrosoftNETCoreUniversalWindowsPlatformVersion>
<GraphicsWin2DVersion>1.3.2</GraphicsWin2DVersion>
<ColorCodeVersion>2.0.15</ColorCodeVersion>
<CommunityToolkitWinUIVersion>8.2.250402</CommunityToolkitWinUIVersion>
<CommunityToolkitWinUIVersion>8.2.251219</CommunityToolkitWinUIVersion>
<MicrosoftCsWinRTPackageVersion>2.2.0</MicrosoftCsWinRTPackageVersion>
<!-- We have multiple projects in the same directory, which means we need to separate their output paths-->
<BaseIntermediateOutputPath>obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
Expand Down