Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/maui #1119

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Feature/maui #1119

wants to merge 20 commits into from

Conversation

sunday866
Copy link
Contributor

add sample for videoplayer for android
add sample for JPush for android

@doddgu
Copy link
Collaborator

doddgu commented Mar 22, 2023

@sunday866 resolve conflicts

@@ -32,6 +32,18 @@ jobs:
run: dotnet build Masa.Blazor.Docs.sln
- name: publish
run: dotnet publish docs/Masa.Docs.WebAssembly/Masa.Docs.WebAssembly.csproj -c Release
- name: setup python
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

LONSID\guohao and others added 5 commits March 29, 2023 11:11
…A.Blazor into feature/Maui

# Conflicts:
#	src/BlazorComponent
#	src/MASA.Docs
#	src/Masa.Blazor.Maui.Plugin/Masa.Blazor.Full.sln
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants