Skip to content

Commit 5742d5e

Browse files
StepamiStepami
authored
Переезд на .NET 7 (#24)
* обновление sdk в проекте * обновление sdk в ci * переход на json raw string literal * обновление nuget пакетов * Генерация отчёта о покрытии на уровне конфигурации проекта coverlet-coverage/coverlet#1391 * Генерация отчёта о покрытии на уровне конфигурации проекта coverlet-coverage/coverlet#1391 * versioning
1 parent 58b7b13 commit 5742d5e

File tree

7 files changed

+140
-133
lines changed

7 files changed

+140
-133
lines changed

‎.github/workflows/develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v2
2020
with:
21-
dotnet-version: 6.0.x
21+
dotnet-version: 7.0.x
2222
- name: Cache NuGet packages
2323
uses: actions/cache@v3
2424
with:
@@ -30,7 +30,7 @@ jobs:
3030
run: dotnet build --no-restore -c Release -v n
3131
- name: Test
3232
run: |
33-
dotnet test -c Release --no-build -v n /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura --filter="Category=Unit"
33+
dotnet test -c Release --no-build -v n --filter="Category=Unit"
3434
mkdir coverage-report
3535
- name: Code Coverage Summary Report For Merge Request
3636
if: github.event_name == 'pull_request'

‎.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: Setup .NET
4343
uses: actions/setup-dotnet@v2
4444
with:
45-
dotnet-version: 6.0.x
45+
dotnet-version: 7.0.x
4646
- name: Publish
4747
run: |
4848
mkdir output

‎Interpreter.Lib/Interpreter.Lib.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>

‎Interpreter.Tests/Interpreter.Tests.csproj

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
4+
<TargetFramework>net7.0</TargetFramework>
65
<IsPackable>false</IsPackable>
76
</PropertyGroup>
7+
8+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
9+
<CollectCoverage>true</CollectCoverage>
10+
<CoverletOutputFormat>cobertura</CoverletOutputFormat>
11+
</PropertyGroup>
812

913
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
11-
<PackageReference Include="Moq" Version="4.18.1" />
12-
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
15+
<PackageReference Include="Moq" Version="4.18.3" />
16+
<PackageReference Include="xunit" Version="2.4.2" />
1317
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1418
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1519
<PrivateAssets>all</PrivateAssets>
1620
</PackageReference>
17-
<PackageReference Include="coverlet.collector" Version="3.1.2">
21+
<PackageReference Include="coverlet.collector" Version="3.2.0">
1822
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1923
<PrivateAssets>all</PrivateAssets>
2024
</PackageReference>
21-
<PackageReference Include="coverlet.msbuild" Version="3.1.2">
25+
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
2226
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2327
<PrivateAssets>all</PrivateAssets>
2428
</PackageReference>

‎Interpreter/Interpreter.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
6-
<Version>1.1.5</Version>
5+
<TargetFramework>net7.0</TargetFramework>
6+
<Version>1.2.5</Version>
77
</PropertyGroup>
88

99
<ItemGroup>
@@ -12,9 +12,9 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="CommandLineParser" Version="2.9.1" />
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
17-
<PackageReference Include="System.IO.Abstractions" Version="17.2.1" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
16+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
17+
<PackageReference Include="System.IO.Abstractions" Version="19.0.1" />
1818
</ItemGroup>
1919

2020
</Project>

‎Interpreter/TokenTypes.cs

Lines changed: 116 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -2,118 +2,121 @@ namespace Interpreter
22
{
33
public static class TokenTypes
44
{
5-
public const string Json = @"[
6-
{
7-
""tag"": ""Comment"",
8-
""pattern"": ""[\/]{2}.*"",
9-
""priority"": 0,
10-
""canIgnore"": true
11-
},
12-
{
13-
""tag"": ""Ident"",
14-
""pattern"": ""[a-zA-Z][a-zA-Z0-9]*"",
15-
""priority"": 50
16-
},
17-
{
18-
""tag"": ""IntegerLiteral"",
19-
""pattern"": ""[0-9]+"",
20-
""priority"": 3
21-
},
22-
{
23-
""tag"": ""FloatLiteral"",
24-
""pattern"": ""[0-9]+[.][0-9]+"",
25-
""priority"": 2
26-
},
27-
{
28-
""tag"": ""NullLiteral"",
29-
""pattern"": ""null"",
30-
""priority"": 4
31-
},
32-
{
33-
""tag"": ""BooleanLiteral"",
34-
""pattern"": ""true|false"",
35-
""priority"": 5
36-
},
37-
{
38-
""tag"": ""StringLiteral"",
39-
""pattern"": ""\\\""(\\\\.|[^\""\\\\])*\\\"""",
40-
""priority"": 6
41-
},
42-
{
43-
""tag"": ""Keyword"",
44-
""pattern"": ""let|const|function|if|else|while|break|continue|return|as|type"",
45-
""priority"": 11
46-
},
47-
{
48-
""tag"": ""Operator"",
49-
""pattern"": ""[+]{1,2}|[-]|[*]|[\/]|[%]|([!]|[=])[=]|([<]|[>])[=]?|[!]|[|]{2}|[&]{2}|[~]|[:]{2}"",
50-
""priority"": 12
51-
},
52-
{
53-
""tag"": ""Arrow"",
54-
""pattern"": ""[=][>]"",
55-
""priority"": 13
56-
},
57-
{
58-
""tag"": ""Comma"",
59-
""pattern"": ""[,]"",
60-
""priority"": 100
61-
},
62-
{
63-
""tag"": ""Dot"",
64-
""pattern"": ""[.]"",
65-
""priority"": 105
66-
},
67-
{
68-
""tag"": ""LeftCurl"",
69-
""pattern"": ""[{]"",
70-
""priority"": 101
71-
},
72-
{
73-
""tag"": ""RightCurl"",
74-
""pattern"": ""[}]"",
75-
""priority"": 102
76-
},
77-
{
78-
""tag"": ""LeftParen"",
79-
""pattern"": ""[(]"",
80-
""priority"": 103
81-
},
82-
{
83-
""tag"": ""RightParen"",
84-
""pattern"": ""[)]"",
85-
""priority"": 104
86-
},
87-
{
88-
""tag"": ""LeftBracket"",
89-
""pattern"": ""[[]"",
90-
""priority"": 107
91-
},
92-
{
93-
""tag"": ""RightBracket"",
94-
""pattern"": ""[]]"",
95-
""priority"": 109
96-
},
97-
{
98-
""tag"": ""Assign"",
99-
""pattern"": ""[=]"",
100-
""priority"": 99
101-
},
102-
{
103-
""tag"": ""QuestionMark"",
104-
""pattern"": ""[?]"",
105-
""priority"": 90
106-
},
107-
{
108-
""tag"": ""Colon"",
109-
""pattern"": ""[:]"",
110-
""priority"": 91
111-
},
112-
{
113-
""tag"": ""SemiColon"",
114-
""pattern"": ""[;]"",
115-
""priority"": 92
116-
}
117-
]";
5+
public const string Json =
6+
"""
7+
[
8+
{
9+
"tag": "Comment",
10+
"pattern": "[\/]{2}.*",
11+
"priority": 0,
12+
"canIgnore": true
13+
},
14+
{
15+
"tag": "Ident",
16+
"pattern": "[a-zA-Z][a-zA-Z0-9]*",
17+
"priority": 50
18+
},
19+
{
20+
"tag": "IntegerLiteral",
21+
"pattern": "[0-9]+",
22+
"priority": 3
23+
},
24+
{
25+
"tag": "FloatLiteral",
26+
"pattern": "[0-9]+[.][0-9]+",
27+
"priority": 2
28+
},
29+
{
30+
"tag": "NullLiteral",
31+
"pattern": "null",
32+
"priority": 4
33+
},
34+
{
35+
"tag": "BooleanLiteral",
36+
"pattern": "true|false",
37+
"priority": 5
38+
},
39+
{
40+
"tag": "StringLiteral",
41+
"pattern": "\\\"(\\\\.|[^\"\\\\])*\\\"",
42+
"priority": 6
43+
},
44+
{
45+
"tag": "Keyword",
46+
"pattern": "let|const|function|if|else|while|break|continue|return|as|type",
47+
"priority": 11
48+
},
49+
{
50+
"tag": "Operator",
51+
"pattern": "[+]{1,2}|[-]|[*]|[\/]|[%]|([!]|[=])[=]|([<]|[>])[=]?|[!]|[|]{2}|[&]{2}|[~]|[:]{2}",
52+
"priority": 12
53+
},
54+
{
55+
"tag": "Arrow",
56+
"pattern": "[=][>]",
57+
"priority": 13
58+
},
59+
{
60+
"tag": "Comma",
61+
"pattern": "[,]",
62+
"priority": 100
63+
},
64+
{
65+
"tag": "Dot",
66+
"pattern": "[.]",
67+
"priority": 105
68+
},
69+
{
70+
"tag": "LeftCurl",
71+
"pattern": "[{]",
72+
"priority": 101
73+
},
74+
{
75+
"tag": "RightCurl",
76+
"pattern": "[}]",
77+
"priority": 102
78+
},
79+
{
80+
"tag": "LeftParen",
81+
"pattern": "[(]",
82+
"priority": 103
83+
},
84+
{
85+
"tag": "RightParen",
86+
"pattern": "[)]",
87+
"priority": 104
88+
},
89+
{
90+
"tag": "LeftBracket",
91+
"pattern": "[[]",
92+
"priority": 107
93+
},
94+
{
95+
"tag": "RightBracket",
96+
"pattern": "[]]",
97+
"priority": 109
98+
},
99+
{
100+
"tag": "Assign",
101+
"pattern": "[=]",
102+
"priority": 99
103+
},
104+
{
105+
"tag": "QuestionMark",
106+
"pattern": "[?]",
107+
"priority": 90
108+
},
109+
{
110+
"tag": "Colon",
111+
"pattern": "[:]",
112+
"priority": 91
113+
},
114+
{
115+
"tag": "SemiColon",
116+
"pattern": "[;]",
117+
"priority": 92
118+
}
119+
]
120+
""";
118121
}
119122
}

‎Readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
![Code Coverage](https://img.shields.io/badge/Code%20Coverage-42%25-critical?style=flat)
1+
![Code Coverage](https://img.shields.io/badge/Code%20Coverage-43%25-critical?style=flat)
22

33
Package | Line Rate | Health
44
-------- | --------- | ------
5-
Interpreter.Lib | 40% | ❌
5+
Interpreter.Lib | 41% | ❌
66
Interpreter | 100% | ✔
7-
**Summary** | **42%** (925 / 2173) | ❌
7+
**Summary** | **43%** (925 / 2173) | ❌
88

99
_Minimum allowed line rate is `80%`_
1010

@@ -174,7 +174,7 @@ let s = v2d as string
174174
### Запуск
175175

176176
```
177-
Interpreter 1.1.5
177+
Interpreter 1.2.5
178178
Copyright (C) 2022 Interpreter
179179
USAGE:
180180
Simple interpretation call:

0 commit comments

Comments
 (0)