Skip to content

Commit d9a6ea9

Browse files
authored
Merge pull request #46 from WeihanLi/dev
2.2.0 preview 1
2 parents 9692f92 + 43c9031 commit d9a6ea9

35 files changed

+210
-137
lines changed

.github/workflows/dotnet-format.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
dotnet-version: |
1818
8.0.x
1919
9.0.x
20+
10.0.x
2021
- name: format
2122
run: dotnet format
2223
- name: check for changes

.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jobs:
1414
dotnet-version: |
1515
8.0.x
1616
9.0.x
17+
10.0.x
1718
- name: dotnet info
1819
run: dotnet --info
1920
- name: build

.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
dotnet-version: |
1616
8.0.x
1717
9.0.x
18+
10.0.x
1819
- name: Build
1920
shell: pwsh
2021
run: .\build.ps1 --stable=true

Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<RepositoryUrl>https://github.com/WeihanLi/WeihanLi.Web.Extensions</RepositoryUrl>
99
<Authors>WeihanLi</Authors>
1010
<Copyright>Copyright 2016-$([System.DateTime]::Now.Year) (c) WeihanLi</Copyright>
11-
<NoWarn>$(NoWarn);NU5048;</NoWarn>
11+
<NoWarn>$(NoWarn);NU5048;CS1591</NoWarn>
12+
<TargetFramework>net10.0</TargetFramework>
1213
</PropertyGroup>
1314
<ItemGroup>
1415
<Using Include="Microsoft.AspNetCore.Authentication" />

Directory.Packages.props

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@
22
<PropertyGroup>
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
<CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
5+
<!-- https://learn.microsoft.com/en-us/nuget/concepts/auditing-packages -->
6+
<NuGetAudit>true</NuGetAudit>
7+
<NuGetAuditMode>all</NuGetAuditMode>
8+
<!-- https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu1901-nu1904 -->
9+
<WarningsAsErrors>NU1901;NU1902;NU1903;NU1904</WarningsAsErrors>
10+
<AspNet8PackageVersion>8.0.14</AspNet8PackageVersion>
11+
<AspNet9PackageVersion>9.0.3</AspNet9PackageVersion>
12+
<AspNet10PackageVersion>10.0.0-preview.3.25172.1</AspNet10PackageVersion>
513
</PropertyGroup>
614
<ItemGroup>
7-
<PackageVersion Condition="'$(TargetFramework)'=='net8.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.11" />
8-
<PackageVersion Condition="'$(TargetFramework)'=='net9.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.0" />
9-
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
10-
<PackageVersion Include="Scalar.AspNetCore" Version="1.2.36" />
11-
<PackageVersion Include="WeihanLi.Common" Version="1.0.74-preview-20250104-034503" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15-
<PackageVersion Include="xunit" Version="2.9.2" />
16-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
15+
<PackageVersion Condition="'$(TargetFramework)'=='net8.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet8PackageVersion)" />
16+
<PackageVersion Condition="'$(TargetFramework)'=='net9.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet9PackageVersion)" />
17+
<PackageVersion Condition="'$(TargetFramework)'=='net10.0'" Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(AspNet10PackageVersion)" />
18+
<PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNet10PackageVersion)" />
19+
<PackageVersion Include="Scalar.AspNetCore" Version="2.1.17" />
20+
<PackageVersion Include="WeihanLi.Common" Version="1.0.77" />
1721
</ItemGroup>
1822
</Project>

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ASP.NET Core Web extensions
44

55
[![WeihanLi.Web.Extensions](https://img.shields.io/nuget/v/WeihanLi.Web.Extensions)](https://www.nuget.org/packages/WeihanLi.Web.Extensions/)
66

7-
[![Build Status](https://weihanli.visualstudio.com/Pipelines/_apis/build/status/WeihanLi.WeihanLi.Web.Extensions?branchName=dev)](https://weihanli.visualstudio.com/Pipelines/_build/latest?definitionId=19&branchName=dev)
7+
[![Azure Pipelines Build Status](https://weihanli.visualstudio.com/Pipelines/_apis/build/status/WeihanLi.WeihanLi.Web.Extensions?branchName=dev)](https://weihanli.visualstudio.com/Pipelines/_build/latest?definitionId=19&branchName=dev)
88

9-
[![Github Build Status](https://github.com/WeihanLi/WeihanLi.Web.Extensions/workflows/dotnetcore/badge.svg?branch=dev)](https://github.com/WeihanLi/WeihanLi.Web.Extensions/actions?query=workflow%3Adotnetcore+branch%3Adev)
9+
[![Github Actions Build Status](https://github.com/WeihanLi/WeihanLi.Web.Extensions/workflows/dotnetcore/badge.svg)](https://github.com/WeihanLi/WeihanLi.Web.Extensions/actions?query=workflow%3Adotnetcore)
1010

1111
## Features
1212

@@ -18,7 +18,8 @@ ASP.NET Core Web extensions
1818
- Authentication
1919
- Query
2020
- Header
21-
- Api-Key
21+
- ApiKey
2222
- Basic
23+
- Delegate
2324
- Feature Flag
2425
- `HttpContext` extensions

WeihanLi.Web.Extensions.sln

Lines changed: 0 additions & 48 deletions
This file was deleted.

WeihanLi.Web.Extensions.slnx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Solution>
2+
<Folder Name="/sample/">
3+
<Project Path="samples/WeihanLi.Web.Extensions.Samples/WeihanLi.Web.Extensions.Samples.csproj" />
4+
</Folder>
5+
<Folder Name="/src/">
6+
<Project Path="src/WeihanLi.Web.Extensions/WeihanLi.Web.Extensions.csproj" />
7+
</Folder>
8+
</Solution>

azure-pipelines.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ steps:
1818
inputs:
1919
packageType: sdk
2020
version: 9.0.x
21+
22+
- task: UseDotNet@2
23+
displayName: 'Use .NET 10 sdk'
24+
inputs:
25+
packageType: sdk
26+
version: 10.0.x
2127
includePreviewVersions: true
2228

2329
- script: dotnet --info

build/build.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
var noPush = CommandLineParser.BooleanVal("noPush", args);
55
var branchName = EnvHelper.Val("BUILD_SOURCEBRANCHNAME", "local");
66

7-
var solutionPath = "./WeihanLi.Web.Extensions.sln";
7+
var solutionPath = "./WeihanLi.Web.Extensions.slnx";
88
string[] srcProjects = [
99
"./src/WeihanLi.Web.Extensions/WeihanLi.Web.Extensions.csproj"
1010
];

0 commit comments

Comments
 (0)