-
Notifications
You must be signed in to change notification settings - Fork 159
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
sunday866
wants to merge
20
commits into
main
Choose a base branch
from
feature/Maui
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/maui #1119
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit
Hold shift + click to select a range
5e3cb13
add MediaPickSample
5ae8c5d
Compact code
c7fd4f1
Compact code
fd07230
Optimize the code
6376d6a
fix android 13 ble bug for device name is empty
0fc36e9
fix bug in device only add
6a61fe8
add ios push sample
39959cc
Merge branch 'main' into feature/Maui
1f52ee6
add video player sample
2cd0b83
add video sample
6c84c35
add jpush for android
984c9a0
Resolve conflicts
c400f03
Resolve conflicts
5157707
Resolve conflicts
fa42bd0
merge code
7e4cb4d
add a new implementation for scan code
6414866
up
07a60da
合并
732aaf4
up
fd617f3
Merge branch 'feature/Maui' of https://github.com/BlazorComponent/MAS…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
69 changes: 0 additions & 69 deletions
69
.github/workflows/azure-static-web-apps-agreeable-plant-0c2439c10-v1.yml
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.10' # install the python version needed | ||
| # - name: install python packages | ||
| # run: | | ||
| # python -m pip install --upgrade pip | ||
| # pip install -r scirpts/requirements.txt | ||
| - name: execute py script # run sitemapgenerate.py | ||
| env: | ||
| DOC_DOMAIN: "https://blazor.masastack.com" | ||
| run: python scirpts/sitemapgenerate.py | ||
| - name: setup oss | ||
| uses: manyuanrong/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,6 +3,11 @@ name: deploy-wasm-prd | |
| on: | ||
| release: | ||
| types: [ created ] | ||
| push: | ||
| branches: | ||
| - main | ||
| paths: | ||
| - docs/MASA.Docs*/** | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
|
|
@@ -27,6 +32,14 @@ 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 | ||
| uses: actions/setup-python@v4 | ||
| with: | ||
| python-version: '3.10' # install the python version needed | ||
| - name: execute py script # run sitemapgenerate.py | ||
| env: | ||
| DOC_DOMAIN: "https://blazor.masastack.com" | ||
| run: python scirpts/sitemapgenerate.py | ||
| - name: setup oss | ||
| uses: manyuanrong/[email protected] | ||
| with: | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| name: deploy-wasm-try | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| paths: | ||
| - src/Masa.Try.Shared/** | ||
| - src/Masa.Try.WebAssembly/** | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: git pull | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: 'recursive' | ||
| - run: git submodule foreach git checkout main | ||
| - name: setting dotnet | ||
| uses: actions/setup-dotnet@v1 | ||
| with: | ||
| dotnet-version: | | ||
| 6.0.x | ||
| 7.0.x | ||
| include-prerelease: true | ||
| - name: setting tools | ||
| run: dotnet workload install wasm-tools | ||
| - name: build | ||
| run: dotnet build Masa.Try.sln | ||
| - name: publish | ||
| run: dotnet publish src/Masa.Try.WebAssembly/Masa.Try.WebAssembly.csproj -c Release | ||
| - name: setup oss | ||
| uses: manyuanrong/[email protected] | ||
| with: | ||
| endpoint: "oss-cn-hangzhou.aliyuncs.com" | ||
| access-key-id: ${{ secrets.ACCESS_KEY_ID }} | ||
| access-key-secret: ${{ secrets.ACCESS_KEY_SECRET }} | ||
| - name: deploy oss | ||
| run: ossutil cp -rf /home/runner/work/MASA.Blazor/MASA.Blazor/src/Masa.Try.WebAssembly/bin/Release/net7.0/publish/wwwroot/ oss://masa-try/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| | ||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.6.33417.168 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Try", "Try", "{1487F7CB-2A53-4ACA-BCCD-873E5008E43B}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Try.Shared", "src\Masa.Try.Shared\Masa.Try.Shared.csproj", "{19DB3BAF-0812-418C-8178-C8C79F986577}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Try.WebAssembly", "src\Masa.Try.WebAssembly\Masa.Try.WebAssembly.csproj", "{9993EFC9-8D75-4640-954F-57F35EEDF595}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Masa.Blazor", "src\Masa.Blazor\Masa.Blazor.csproj", "{0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}" | ||
| EndProject | ||
| Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Component", "Component", "{E9DCD167-6407-4BD1-B336-25DA1D0E5BAC}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Masa.Try.Server", "src\Masa.Try.Server\Masa.Try.Server.csproj", "{9B49C042-76F9-4B78-85E7-A9DAE499A8CD}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {19DB3BAF-0812-418C-8178-C8C79F986577}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {19DB3BAF-0812-418C-8178-C8C79F986577}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {19DB3BAF-0812-418C-8178-C8C79F986577}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {19DB3BAF-0812-418C-8178-C8C79F986577}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {9993EFC9-8D75-4640-954F-57F35EEDF595}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {9993EFC9-8D75-4640-954F-57F35EEDF595}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {9993EFC9-8D75-4640-954F-57F35EEDF595}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {9993EFC9-8D75-4640-954F-57F35EEDF595}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {9B49C042-76F9-4B78-85E7-A9DAE499A8CD}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(NestedProjects) = preSolution | ||
| {19DB3BAF-0812-418C-8178-C8C79F986577} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B} | ||
| {9993EFC9-8D75-4640-954F-57F35EEDF595} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B} | ||
| {0E3AC43E-78FC-41F5-89FA-6FAF2559BCCD} = {E9DCD167-6407-4BD1-B336-25DA1D0E5BAC} | ||
| {9B49C042-76F9-4B78-85E7-A9DAE499A8CD} = {1487F7CB-2A53-4ACA-BCCD-873E5008E43B} | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {B916CE94-77DB-4DC7-868C-BBE373D4BEEB} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
You are viewing a condensed version of this merge commit. You can view the full changes here.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?