Skip to content

Commit 5bdd04b

Browse files
tsIgovtsIgov
authored
Merge pull request #3 from Byteology/net6-migration
.NET 6 migration
2 parents c561d96 + d89d44e commit 5bdd04b

19 files changed

+1061
-1013
lines changed

‎.editorconfig‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,41 @@
1+
[*]
2+
charset = utf-8
3+
end_of_line = lf
4+
insert_final_newline = true
5+
indent_style = tab
6+
indent_size = tab
7+
tab_width = 4
8+
9+
[{*.yaml,*.yml}]
10+
indent_style = space
11+
indent_size = 2
12+
113
[*.cs]
214

315
# symbols
4-
dotnet_naming_symbols.private_methods.applicable_kinds = method
16+
dotnet_naming_symbols.private_methods.applicable_kinds = method
517
dotnet_naming_symbols.private_methods.applicable_accessibilities = private
618

7-
dotnet_naming_symbols.private_fields.applicable_kinds = field
19+
dotnet_naming_symbols.private_fields.applicable_kinds = field
820
dotnet_naming_symbols.private_fields.applicable_accessibilities = private
921

1022
# naming styles
1123
dotnet_naming_style.camel_case_style.capitalization = camel_case
1224

13-
dotnet_naming_style.underscore_camel_case.capitalization = camel_case
14-
dotnet_naming_style.underscore_camel_case.required_prefix = _
25+
dotnet_naming_style.underscore_camel_case.capitalization = camel_case
26+
dotnet_naming_style.underscore_camel_case.required_prefix = _
1527

1628
# naming rules
1729
dotnet_naming_rule.private_methods_camel_case.symbols = private_methods
18-
dotnet_naming_rule.private_methods_camel_case.style = camel_case_style
30+
dotnet_naming_rule.private_methods_camel_case.style = camel_case_style
1931
dotnet_naming_rule.private_methods_camel_case.severity = suggestion
2032

2133
dotnet_naming_rule.private_fields_underscore_camel_case.symbols = private_fields
22-
dotnet_naming_rule.private_fields_underscore_camel_case.style = underscore_camel_case
34+
dotnet_naming_rule.private_fields_underscore_camel_case.style = underscore_camel_case
2335
dotnet_naming_rule.private_fields_underscore_camel_case.severity = suggestion
2436

37+
# Sonar
2538

26-
27-
dotnet_diagnostic.IDE0003.severity = suggestion
28-
dotnet_diagnostic.CA1825.severity = none
29-
30-
dotnet_diagnostic.S1186.severity = none # does not allow empty methods
31-
dotnet_diagnostic.S3011.severity = none # does not allow reflection of private members
32-
dotnet_diagnostic.S3267.severity = none # Loops should be simplified by LINQ
39+
# Bug, S3903:Types should be defined in named namespaces
40+
# Doesn't take into consideration file scoped namespaces
41+
dotnet_diagnostic.S3903.severity = none

‎.gitattributes‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto
3+
4+
*.cs text diff=csharp
5+
*.cshtml text diff=html
6+
*.csx text diff=csharp
7+
*.sln text eol=crlf
8+
*.csproj text eol=crlf

‎.github/workflows/push-action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v1
1717
with:
18-
dotnet-version: 5.0.x
18+
dotnet-version: 6.0.x
1919

2020
- name: Checkout
2121
uses: actions/checkout@v2

‎.github/workflows/release-action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Setup .NET
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 5.0.x
15+
dotnet-version: 6.0.x
1616

1717
- name: Checkout
1818
uses: actions/checkout@v2
@@ -33,10 +33,10 @@ jobs:
3333
run: |
3434
dotnet nuget push ./out/*.nupkg \
3535
-s https://nuget.pkg.github.com/Byteology/index.json -k ${{ secrets.GITHUB_TOKEN }} \
36-
--skip-duplicate --no-symbols true
36+
--skip-duplicate --no-symbols
3737
3838
- name: Push package - NuGet.org
3939
run: |
4040
dotnet nuget push ./out/*.nupkg \
4141
-s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_API_KEY }} \
42-
--skip-duplicate --no-symbols true
42+
--skip-duplicate --no-symbols

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
bin
22
obj
3-
.vs
3+
.vs
4+
.idea
5+
**.DotSettings
6+
**.DotSettings.user

‎Byteology.TypedHttpClients.Tests/Byteology.TypedHttpClients.Tests.csproj‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
6-
<IsPackable>false</IsPackable>
7-
</PropertyGroup>
8-
9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
11-
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
<PrivateAssets>all</PrivateAssets>
15-
</PackageReference>
16-
<PackageReference Include="coverlet.collector" Version="3.1.0">
17-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18-
<PrivateAssets>all</PrivateAssets>
19-
</PackageReference>
20-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.30.0.37606">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23-
</PackageReference>
24-
</ItemGroup>
25-
26-
<ItemGroup>
27-
<ProjectReference Include="..\Byteology.TypedHttpClients\Byteology.TypedHttpClients.csproj" />
28-
</ItemGroup>
29-
30-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
6+
<IsPackable>false</IsPackable>
7+
8+
<Nullable>enable</Nullable>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
13+
<PackageReference Include="xunit" Version="2.4.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
<PrivateAssets>all</PrivateAssets>
17+
</PackageReference>
18+
<PackageReference Include="coverlet.collector" Version="3.1.0">
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
<PrivateAssets>all</PrivateAssets>
21+
</PackageReference>
22+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.30.0.37606">
23+
<PrivateAssets>all</PrivateAssets>
24+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
25+
</PackageReference>
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<ProjectReference Include="..\Byteology.TypedHttpClients\Byteology.TypedHttpClients.csproj" />
30+
</ItemGroup>
31+
32+
</Project>

0 commit comments

Comments
 (0)