Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .config/dotnet-tools.json

This file was deleted.

2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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クエリ式を揃える
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-nuget.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<PropertyGroup>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest-recommended</AnalysisLevel>
</PropertyGroup>

</Project>
19 changes: 19 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<Project>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="MimeMapping" Version="4.0.0" />
<PackageVersion Include="System.Text.Json" Version="10.0.8" />
</ItemGroup>

<ItemGroup Label="Test">
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
<PackageVersion Include="xunit" Version="2.9.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
<PackageVersion Include="coverlet.collector" Version="10.0.0" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions SharpChatwork.Test/SharpChatwork.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -10,13 +10,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.2">
<PackageReference Include="coverlet.collector">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
36 changes: 0 additions & 36 deletions SharpChatwork.sln

This file was deleted.

7 changes: 7 additions & 0 deletions SharpChatwork.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
</Folder>
<Project Path="SharpChatwork.Test/SharpChatwork.Test.csproj" />
<Project Path="SharpChatwork/SharpChatwork.csproj" />
</Solution>
9 changes: 3 additions & 6 deletions SharpChatwork/SharpChatwork.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net10.0</TargetFrameworks>
<LangVersion>12</LangVersion>
<Nullable>disable</Nullable>
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
<EnableNETAnalyzers>True</EnableNETAnalyzers>
<AnalysisLevel>latest-recommended</AnalysisLevel>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -40,8 +37,8 @@ Release.</PackageReleaseNotes>
</ItemGroup>

<ItemGroup>
<PackageReference Include="MimeMapping" Version="3.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.5" />
<PackageReference Include="MimeMapping" />
<PackageReference Include="System.Text.Json" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions SharpChatwork/src/Client/IChatworkClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SharpChatwork/src/Client/IQuery/IContactQuery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ namespace SharpChatwork.Query;

public interface IContactQuery
{
ValueTask<IEnumerable<Contact>> GetAllAsync(CancellationToken token = default);
public ValueTask<IEnumerable<Contact>> GetAllAsync(CancellationToken token = default);
}
6 changes: 3 additions & 3 deletions SharpChatwork/src/Client/IQuery/IIncomingRequestQuery.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace SharpChatwork.Query;

public interface IIncomingRequestQuery
{
ValueTask<IEnumerable<IncomingRequest>> GetAllAsync(CancellationToken token = default);
ValueTask<IncomingRequest> AcceptAsync(long requestId, CancellationToken token = default);
ValueTask CancelAsync(long requestId, CancellationToken token = default);
public ValueTask<IEnumerable<IncomingRequest>> GetAllAsync(CancellationToken token = default);
public ValueTask<IncomingRequest> AcceptAsync(long requestId, CancellationToken token = default);
public ValueTask CancelAsync(long requestId, CancellationToken token = default);
}
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"version": "10.0.200",
"rollForward": "latestFeature"
}
}
Loading