Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit030ae8f

Browse files
authored
Merge branch 'develop' into single_host_start_activity
2 parentsba662e3 +37218f4 commit030ae8f

File tree

156 files changed

+3300
-1611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+3300
-1611
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,26 @@
22
"version":1,
33
"isRoot":true,
44
"tools": {
5-
"cake.tool": {
6-
"version":"4.0.0",
7-
"commands": [
8-
"dotnet-cake"
9-
]
10-
},
115
"dotnet-reportgenerator-globaltool": {
12-
"version":"5.2.2",
6+
"version":"5.4.5",
137
"commands": [
148
"reportgenerator"
15-
]
9+
],
10+
"rollForward":false
1611
},
1712
"dotnet-sonarscanner": {
18-
"version":"6.2.0",
13+
"version":"10.1.1",
1914
"commands": [
2015
"dotnet-sonarscanner"
21-
]
16+
],
17+
"rollForward":false
18+
},
19+
"cyclonedx": {
20+
"version":"5.1.1",
21+
"commands": [
22+
"dotnet-CycloneDX"
23+
],
24+
"rollForward":false
2225
}
2326
}
2427
}

‎.github/FUNDING.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
open_collective:MvvmCross
2+
github:Cheesebaron

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ description: File a bug/issue report
33
labels:["t/bug"]
44
assignees:[]
55
title:'[Bug]: <title>'
6+
type:Bug
67
body:
78
-type:markdown
89
attributes:

‎.github/ISSUE_TEMPLATE/feature-request.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: Feature Request
22
description:Suggest an idea for MvvmCross
33
labels:["t/enhancement"]
44
assignees:[]
5+
type:Feature
56
body:
67
-type:markdown
78
attributes:
@@ -30,4 +31,4 @@ body:
3031
-type:markdown
3132
attributes:
3233
value:|
33-
By opening the issue you agree to follow this project's [Code of Conduct](https://github.com/MvvmCross/MvvmCross/blob/develop/CODE_OF_CONDUCT.md)
34+
By opening the issue you agree to follow this project's [Code of Conduct](https://github.com/MvvmCross/MvvmCross/blob/develop/CODE_OF_CONDUCT.md)

‎.github/labeler.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
't/docs':
2+
-changed-files:
3+
-any-glob-to-any-file:['docs/**', '**/*.md']
4+
5+
't/feature':
6+
-head-branch:['^feature', 'feature']
7+
8+
't/bug':
9+
-head-branch:['^bug', 'bug']
10+
11+
'p/ci':
12+
-changed-files:
13+
-any-glob-to-any-file:['.github/workflows/*.yml', '.github/labeler.yml']
14+
15+
'p/ios':
16+
-changed-files:
17+
-any-glob-to-any-file:['**/Platforms/Ios/**']
18+
19+
'p/android':
20+
-changed-files:
21+
-any-glob-to-any-file:['**/Platforms/Android/**']
22+
23+
'p/mac':
24+
-changed-files:
25+
-any-glob-to-any-file:[ '**/Platforms/Mac/**' ]
26+
27+
'p/tvos':
28+
-changed-files:
29+
-any-glob-to-any-file:[ '**/Platforms/Tvos/**' ]
30+
31+
'p/uwp':
32+
-changed-files:
33+
-any-glob-to-any-file:[ '**/Platforms/Uap/**' ]
34+
35+
'p/winui':
36+
-changed-files:
37+
-any-glob-to-any-file:[ '**/Platforms/WunUI/**' ]
38+
39+
'p/wpf':
40+
-changed-files:
41+
-any-glob-to-any-file:[ '**/Platforms/Wpf/**', 'MvvmCross.Wpf/**' ]
42+
43+
'p/android-support':
44+
-changed-files:
45+
-any-glob-to-any-file:[ 'MvvmCross.DroidX/**' ]
46+
47+
'p/plugins':
48+
-changed-files:
49+
-any-glob-to-any-file:[ 'MvvmCross.Plugins/**' ]
50+
51+
'p/samples':
52+
-changed-files:
53+
-any-glob-to-any-file:[ 'Projects/**' ]

‎.github/workflows/build.yml‎

Lines changed: 42 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,73 @@
11
name:Build
22

33
on:
4-
push:
5-
branches:
6-
-develop
7-
-master
8-
-feature/**
9-
-release/**
10-
-hotfix/**
114
pull_request:
125
branches:
13-
-master
6+
-main
147
-develop
158

9+
env:
10+
JAVA_DISTRIBUTION:'temurin'
11+
JAVA_VERSION:17
12+
NET_VERSION:9.0.303
13+
1614
jobs:
1715
build:
16+
permissions:
17+
id-token:write
18+
attestations:write
19+
pull-requests:write
20+
1821
runs-on:windows-latest
1922

2023
steps:
2124
-name:Checkout
22-
uses:actions/checkout@v4
25+
uses:actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683# v4.2.2
2326
with:
2427
fetch-depth:0
2528
fetch-tags:true
2629

27-
-name:Install .NET8.0.201
28-
uses:actions/setup-dotnet@v4
30+
-name:Install .NET${{ env.NET_VERSION }}
31+
uses:actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9# v4.3.1
2932
with:
30-
dotnet-version:'8.0.201'
33+
dotnet-version:${{ env.NET_VERSION }}
3134

3235
-name:Restore .NET tools
3336
run:dotnet tool restore
3437

3538
-name:Install .NET workloads
36-
run:dotnet workload install android ios tvos macos maccatalyst
39+
run:|
40+
dotnet --version
41+
dotnet workload install android ios tvos macos maccatalyst --version ${{ env.NET_VERSION }}
3742
38-
-name:Setup Java JDK
39-
uses:actions/setup-java@v4
43+
-name:Set up JDK
44+
uses:actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12#v4.7.0
4045
with:
41-
distribution:'microsoft'
42-
java-version:'17'
46+
distribution:${{ env.JAVA_DISTRIBUTION }}
47+
java-version:${{ env.JAVA_VERSION }}
4348

4449
-name:Build
45-
run:dotnet cake --verbosity=Minimal --artifactsDir="output"
50+
run:dotnet run --project build/Build.csproj -- --verbosity=Minimal --artifactsDir="${{ github.workspace }}\output" --ctrfDir="${{ github.workspace }}\ctrf"
51+
52+
-name:Print ctrf files in output
53+
run:|
54+
echo "ctrf files in output:"
55+
dir ${{ github.workspace }}\ctrf
56+
57+
-name:Publish Test Report
58+
uses:ctrf-io/github-test-reporter@073c73100796cafcbfdc4722c7fa11c29730439e#v1.0.18
59+
with:
60+
report-path:${{ github.workspace }}/ctrf/*.ctrf.json
61+
summary-report:true
62+
github-report:true
63+
pull-request:true
64+
update-comment:true
65+
env:
66+
GITHUB_TOKEN:${{ secrets.GITHUB_TOKEN }}
67+
if:always()
4668

4769
-name:Upload artifacts
48-
uses:actions/upload-artifact@v2
70+
uses:actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02#v4.6.2
4971
with:
5072
name:build-artifacts
51-
path:output
73+
path:${{ github.workspace }}\output

‎.github/workflows/codeql.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,17 @@ name: "CodeQL"
1313

1414
on:
1515
push:
16-
branches:[ "develop", "master" ]
16+
branches:[ "develop", "main" ]
1717
pull_request:
18-
branches:[ "develop", "master" ]
18+
branches:[ "develop", "main" ]
1919
schedule:
2020
-cron:'41 5 * * 5'
2121

22+
env:
23+
JAVA_DISTRIBUTION:'temurin'
24+
JAVA_VERSION:17
25+
NET_VERSION:9.0.303
26+
2227
jobs:
2328
analyze:
2429
name:Analyze
@@ -66,25 +71,27 @@ jobs:
6671
# queries: security-extended,security-and-quality
6772

6873

69-
-name:Install .NET8.0.201
74+
-name:Install .NET${{ env.NET_VERSION }}
7075
uses:actions/setup-dotnet@v4
7176
with:
72-
dotnet-version:'8.0.201'
77+
dotnet-version:${{ env.NET_VERSION }}
7378

7479
-name:Restore .NET tools
7580
run:dotnet tool restore
7681

7782
-name:Install .NET workloads
78-
run:dotnet workload install android ios tvos macos maccatalyst
83+
run:|
84+
dotnet --version
85+
dotnet workload install android ios tvos macos maccatalyst --version ${{ env.NET_VERSION }}
7986
80-
-name:Setup Java JDK
87+
-name:Set up JDK
8188
uses:actions/setup-java@v4
8289
with:
83-
distribution:'microsoft'
84-
java-version:'17'
90+
distribution:${{ env.JAVA_DISTRIBUTION }}
91+
java-version:${{ env.JAVA_VERSION }}
8592

8693
-name:Build
87-
run:dotnetcake --verbosity=Minimal
94+
run:dotnetrun --project build/Build.csproj -- --verbosity=Minimal
8895

8996
-name:Perform CodeQL Analysis
9097
uses:github/codeql-action/analyze@v3

‎.github/workflows/dotnet-format.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: dotnet format
22

33
on:[pull_request]
44

5+
env:
6+
NET_VERSION:9.0.303
7+
58
jobs:
69
lint:
710

@@ -10,14 +13,14 @@ jobs:
1013
steps:
1114
-uses:actions/checkout@v4
1215

13-
-name:Setup .NET
14-
uses:actions/setup-dotnet@v1
16+
-name:Install .NET ${{ env.NET_VERSION }}
17+
uses:actions/setup-dotnet@v4
1518
with:
16-
dotnet-version:8.0.201
19+
dotnet-version:${{ env.NET_VERSION }}
1720

1821
-name:Restore dependencies
1922
run:dotnet tool restore
2023

2124
-name:Run dotnet format
2225
run:|
23-
dotnet format whitespace --no-restore --verify-no-changes MvvmCross.sln
26+
dotnet format whitespace --no-restore --verify-no-changes MvvmCross.sln

‎.github/workflows/labeler-pr.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# This workflow will triage pull requests and apply a label based on the
2+
# paths that are modified in the pull request.
3+
#
4+
# To use this workflow, you will need to set up a .github/labeler.yml
5+
# file with configuration. For more information, see:
6+
# https://github.com/actions/labeler
7+
8+
name:Label PR
9+
on:[pull_request_target]
10+
11+
jobs:
12+
add_label:
13+
runs-on:ubuntu-latest
14+
permissions:
15+
contents:read
16+
pull-requests:write
17+
18+
steps:
19+
-uses:actions/labeler@v5

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp