diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json deleted file mode 100644 index b0e38ab..0000000 --- a/.config/dotnet-tools.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": {} -} \ No newline at end of file diff --git a/.editorconfig b/.editorconfig index 68f1dcb..9109ff0 100644 --- a/.editorconfig +++ b/.editorconfig @@ -200,7 +200,7 @@ dotnet_style_qualification_for_property = true:warning # 読み取り専用フィールドを許可する dotnet_style_readonly_field = false:warning # アクセシビリティ修飾子を要求する -dotnet_style_require_accessibility_modifiers = for_non_interface_members:warning +dotnet_style_require_accessibility_modifiers = always:warning [*.cs] # LINQクエリ式を揃える diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index 4345e73..c332d31 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -8,11 +8,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: | dotnet restore diff --git a/.github/workflows/publish-nuget.yaml b/.github/workflows/publish-nuget.yaml index 0d18289..d494ca8 100644 --- a/.github/workflows/publish-nuget.yaml +++ b/.github/workflows/publish-nuget.yaml @@ -12,11 +12,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v6 - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@v5 with: - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Restore dependencies run: | dotnet restore diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..09b9d17 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,9 @@ + + + + True + True + latest-recommended + + + diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..cdaa82f --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,19 @@ + + + + true + + + + + + + + + + + + + + + diff --git a/SharpChatwork.Test/SharpChatwork.Test.csproj b/SharpChatwork.Test/SharpChatwork.Test.csproj index bf8f234..b6f859a 100644 --- a/SharpChatwork.Test/SharpChatwork.Test.csproj +++ b/SharpChatwork.Test/SharpChatwork.Test.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable @@ -10,13 +10,13 @@ - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/SharpChatwork.sln b/SharpChatwork.sln deleted file mode 100644 index 1810f82..0000000 --- a/SharpChatwork.sln +++ /dev/null @@ -1,36 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33213.308 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C523F097-33FF-4484-A34E-C2D07DF63751}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpChatwork", "SharpChatwork\SharpChatwork.csproj", "{2F598CB8-DA5A-4739-BA71-30E075B32D61}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpChatwork.Test", "SharpChatwork.Test\SharpChatwork.Test.csproj", "{58167E26-09F4-4F9B-93B0-D5C12A63C6CB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2F598CB8-DA5A-4739-BA71-30E075B32D61}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F598CB8-DA5A-4739-BA71-30E075B32D61}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F598CB8-DA5A-4739-BA71-30E075B32D61}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F598CB8-DA5A-4739-BA71-30E075B32D61}.Release|Any CPU.Build.0 = Release|Any CPU - {58167E26-09F4-4F9B-93B0-D5C12A63C6CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58167E26-09F4-4F9B-93B0-D5C12A63C6CB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58167E26-09F4-4F9B-93B0-D5C12A63C6CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58167E26-09F4-4F9B-93B0-D5C12A63C6CB}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F6FDCA08-A797-4F2D-A494-D362B41DB282} - EndGlobalSection -EndGlobal diff --git a/SharpChatwork.slnx b/SharpChatwork.slnx new file mode 100644 index 0000000..e750a62 --- /dev/null +++ b/SharpChatwork.slnx @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SharpChatwork/SharpChatwork.csproj b/SharpChatwork/SharpChatwork.csproj index 33d171a..0905ed9 100644 --- a/SharpChatwork/SharpChatwork.csproj +++ b/SharpChatwork/SharpChatwork.csproj @@ -2,12 +2,9 @@ Library - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net10.0 12 disable - True - True - latest-recommended @@ -40,8 +37,8 @@ Release. - - + + diff --git a/SharpChatwork/src/Client/IChatworkClient.cs b/SharpChatwork/src/Client/IChatworkClient.cs index c959809..bded916 100644 --- a/SharpChatwork/src/Client/IChatworkClient.cs +++ b/SharpChatwork/src/Client/IChatworkClient.cs @@ -12,11 +12,11 @@ namespace SharpChatwork; public interface IChatworkClient { #pragma warning disable CA1716 - IMeQuery me { get; } + public IMeQuery me { get; } #pragma warning restore CA1716 - IRoomQuery room { get; } - IContactQuery contact { get; } - IIncomingRequestQuery incomingRequest { get; } + public IRoomQuery room { get; } + public IContactQuery contact { get; } + public IIncomingRequestQuery incomingRequest { get; } } public abstract class ChatworkClient : IChatworkClient diff --git a/SharpChatwork/src/Client/IQuery/IContactQuery.cs b/SharpChatwork/src/Client/IQuery/IContactQuery.cs index 0f625e4..e9b7f0f 100644 --- a/SharpChatwork/src/Client/IQuery/IContactQuery.cs +++ b/SharpChatwork/src/Client/IQuery/IContactQuery.cs @@ -7,5 +7,5 @@ namespace SharpChatwork.Query; public interface IContactQuery { - ValueTask> GetAllAsync(CancellationToken token = default); + public ValueTask> GetAllAsync(CancellationToken token = default); } diff --git a/SharpChatwork/src/Client/IQuery/IIncomingRequestQuery.cs b/SharpChatwork/src/Client/IQuery/IIncomingRequestQuery.cs index 7d8bfbd..8521262 100644 --- a/SharpChatwork/src/Client/IQuery/IIncomingRequestQuery.cs +++ b/SharpChatwork/src/Client/IQuery/IIncomingRequestQuery.cs @@ -7,7 +7,7 @@ namespace SharpChatwork.Query; public interface IIncomingRequestQuery { - ValueTask> GetAllAsync(CancellationToken token = default); - ValueTask AcceptAsync(long requestId, CancellationToken token = default); - ValueTask CancelAsync(long requestId, CancellationToken token = default); + public ValueTask> GetAllAsync(CancellationToken token = default); + public ValueTask AcceptAsync(long requestId, CancellationToken token = default); + public ValueTask CancelAsync(long requestId, CancellationToken token = default); } diff --git a/global.json b/global.json index 088e8bd..f46882a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.200", "rollForward": "latestFeature" } }