Skip to content

Commit e4491cd

Browse files
authored
add .net 10 target (#25)
1 parent 06227a5 commit e4491cd

File tree

62 files changed

+284
-2050
lines changed

Some content is hidden

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

62 files changed

+284
-2050
lines changed

.editorconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ indent_style = tab
7070
##########################################
7171

7272
# Note that you must have the relevant Windows language pack installed on your machine for this to work.
73-
spelling_languages = en-GB # NEW
73+
spelling_languages = en # NEW
7474
spelling_error_severity = information # NEW
7575
spelling_checkable_types = # NEW
7676

@@ -129,7 +129,7 @@ dotnet_style_predefined_type_for_locals_parameters_members = true # NEW
129129
dotnet_style_predefined_type_for_member_access = true # NEW
130130

131131
# Modifier preferences
132-
dotnet_style_require_accessibility_modifiers = always # NEW
132+
dotnet_style_require_accessibility_modifiers = for_non_interface_members # NEW
133133

134134
# Parameter preferences
135135
dotnet_code_quality_unused_parameters = all
@@ -522,4 +522,4 @@ dotnet_naming_rule.parameters_rule.severity = warning
522522
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
523523
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
524524
# OTHER DEALINGS IN THE SOFTWARE.
525-
##########################################
525+
##########################################

.github/CONTRIBUTING.md

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

33
# Steps to contribute
44

5-
If you want to make a small change, go ahead and raise a pull request, otherwise follow these steps:
5+
If you want to make a small change, go ahead and raise a pull request, otherwise follow these steps:
66

77
1. View the [Issues](https://github.com/TimmyMC/Schema.NET/issues) page to see a To-Do list of things to be implemented.
88
2. Raise an issue or comment on an existing issue with what you want to contribute if one does not already exist.
@@ -11,9 +11,5 @@
1111

1212
# Coding Guidelines
1313

14-
- Projects use StyleCop and .editorconfig to produce style warnings. Please fix all warnings in any code you submit.
14+
- Projects use .editorconfig to produce style warnings. Please fix all warnings in any code you submit.
1515
- Write unit tests for any code written.
16-
17-
# Special Thanks
18-
19-
As thanks for all contributions, your username will be posted to the front page of the project with a short description of how you helped.

.github/workflows/build.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,16 @@ jobs:
2929
os: [ubuntu-latest, windows-latest, macOS-latest]
3030
steps:
3131
- name: "Checkout"
32-
uses: actions/checkout@v5.0.1
32+
uses: actions/checkout@v6
3333
with:
3434
lfs: true
3535
fetch-depth: 0
36-
- name: "Install .NET 8.0 SDK"
36+
- name: "Setup dotnet"
3737
uses: actions/[email protected]
3838
with:
39-
dotnet-version: 8.0.x
39+
dotnet-version: |
40+
8.0.x
41+
10.0.x
4042
- name: "Dotnet Tool Restore"
4143
run: dotnet tool restore
4244
shell: pwsh
@@ -84,6 +86,7 @@ jobs:
8486
url: https://github.com/TimmyMC/Schema.NET/packages
8587
permissions:
8688
packages: write
89+
id-token: write
8790
runs-on: windows-latest
8891
steps:
8992
- name: "Download Artefact"
@@ -110,9 +113,14 @@ jobs:
110113
uses: actions/[email protected]
111114
with:
112115
name: "windows-latest"
116+
- name: NuGet login (OIDC → temp API key)
117+
uses: NuGet/login@v1
118+
id: login
119+
with:
120+
user: "TimmyMC"
113121
- name: "Dotnet NuGet Push"
114122
run: |
115123
Get-ChildItem .\ -Filter *.nupkg |
116124
Where-Object { !$_.Name.Contains('preview') } |
117-
ForEach-Object { dotnet nuget push $_ --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{secrets.NUGET_API_KEY}} }
125+
ForEach-Object { dotnet nuget push $_ --source https://api.nuget.org/v3/index.json --skip-duplicate --api-key ${{ steps.login.outputs.NUGET_API_KEY }} }
118126
shell: pwsh

Benchmarks/.editorconfig

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,6 @@
88
# https://github.com/dotnet/aspnetcore/issues/47912
99
dotnet_diagnostic.IDE0005.severity = none
1010

11-
##########################################
12-
# StyleCop
13-
##########################################
14-
15-
[*]
16-
# SA0001: XML comment analysis is disabled due to project configuration
17-
# Justification: Comments turned off
18-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA0001.md
19-
dotnet_diagnostic.SA0001.severity = none
20-
21-
[*.cs]
22-
# SA1600: A C# code element is missing a documentation header.
23-
# Justification: Comments turned off
24-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1600.md
25-
dotnet_diagnostic.SA1600.severity = none
26-
27-
# SA1601: A C# partial element is missing a documentation header.
28-
# Justification: Comments turned off
29-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1601.md
30-
dotnet_diagnostic.SA1601.severity = none
31-
32-
# SA1602: An item within a C# enumeration is missing an XML documentation header.
33-
# Justification: Comments turned off
34-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1602.md
35-
dotnet_diagnostic.SA1602.severity = none
36-
37-
# SA1633: A C# code file is missing a standard file header.
38-
# Justification: Comments turned off
39-
# https://github.com/DotNetAnalyzers/StyleCopAnalyzers/blob/master/documentation/SA1633.md
40-
dotnet_diagnostic.SA1633.severity = none
41-
4211
# CA1515: Consider making public types internal
12+
# Justification: Won't be exposed in the NuGet packages
4313
dotnet_diagnostic.CA1515.severity = none

Benchmarks/Schema.NET.Benchmarks/Schema.NET.Benchmarks.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
<PropertyGroup Label="Build">
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>net8.0;net48</TargetFrameworks>
65
<IsPackable>false</IsPackable>
7-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
86
</PropertyGroup>
97

108
<ItemGroup Label="Project References">

Benchmarks/Schema.NET.Benchmarks/SchemaBenchmarkBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace Schema.NET.Benchmarks;
1313
[CsvMeasurementsExporter]
1414
[RPlotExporter]
1515
[SimpleJob(RuntimeMoniker.Net80)]
16-
[SimpleJob(RuntimeMoniker.Net48)]
16+
[SimpleJob(RuntimeMoniker.Net10_0)]
1717
public abstract class SchemaBenchmarkBase
1818
{
1919
public Thing Thing { get; set; } = default!;

0 commit comments

Comments
 (0)