Skip to content

Commit 96521a6

Browse files
committed
Merge branch 'main' into winui
# Conflicts: # CommunityToolkit.WinUI.UI.Controls.Media/CommunityToolkit.WinUI.UI.Controls.Media.csproj # Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj # build/Windows.Toolkit.WinUI.Controls.targets
2 parents 71a065d + 83a5bce commit 96521a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

SmokeTests/SmokeTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<!-- Only the Layout package have a dependency on WinUI -->
112112
<ItemGroup Condition="$(CurrentProject) == 'UWPBaselineWinUI' or $(CurrentProject) == 'CommunityToolkit.WinUI.UI.Controls.Layout'">
113113
<PackageReference Include="Microsoft.UI.Xaml">
114-
<Version>2.6.1</Version>
114+
<Version>2.6.2</Version>
115115
</PackageReference>
116116
</ItemGroup>
117117
<ItemGroup Condition="'$(CurrentProject)' != '' and '$(CurrentProject)' != 'UWPBaseline' and '$(CurrentProject)' != 'UWPBaselineWinUI' and '$(NuGetPackageVersion)' != 'To Fill In With Local Version Number'">

UnitTests/UnitTests.UWP/UnitTests.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<Version>6.2.12</Version>
2828
</PackageReference>
2929
<PackageReference Include="Microsoft.UI.Xaml">
30-
<Version>2.6.1</Version>
30+
<Version>2.6.2</Version>
3131
</PackageReference>
3232
<PackageReference Include="MSTest.TestAdapter">
3333
<Version>2.1.2</Version>

0 commit comments

Comments
 (0)