Skip to content

Commit 1168302

Browse files
authored
Merge branch 'main' into MediaElementOptionService
2 parents 25b22c6 + 5c30d3f commit 1168302

File tree

2 files changed

+34
-5
lines changed

2 files changed

+34
-5
lines changed

.github/workflows/dotnet-build.yml

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ jobs:
263263

264264
sign:
265265
needs: [build_library]
266-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
266+
if: ${{ startsWith(github.ref, 'refs/tags/') || (github.event_name != 'pull_request') }}
267267
runs-on: windows-latest
268268
permissions:
269269
id-token: write # Required for requesting the JWT
@@ -335,7 +335,34 @@ jobs:
335335
path: |
336336
${{ github.workspace }}/packages/**/*.nupkg
337337
338-
release:
338+
release-main:
339+
if: ${{ github.event_name != 'pull_request' && !startsWith(github.ref, 'refs/tags/') }}
340+
needs: [sign]
341+
runs-on: ubuntu-latest
342+
343+
steps:
344+
- name: Install .NET SDK
345+
uses: actions/setup-dotnet@v4
346+
with:
347+
dotnet-version: ${{ env.TOOLKIT_NET_VERSION }}
348+
dotnet-quality: 'ga'
349+
350+
- name: Download signed packages
351+
uses: actions/download-artifact@v4
352+
with:
353+
name: signed-packages
354+
path: ./packages
355+
356+
- name: Upload artifact
357+
if: github.event_name != 'pull_request'
358+
run: >
359+
dotnet nuget push
360+
**/*.nupkg
361+
--source "https://nuget.pkg.github.com/CommunityToolkit/index.json"
362+
--api-key ${{ secrets.GITHUB_TOKEN }}
363+
--skip-duplicate
364+
365+
release-nuget:
339366
if: ${{ startsWith(github.ref, 'refs/tags/') }}
340367
needs: [sign]
341368
environment: nuget-release-gate # This gates this job until manually approved

samples/CommunityToolkit.Maui.Sample/Pages/Views/MediaElement/MediaElementPage.xaml.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,16 +274,18 @@ async void DisplayPopup(object sender, EventArgs e)
274274

275275
var popupMediaElement = new MediaElement
276276
{
277+
WidthRequest = 600,
278+
HeightRequest = 400,
277279
AndroidViewType = AndroidViewType.SurfaceView,
278280
Source = source,
279-
MetadataArtworkUrl = "dotnet_bot.png",
281+
MetadataArtworkUrl = botImageUrl,
280282
ShouldAutoPlay = true,
281283
ShouldShowPlaybackControls = true,
282284
};
283285

284286
await this.ShowPopupAsync(popupMediaElement);
285287

286-
popupMediaElement.Stop();
287-
popupMediaElement.Source = null;
288+
popupMediaElement.Stop();
289+
popupMediaElement.Source = null;
288290
}
289291
}

0 commit comments

Comments
 (0)