Skip to content

Commit 7aba464

Browse files
authored
Merge branch 'main' into MediaElementOptionService
2 parents 838d9a5 + 3887270 commit 7aba464

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/dotnet-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,17 +113,17 @@ jobs:
113113

114114
- name: Set NuGet Version to Tag Number for Camera
115115
if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-camera')
116-
run: echo "NugetPackageVersionCamera=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
116+
run: echo "NugetPackageVersionCamera=${GITHUB_REF#refs/tags/}" | sed 's/-camera$//' >> $GITHUB_ENV
117117
shell: bash
118118

119119
- name: Set NuGet Version to Tag Number for MediaElement
120120
if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-mediaelement')
121-
run: echo "NugetPackageVersionMediaElement=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
121+
run: echo "NugetPackageVersionMediaElement=${GITHUB_REF#refs/tags/}" | sed 's/-mediaelement$//' >> $GITHUB_ENV
122122
shell: bash
123123

124124
- name: Set NuGet Version to Tag Number for Maps
125125
if: startsWith(github.ref, 'refs/tags/') && endsWith(github.ref, '-maps')
126-
run: echo "NugetPackageVersionMaps=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
126+
run: echo "NugetPackageVersionMaps=${GITHUB_REF#refs/tags/}" | sed 's/-maps$//' >> $GITHUB_ENV
127127
shell: bash
128128

129129
- name: Set NuGet Version to PR Version

src/CommunityToolkit.Maui.MediaElement/ResourceDictionary.windows.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
<Setter Property="IsTabStop" Value="False" />
77
<Setter Property="Background" Value="Transparent" />
88
<Setter Property="FlowDirection" Value="LeftToRight" />
9-
<Setter Property="Width" Value="{StaticResource MediaTransportControlsMaxWidth}" />
9+
<Setter Property="MaxWidth" Value="{StaticResource MediaTransportControlsMaxWidth}" />
10+
<Setter Property="Width" Value="Auto" />
1011
<Setter Property="HorizontalContentAlignment" Value="Left" />
1112
<Setter Property="VerticalContentAlignment" Value="Center" />
1213
<Setter Property="VerticalAlignment" Value="Bottom" />

src/CommunityToolkit.Maui/Options.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void SetShouldEnableSnackbarOnWindows(bool value)
9696
{
9797
throw new InvalidOperationException($"{nameof(Application)}.{nameof(Application.Current)} cannot be null when Windows are closed");
9898
}
99-
else if (Application.Current.Windows.Count is 1)
99+
else if (Application.Current.Windows.Count is 0)
100100
{
101101
Microsoft.Windows.AppNotifications.AppNotificationManager.Default.NotificationInvoked -= OnSnackbarNotificationInvoked;
102102
Microsoft.Windows.AppNotifications.AppNotificationManager.Default.Unregister();

0 commit comments

Comments
 (0)