Skip to content

Commit 4e17153

Browse files
msmolkamsmolka
committed
Added support for .net 10, drop support for .3.1 and 5.0
1 parent 6c52782 commit 4e17153

File tree

10 files changed

+66
-90
lines changed

10 files changed

+66
-90
lines changed

‎.github/workflows/dotnetcore.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,15 @@ jobs:
1111
matrix:
1212
os: [ubuntu-latest, windows-latest]
1313
steps:
14-
- name: Setup .NET Core 3.1
14+
- name: Setup .NET Core
1515
uses: actions/setup-dotnet@v4
1616
with:
1717
dotnet-version: |
18-
3.1.x
19-
5.0.x
2018
6.0.x
2119
7.0.x
2220
8.0.x
2321
9.0.x
22+
10.0.x
2423
- name: Checkout
2524
uses: actions/checkout@v4
2625
- name: Build

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 - 2020 Marcin Smółka
3+
Copyright (c) 2017 - 2025 Marcin Smółka
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎ZNetCS.AspNetCore.Authentication.Basic.sln‎

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

‎ZNetCS.AspNetCore.Authentication.Basic.slnx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Solution>
2+
<Folder Name="/build/">
3+
<File Path="src/Directory.Build.props" />
4+
<File Path="src/StrongNameKey.snk" />
5+
</Folder>
6+
<Folder Name="/config/">
7+
<File Path=".editorconfig" />
8+
<File Path=".gitignore" />
9+
<File Path="LICENSE" />
10+
<File Path="README.md" />
11+
<File Path="stylecop.json" />
12+
</Folder>
13+
<Folder Name="/pipelines/">
14+
<File Path=".github/workflows/dotnetcore.yml" />
15+
</Folder>
16+
<Folder Name="/src/">
17+
<Project Path="src/ZNetCS.AspNetCore.Authentication.Basic/ZNetCS.AspNetCore.Authentication.Basic.csproj" />
18+
</Folder>
19+
<Folder Name="/test/">
20+
<Project Path="test/ZNetCS.AspNetCore.Authentication.BasicTests/ZNetCS.AspNetCore.Authentication.BasicTests.csproj" />
21+
</Folder>
22+
</Solution>

‎src/Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>9.0.0</Version>
4-
<PackageReleaseNotes>Added support for .net core 7, 8, and 9</PackageReleaseNotes>
3+
<Version>10.0.0</Version>
4+
<PackageReleaseNotes>Added support for .net core 10, drop support for .net 3.1 and 5.0</PackageReleaseNotes>
55
</PropertyGroup>
66

77
<PropertyGroup>
@@ -10,7 +10,7 @@
1010
<Description>A simple basic authentication middleware.</Description>
1111
<Authors>Marcin Smółka</Authors>
1212
<Owners>Marcin Smółka</Owners>
13-
<Copyright>Copyright © Marcin Smółka 2017 - 2024</Copyright>
13+
<Copyright>Copyright © Marcin Smółka 2017 - 2025</Copyright>
1414
<Company>Marcin Smółka zNET Computer Solutions</Company>
1515
</PropertyGroup>
1616

@@ -44,7 +44,7 @@
4444

4545
<ItemGroup>
4646
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
47-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
47+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.100">
4848
<PrivateAssets>all</PrivateAssets>
4949
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
5050
</PackageReference>

‎src/ZNetCS.AspNetCore.Authentication.Basic/ZNetCS.AspNetCore.Authentication.Basic.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<AssemblyName>ZNetCS.AspNetCore.Authentication.Basic</AssemblyName>
5-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎test/ZNetCS.AspNetCore.Authentication.BasicTests/Assembly.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
using Microsoft.VisualStudio.TestTools.UnitTesting;
2+
3+
[assembly: Parallelize]

‎test/ZNetCS.AspNetCore.Authentication.BasicTests/MvcTestingAppManifest.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"ZNetCS.AspNetCore.Authentication.BasicTests, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null": "~/"
3+
}

‎test/ZNetCS.AspNetCore.Authentication.BasicTests/StartupWebApplicationFactory.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,9 @@ namespace ZNetCS.AspNetCore.Authentication.BasicTests;
1111
using System.IO;
1212
using System.Reflection;
1313

14-
using Microsoft.AspNetCore.Builder;
1514
using Microsoft.AspNetCore.Hosting;
1615
using Microsoft.AspNetCore.Mvc.Testing;
17-
using Microsoft.Extensions.DependencyInjection;
16+
using Microsoft.AspNetCore.TestHost;
1817
using Microsoft.Extensions.Hosting;
1918
using Microsoft.Extensions.Logging;
2019

‎test/ZNetCS.AspNetCore.Authentication.BasicTests/ZNetCS.AspNetCore.Authentication.BasicTests.csproj‎

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<Authors>Marcin Smółka</Authors>
5-
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<LangVersion>latest</LangVersion>
88
<Nullable>enable</Nullable>
@@ -14,46 +14,55 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
20-
<PackageReference Include="coverlet.collector" Version="6.0.2">
17+
<PackageReference Include="coverlet.collector" Version="6.0.4">
2118
<PrivateAssets>all</PrivateAssets>
2219
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2320
</PackageReference>
24-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
25-
<PrivateAssets>all</PrivateAssets>
26-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27-
</PackageReference>
28-
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
29-
<PrivateAssets>all</PrivateAssets>
30-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
31-
</PackageReference>
32-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
33-
</ItemGroup>
34-
35-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
36-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.22" />
3721
</ItemGroup>
3822

3923
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
24+
<PackageReference Include="MSTest.TestAdapter" Version="3.11.1" />
25+
<PackageReference Include="MSTest.TestFramework" Version="3.11.1" />
4026
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.36" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
4128
</ItemGroup>
4229

4330
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
31+
<PackageReference Include="MSTest.TestAdapter" Version="3.11.1" />
32+
<PackageReference Include="MSTest.TestFramework" Version="3.11.1" />
4433
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.20" />
34+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
4535
</ItemGroup>
4636

4737
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
48-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.11" />
38+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
39+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
40+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.22" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4942
</ItemGroup>
5043

5144
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
52-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
45+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
46+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
47+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
48+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
49+
</ItemGroup>
50+
51+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
52+
<PackageReference Include="MSTest.TestAdapter" Version="4.0.2" />
53+
<PackageReference Include="MSTest.TestFramework" Version="4.0.2" />
54+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.0" />
55+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
5356
</ItemGroup>
5457

5558
<ItemGroup>
5659
<ProjectReference Include="..\..\src\ZNetCS.AspNetCore.Authentication.Basic\ZNetCS.AspNetCore.Authentication.Basic.csproj" />
5760
</ItemGroup>
5861

62+
<ItemGroup>
63+
<None Update="MvcTestingAppManifest.json">
64+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
65+
</None>
66+
</ItemGroup>
67+
5968
</Project>

0 commit comments

Comments
 (0)