Skip to content

Commit 5c3e76b

Browse files
ptr727ptr727
authored
Merge pull request #248 from ptr727/develop
Develop
2 parents 5ee62d3 + 7be27af commit 5c3e76b

27 files changed

+126
-344590
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"version": 1,
3+
"isRoot": true,
4+
"tools": {
5+
"csharpier": {
6+
"version": "1.1.1",
7+
"commands": [
8+
"csharpier"
9+
],
10+
"rollForward": false
11+
},
12+
"husky": {
13+
"version": "0.7.2",
14+
"commands": [
15+
"husky"
16+
],
17+
"rollForward": false
18+
}
19+
}
20+
}

‎.github/workflows/BuildPublishPipeline.yml‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,31 @@ concurrency:
1313

1414
jobs:
1515

16+
test:
17+
name: Test release
18+
runs-on: ubuntu-latest
19+
20+
steps:
21+
22+
# https://github.com/marketplace/actions/setup-net-core-sdk
23+
- name: Setup .NET SDK
24+
uses: actions/setup-dotnet@v4
25+
with:
26+
dotnet-version: 9.x
27+
28+
# https://github.com/marketplace/actions/checkout
29+
- name: Checkout code
30+
uses: actions/checkout@v5
31+
32+
# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test
33+
- name: Run unit tests
34+
run: dotnet test ./UtilitiesTests/UtilitiesTests.csproj
35+
36+
1637
build:
1738
name: Build and publish release
1839
runs-on: ubuntu-latest
40+
needs: test
1941

2042
steps:
2143

@@ -36,10 +58,6 @@ jobs:
3658
id: nbgv
3759
uses: dotnet/nbgv@master
3860

39-
# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test
40-
- name: Run unit tests
41-
run: dotnet test ./UtilitiesTests/UtilitiesTests.csproj
42-
4361
# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-build
4462
- name: Build project
4563
run: >-

‎.github/workflows/CheckForNewLanguageData.yml‎

Lines changed: 0 additions & 83 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55

66
.idea
77
.vs
8+
.user

‎.husky/pre-commit‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
dotnet husky run

‎.husky/task-runner.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"$schema": "https://alirezanet.github.io/Husky.Net/schema.json",
3+
"tasks": [
4+
{
5+
"name": "CSharpier Format",
6+
"command": "dotnet",
7+
"args": [
8+
"csharpier",
9+
"format",
10+
"--log-level=debug",
11+
"${staged}"
12+
],
13+
"include": [
14+
"**/*.cs"
15+
]
16+
},
17+
{
18+
"name": ".Net Format",
19+
"command": "dotnet",
20+
"args": [
21+
"format",
22+
"style",
23+
"--verify-no-changes",
24+
"--severity=info",
25+
"--verbosity=detailed",
26+
"--exclude-diagnostics=IDE0055"
27+
],
28+
"include": [
29+
"**/*.cs"
30+
]
31+
}
32+
]
33+
}

‎.vscode/tasks.json‎

Lines changed: 34 additions & 123 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
// dotnet new tool-manifest
2+
// dotnet tool install csharpier
3+
// dotnet tool install husky
4+
// dotnet husky install
5+
// dotnet husky add pre-commit -c "dotnet husky run"
6+
// winget install nektos.act
7+
8+
// dotnet tool update --all
9+
// winget upgrade nektos.act
10+
11+
112
{
213
"version": "2.0.0",
314
"tasks": [
@@ -27,149 +38,49 @@
2738
}
2839
},
2940
{
30-
"label": ".NET Install T4",
41+
"label": ".NET Format",
3142
"type": "process",
3243
"command": "dotnet",
3344
"args": [
34-
"tool",
35-
"install",
36-
"-g",
37-
"dotnet-t4"
38-
],
39-
"problemMatcher": [],
40-
"presentation": {
41-
"showReuseMessage": false,
42-
"clear": false
43-
}
44-
},
45-
{
46-
"label": "Updata iso-639-2 data",
47-
"type": "process",
48-
"command": "wget",
49-
"args": [
50-
"-O",
51-
"${workspaceFolder}/Data/ISO-639-2_utf-8.txt",
52-
"https://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt"
53-
],
54-
"problemMatcher": [],
55-
"presentation": {
56-
"showReuseMessage": false,
57-
"clear": false
58-
}
59-
},
60-
{
61-
"label": "Build iso-639-2 data",
62-
"type": "process",
63-
"command": "t4",
64-
"args": [
65-
"-P=${workspaceFolder}/Utilities/bin/Release/net9.0/publish",
66-
"--out=${workspaceFolder}/Utilities/Iso6392Gen.cs",
67-
"${workspaceFolder}/Utilities/Iso6392Gen.tt"
68-
],
69-
"dependsOn": [
70-
"Updata iso-639-2 data"
71-
],
72-
"dependsOrder": "sequence",
73-
"problemMatcher": [],
74-
"presentation": {
75-
"showReuseMessage": false,
76-
"clear": false
77-
}
78-
},
79-
{
80-
"label": "Updata iso-639-3 data",
81-
"type": "process",
82-
"command": "wget",
83-
"args": [
84-
"-O",
85-
"${workspaceFolder}/Data/iso-639-3.tab",
86-
"https://iso639-3.sil.org/sites/iso639-3/files/downloads/iso-639-3.tab"
87-
],
88-
"problemMatcher": [],
89-
"presentation": {
90-
"showReuseMessage": false,
91-
"clear": false
92-
}
93-
},
94-
{
95-
"label": "Build iso-639-3 data",
96-
"type": "process",
97-
"command": "t4",
98-
"args": [
99-
"-P=${workspaceFolder}/Utilities/bin/Release/net9.0/publish",
100-
"--out=${workspaceFolder}/Utilities/Iso6393Gen.cs",
101-
"${workspaceFolder}/Utilities/Iso6393Gen.tt"
102-
],
103-
"dependsOn": [
104-
"Updata iso-639-3 data"
45+
"format",
46+
"--verify-no-changes",
47+
"--severity=info",
48+
"--verbosity=detailed"
10549
],
106-
"dependsOrder": "sequence",
107-
"problemMatcher": [],
108-
"presentation": {
109-
"showReuseMessage": false,
110-
"clear": false
111-
}
112-
},
113-
{
114-
"label": "Updata rfc-5646 data",
115-
"type": "process",
116-
"command": "wget",
117-
"args": [
118-
"-O",
119-
"${workspaceFolder}/Data/language-subtag-registry",
120-
"https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry"
50+
"problemMatcher": [
51+
"$msCompile"
12152
],
122-
"problemMatcher": [],
12353
"presentation": {
12454
"showReuseMessage": false,
12555
"clear": false
12656
}
12757
},
12858
{
129-
"label": "Build rfc-5646 data",
59+
"label": "CSharpier Format",
13060
"type": "process",
131-
"command": "t4",
61+
"command": "dotnet",
13262
"args": [
133-
"-P=${workspaceFolder}/Utilities/bin/Release/net9.0/publish",
134-
"--out=${workspaceFolder}/Utilities/Rfc5646Gen.cs",
135-
"${workspaceFolder}/Utilities/Rfc5646Gen.tt"
136-
],
137-
"dependsOn": [
138-
"Updata rfc-5646 data"
63+
"csharpier",
64+
"format",
65+
"--log-level=debug",
66+
"."
13967
],
140-
"dependsOrder": "sequence",
141-
"problemMatcher": [],
142-
"presentation": {
143-
"showReuseMessage": false,
144-
"clear": false
145-
}
146-
},
147-
{
148-
"label": "Build language files",
149-
"dependsOn": [
150-
".NET Install T4",
151-
".NET Publish",
152-
"Build iso-639-2 data",
153-
"Build iso-639-3 data",
154-
"Build rfc-5646 data",
155-
"CSharpier Format"
68+
"problemMatcher": [
69+
"$msCompile"
15670
],
157-
"dependsOrder": "sequence",
158-
"problemMatcher": [],
15971
"presentation": {
16072
"showReuseMessage": false,
16173
"clear": false
16274
}
16375
},
16476
{
165-
"label": ".NET Format",
77+
"label": ".Net Tool Update",
16678
"type": "process",
16779
"command": "dotnet",
16880
"args": [
169-
"format",
170-
"--verify-no-changes",
171-
"--severity=info",
172-
"--verbosity=detailed"
81+
"tool",
82+
"update",
83+
"--all"
17384
],
17485
"problemMatcher": [
17586
"$msCompile"
@@ -180,12 +91,12 @@
18091
}
18192
},
18293
{
183-
"label": "CSharpier Format",
94+
"label": "Husky.Net Run",
18495
"type": "process",
185-
"command": "csharpier",
96+
"command": "dotnet",
18697
"args": [
187-
"format",
188-
"."
98+
"husky",
99+
"run"
189100
],
190101
"problemMatcher": [
191102
"$msCompile"

0 commit comments

Comments
 (0)