Onboard repo to the .NET 10 sdk (#822)
* Onboard repo to the .NET 10 sdk * Remove redundant property. * Remove console logger * Disabling failing tests in .NET 10.
This commit is contained in:
parent
7c66faaef6
commit
7628b3064f
14 changed files with 37 additions and 14 deletions
|
|
@ -3,7 +3,7 @@
|
||||||
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-jammy",
|
"image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-jammy",
|
||||||
"features": {
|
"features": {
|
||||||
"ghcr.io/devcontainers/features/dotnet:2": {
|
"ghcr.io/devcontainers/features/dotnet:2": {
|
||||||
"version": "9.0"
|
"version": "10.0"
|
||||||
},
|
},
|
||||||
"ghcr.io/devcontainers/features/node:1": {}
|
"ghcr.io/devcontainers/features/node:1": {}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
3
.github/workflows/ci-build-test.yml
vendored
3
.github/workflows/ci-build-test.yml
vendored
|
|
@ -43,8 +43,8 @@ jobs:
|
||||||
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
8.0.x
|
|
||||||
|
|
||||||
# NetFX testing on non-Windows requires mono
|
# NetFX testing on non-Windows requires mono
|
||||||
- name: Setup Mono
|
- name: Setup Mono
|
||||||
|
|
@ -78,7 +78,6 @@ jobs:
|
||||||
--filter '(Execution!=Manual)'
|
--filter '(Execution!=Manual)'
|
||||||
--no-build
|
--no-build
|
||||||
--configuration ${{ matrix.configuration }}
|
--configuration ${{ matrix.configuration }}
|
||||||
--logger "console;verbosity=normal"
|
|
||||||
--logger "trx"
|
--logger "trx"
|
||||||
--logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
|
--logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true"
|
||||||
--blame
|
--blame
|
||||||
|
|
|
||||||
2
.github/workflows/ci-code-coverage.yml
vendored
2
.github/workflows/ci-code-coverage.yml
vendored
|
|
@ -15,8 +15,8 @@ jobs:
|
||||||
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
||||||
with:
|
with:
|
||||||
dotnet-version: |
|
dotnet-version: |
|
||||||
|
10.0.x
|
||||||
9.0.x
|
9.0.x
|
||||||
8.0.x
|
|
||||||
|
|
||||||
- name: Download test results
|
- name: Download test results
|
||||||
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
|
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
|
||||||
|
|
|
||||||
4
.github/workflows/docs.yml
vendored
4
.github/workflows/docs.yml
vendored
|
|
@ -32,7 +32,9 @@ jobs:
|
||||||
- name: .NET Setup
|
- name: .NET Setup
|
||||||
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.x
|
dotnet-version: |
|
||||||
|
10.0.x
|
||||||
|
9.0.x
|
||||||
|
|
||||||
- name: Generate documentation
|
- name: Generate documentation
|
||||||
run: make generate-docs
|
run: make generate-docs
|
||||||
|
|
|
||||||
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
|
|
@ -52,7 +52,9 @@ jobs:
|
||||||
- name: Set up .NET
|
- name: Set up .NET
|
||||||
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
|
||||||
with:
|
with:
|
||||||
dotnet-version: 9.0.x
|
dotnet-version: |
|
||||||
|
10.0.x
|
||||||
|
9.0.x
|
||||||
|
|
||||||
- name: Build
|
- name: Build
|
||||||
run: dotnet build --configuration ${{ matrix.configuration }}
|
run: dotnet build --configuration ${{ matrix.configuration }}
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,15 @@
|
||||||
<PackageVersion Include="System.IO.Pipelines" Version="$(System9Version)" />
|
<PackageVersion Include="System.IO.Pipelines" Version="$(System9Version)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<!-- Product dependencies .NET 10 -->
|
||||||
|
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
|
||||||
|
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(System10Version)" />
|
||||||
|
<PackageVersion Include="Microsoft.IdentityModel.Tokens" Version="8.9.0" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(System10Version)" />
|
||||||
|
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="$(System10Version)" />
|
||||||
|
<PackageVersion Include="System.IO.Pipelines" Version="$(System10Version)" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Product dependencies shared -->
|
<!-- Product dependencies shared -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
|
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="$(MicrosoftExtensionsAIVersion)" />
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
"sdk": {
|
"sdk": {
|
||||||
"version": "9.0.204",
|
"version": "10.0.100-rc.1",
|
||||||
"rollForward": "minor"
|
"rollForward": "minor",
|
||||||
|
"allowPrerelease": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net9.0;net8.0;net472</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0;net472</TargetFrameworks>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<PublishAot Condition="'$(TargetFramework)' == 'net9.0'">true</PublishAot>
|
<PublishAot Condition="'$(TargetFramework)' == 'net9.0'">true</PublishAot>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk">
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,11 @@ public class StreamableHttpServerConformanceTests(ITestOutputHelper outputHelper
|
||||||
base.Dispose();
|
base.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !NET10_0
|
||||||
[Fact]
|
[Fact]
|
||||||
|
#else
|
||||||
|
[Fact(Skip = "https://github.com/modelcontextprotocol/csharp-sdk/issues/823")]
|
||||||
|
#endif
|
||||||
public async Task NegativeNonInfiniteIdleTimeout_Throws_ArgumentOutOfRangeException()
|
public async Task NegativeNonInfiniteIdleTimeout_Throws_ArgumentOutOfRangeException()
|
||||||
{
|
{
|
||||||
Builder.Services.AddMcpServer().WithHttpTransport(options =>
|
Builder.Services.AddMcpServer().WithHttpTransport(options =>
|
||||||
|
|
@ -69,7 +73,11 @@ public class StreamableHttpServerConformanceTests(ITestOutputHelper outputHelper
|
||||||
Assert.Contains("IdleTimeout", ex.Message);
|
Assert.Contains("IdleTimeout", ex.Message);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !NET10_0
|
||||||
[Fact]
|
[Fact]
|
||||||
|
#else
|
||||||
|
[Fact(Skip = "https://github.com/modelcontextprotocol/csharp-sdk/issues/823")]
|
||||||
|
#endif
|
||||||
public async Task NegativeMaxIdleSessionCount_Throws_ArgumentOutOfRangeException()
|
public async Task NegativeMaxIdleSessionCount_Throws_ArgumentOutOfRangeException()
|
||||||
{
|
{
|
||||||
Builder.Services.AddMcpServer().WithHttpTransport(options =>
|
Builder.Services.AddMcpServer().WithHttpTransport(options =>
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net9.0;net8.0;net472</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0;net472</TargetFrameworks>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AssemblyName>TestServer</AssemblyName>
|
<AssemblyName>TestServer</AssemblyName>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<AssemblyName>TestSseServer</AssemblyName>
|
<AssemblyName>TestSseServer</AssemblyName>
|
||||||
|
|
|
||||||
|
|
@ -2,13 +2,15 @@
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputType>Exe</OutputType>
|
<OutputType>Exe</OutputType>
|
||||||
<TargetFrameworks>net9.0;net8.0;net472</TargetFrameworks>
|
<TargetFrameworks>net10.0;net9.0;net8.0;net472</TargetFrameworks>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|
||||||
<IsPackable>false</IsPackable>
|
<IsPackable>false</IsPackable>
|
||||||
<IsTestProject>true</IsTestProject>
|
<IsTestProject>true</IsTestProject>
|
||||||
<RootNamespace>ModelContextProtocol.Tests</RootNamespace>
|
<RootNamespace>ModelContextProtocol.Tests</RootNamespace>
|
||||||
|
<!-- https://github.com/dotnet/sdk/issues/51060 -->
|
||||||
|
<NoWarn>$(NoWarn);NU1903;NU1902</NoWarn>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
<PropertyGroup Condition="'$(TargetFramework)' == 'net9.0'">
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue