Skip to content
Draft
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: 3 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": ".NET 9.0 + .NET 8.0",
"name": ".NET 10.0 + .NET 9.0 + .NET 8.0",
"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:9.0",
"customizations": {
"vscode": {
Expand All @@ -10,7 +10,8 @@
"remoteUser": "vscode",
"features": {
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "8.0"
"version": "10.0",
"additionalVersions": ["8.0"]
}
}
}
11 changes: 10 additions & 1 deletion .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
# TODO: Remove this step
- name: Setup .NET 10.0 SDK # detected from global.json
uses: actions/[email protected]
- name: Setup .NET SDK
uses: actions/[email protected]
with:
Expand All @@ -55,6 +58,9 @@ jobs:
- macos-15-intel
steps:
- uses: actions/[email protected]
# TODO: Remove this step
- name: Setup .NET 10.0 SDK # detected from global.json
uses: actions/[email protected]
- name: Setup .NET SDK
uses: actions/[email protected]
with:
Expand All @@ -74,4 +80,7 @@ jobs:
token: ${{ secrets.CODECOV_TOKEN }}
flags: ${{ runner.os }},${{ runner.arch }}
disable_search: true
files: ${{ format(vars.TEST_ASSET_FOLDERS, 'net9.0', vars.COVERAGE_REPORT_FILE) }},${{ format(vars.TEST_ASSET_FOLDERS, 'net8.0', vars.COVERAGE_REPORT_FILE) }}
files: |
${{ format(vars.TEST_ASSET_FOLDERS, 'net10.0', vars.COVERAGE_REPORT_FILE) }},
${{ format(vars.TEST_ASSET_FOLDERS, 'net9.0', vars.COVERAGE_REPORT_FILE) }},
${{ format(vars.TEST_ASSET_FOLDERS, 'net8.0', vars.COVERAGE_REPORT_FILE) }}
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="5.0.0-1.25277.114" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0-rc.1.25451.107" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.9.0" />
<PackageVersion Include="Moq" Version="4.20.72" />
<PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
<PackageVersion Include="RandomFixtureKit" Version="1.0.1" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="System.Net.Http.Json" Version="9.0.9" />
<PackageVersion Include="System.Text.Json" Version="9.0.9" />
<PackageVersion Include="System.Net.Http.Json" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="System.Text.Json" Version="10.0.0-rc.1.25451.107" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"sdk": {
"version": "9.0.200",
"version": "10.0.100-0",
"rollForward": "latestFeature",
"allowPrerelease": false
"allowPrerelease": true
},
"msbuild-sdks": {
"MSTest.Sdk": "3.10.4"
Expand Down
8 changes: 4 additions & 4 deletions sandbox/ConsoleAppSample/ConsoleAppSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand All @@ -11,9 +11,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ConsoleAppFramework">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PackageReference Include="ConsoleAppFramework">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
<PackageReference Include="Microsoft.Extensions.Http" />
Expand Down
239 changes: 99 additions & 140 deletions sandbox/ConsoleAppSample/packages.lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion sandbox/WebhookReceiverSample/WebhookReceiverSample.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Kaonavi.NET.Core/Kaonavi.NET.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<Description>Core Libraries of Kaonavi.NET</Description>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RootNamespace>Kaonavi.Net</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion src/Kaonavi.NET.Server/Kaonavi.NET.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<RootNamespace>Kaonavi.Net.Server</RootNamespace>

<Description>Server side parser for Kaonavi Webhook</Description>
Expand Down
2 changes: 1 addition & 1 deletion src/Kaonavi.NET/Kaonavi.NET.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<!-- This project is meta package -->
<IncludeBuildOutput>false</IncludeBuildOutput>
<IncludeContentInPack>true</IncludeContentInPack>
Expand Down
30 changes: 15 additions & 15 deletions test/Kaonavi.NET.Generator.Tests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
},
"System.Text.Json": {
"type": "Direct",
"requested": "[9.0.9, )",
"resolved": "9.0.9",
"contentHash": "NEnpppwq67fRz/OvQRxsEMgetDJsxlxpEsAFO/4PZYbAyAMd4Ol6KS7phc8uDoKPsnbdzRLKobpX303uQwCqdg==",
"requested": "[10.0.0-rc.1.25451.107, )",
"resolved": "10.0.0-rc.1.25451.107",
"contentHash": "sYKU72lwIRQ/SUF3sgzO6CgWXiIgdNTi/HtPTnyL6UotT+D8XdSFDsjPdLFShUVj9+RfLCK0U6ZtLLApjkwjbA==",
"dependencies": {
"System.IO.Pipelines": "9.0.9",
"System.Text.Encodings.Web": "9.0.9"
"System.IO.Pipelines": "10.0.0-rc.1.25451.107",
"System.Text.Encodings.Web": "10.0.0-rc.1.25451.107"
}
},
"DiffEngine": {
Expand Down Expand Up @@ -241,8 +241,8 @@
},
"System.IO.Pipelines": {
"type": "Transitive",
"resolved": "9.0.9",
"contentHash": "VySjpsCLprojvat550Flrm3NQB982CPuDzILajqjQihFmrQXZPdQyktIbcpVPJyaExFYtAfY1DpwMdWQuS0kbw=="
"resolved": "10.0.0-rc.1.25451.107",
"contentHash": "5CplABcE9o3p+mflW0H9NagzQV91wsyE/lRaGcnyG4Q0O7tUN2grg+8ZRQo0N7b2uMaR3zHWY/sIasEtRc2q8A=="
},
"System.Management": {
"type": "Transitive",
Expand Down Expand Up @@ -272,14 +272,14 @@
},
"System.Text.Encodings.Web": {
"type": "Transitive",
"resolved": "9.0.9",
"contentHash": "bzYTmAcmfelUOCBxvbgsfSr2tq94ydA2gJZAxZRcuNa0LlmlVz8JNHst6RG1qsDujyVYT4vjv06y8sCLbvCXdg=="
"resolved": "10.0.0-rc.1.25451.107",
"contentHash": "z7W4oRHTRULSL183yhz4cOY13GSKCVvWuAO3OBpqFPWg2TyO/BJJ8rQX5ShecYK79RRj7+SjmUDrBWWPGbWcsQ=="
},
"kaonavi.net.core": {
"type": "Project",
"dependencies": {
"System.Net.Http.Json": "[9.0.9, )",
"System.Text.Json": "[9.0.9, )"
"System.Net.Http.Json": "[10.0.0-preview.3.25171.5, )",
"System.Text.Json": "[10.0.0-rc.1.25451.107, )"
}
},
"kaonavi.net.generator": {
Expand All @@ -293,11 +293,11 @@
},
"System.Net.Http.Json": {
"type": "CentralTransitive",
"requested": "[9.0.9, )",
"resolved": "9.0.9",
"contentHash": "Plss2+D6djmOMTkx/TbJ6vuz1bHjrhMXSj5DsjeWgK0PMRFPuc1Jo0TlFtgzbP3tMlG5U6Q+xB6ZwtMKRe1Ppw==",
"requested": "[10.0.0-preview.3.25171.5, )",
"resolved": "10.0.0-preview.3.25171.5",
"contentHash": "SR/Dpq2XfD1URuOb+qkvaPgCZ63cCojjILGvBJ3nCXWTBCltL/zNUyhRmOXecs9dLMzseJaRR55xQWdZBEgfXw==",
"dependencies": {
"System.Text.Json": "9.0.9"
"System.Text.Json": "10.0.0-preview.3.25171.5"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/Kaonavi.NET.Server.Tests/Kaonavi.NET.Server.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSTest.Sdk">

<PropertyGroup>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<RootNamespace>Kaonavi.Net.Server.Tests</RootNamespace>
</PropertyGroup>

Expand All @@ -10,7 +10,7 @@
<PackageReference Include="Moq" />
<PackageReference Include="RandomFixtureKit" />
<PackageReference Include="Shouldly" />
<PackageReference Include="System.Text.Json" />
<PackageReference Include="System.Text.Json" Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading