Merge pull request #8 from myvas/9.0

huangxiangyao · web-flow · commit de2d62272c1c · 2025-02-02T19:36:24.000+08:00
9.0
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: [ '8.0.x' ]
+        dotnet-version: [ '9.0.x' ]
     steps:
     - run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
     - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub!"
@@ -42,6 +42,10 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '7.0.x'
+    - name: Setup dotnet 8.0.x
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
     - name: Setup dotnet ${{ matrix.dotnet-version }}
       uses: actions/setup-dotnet@v4
       with:
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet-version: [ '8.0.x' ]
+        dotnet-version: [ '9.0.x' ]
     steps:
     - run: echo "The job was automatically triggered by a ${{ github.event_name }} event."
     - run: echo "This job is now running on a ${{ runner.os }} server hosted by GitHub!"
@@ -38,6 +38,10 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: '7.0.x'
+    - name: Setup dotnet 8.0.x
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
     - name: Setup dotnet ${{ matrix.dotnet-version }}
       uses: actions/setup-dotnet@v4
       with:
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 9.0.0 (2024-12-06)
+- Added target framework: net9.0
+
+## 8.0.0 (2023-11-17)
+- Added target framework: net8.0
+- Added GitHub actions to test and deploy.
+
+## 7.0.11 (2023-09-15)
+- Added target framework: net7.0
+
 ## 6.0.3
 - Update to net6.0
 
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,7 +8,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<MinVerMinimumMajorMinor>8.0</MinVerMinimumMajorMinor>
+		<MinVerMinimumMajorMinor>9.0</MinVerMinimumMajorMinor>
 		<MinVerTagPrefix>v</MinVerTagPrefix>
 		<MinVerDefaultPreReleaseIdentifiers>alpha</MinVerDefaultPreReleaseIdentifiers>
 		<MinVerSkip Condition="'$(Configuration)' == 'Debug'">true</MinVerSkip>
diff --git a/README.md b/README.md
@@ -2,8 +2,9 @@
 
 * QQConnect: [Here](https://github.com/myvas/AspNetCore.Authentication.QQConnect)
 
-[![QQConnect](https://github.com/myvas/AspNetCore.Authentication.QQConnect/actions/workflows/dotnet.yml/badge.svg)](https://github.com/myvas/AspNetCore.Authentication.QQConnect)
 [![GitHub (Pre-)Release Date](https://img.shields.io/github/release-date-pre/myvas/AspNetCore.Authentication.QQConnect?label=github)](https://github.com/myvas/AspNetCore.Authentication.QQConnect)
+[![test](https://github.com/myvas/AspNetCore.Authentication.QQConnect/actions/workflows/dotnet.yml/badge.svg)](https://github.com/myvas/AspNetCore.Authentication.QQConnect/actions)
+[![deploy](https://github.com/myvas/AspNetCore.Authentication.QQConnect/actions/workflows/nuget.yml/badge.svg)](https://github.com/myvas/AspNetCore.Authentication.QQConnect/actions)
 [![NuGet](https://img.shields.io/nuget/v/Myvas.AspNetCore.Authentication.QQConnect.svg)](https://www.nuget.org/packages/Myvas.AspNetCore.Authentication.QQConnect)
 
 * WeixinOpen: [Here](https://github.com/myvas/AspNetCore.Authentication.WeixinOpen)
@@ -74,7 +75,7 @@ services.AddAuthentication()
 
 # Dev
 * [Visual Studio 2022](https://visualstudio.microsoft.com)
-* [.NET 8.0, 7.0, 6.0, 5.0, 3.1](https://dotnet.microsoft.com/en-us/download/dotnet)
+* [.NET 9.0, 8.0, 7.0, 6.0, 5.0, 3.1](https://dotnet.microsoft.com/en-us/download/dotnet)
 * [微信开发者工具](https://mp.weixin.qq.com/debug/wxadoc/dev/devtools/download.html)
 
 # Demo
diff --git a/WeixinAuth.sln b/WeixinAuth.sln
@@ -29,6 +29,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeixinAuth.UnitTest_6.0.x",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeixinAuth.UnitTest_7.0.x", "test\WeixinAuth.UnitTest_7.0.x\WeixinAuth.UnitTest_7.0.x.csproj", "{439BCABC-9551-41E3-88B9-4876F3D71843}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeixinAuth.UnitTest_8.0.x", "test\WeixinAuth.UnitTest_8.0.x\WeixinAuth.UnitTest_8.0.x.csproj", "{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
 		{439BCABC-9551-41E3-88B9-4876F3D71843}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{439BCABC-9551-41E3-88B9-4876F3D71843}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{439BCABC-9551-41E3-88B9-4876F3D71843}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -60,6 +66,7 @@ Global
 		{94ABBE67-3755-4DD1-A25E-2407FB32C60E} = {73FCFCF4-3A1C-4D4D-939A-9CABDC2341DC}
 		{0E17A946-9CA1-43D2-97A4-0A5E2F367EDA} = {73FCFCF4-3A1C-4D4D-939A-9CABDC2341DC}
 		{439BCABC-9551-41E3-88B9-4876F3D71843} = {73FCFCF4-3A1C-4D4D-939A-9CABDC2341DC}
+		{BB4A2455-5EC3-4EFB-B245-9E83EBD6D419} = {73FCFCF4-3A1C-4D4D-939A-9CABDC2341DC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {2AEDFD1F-BBE1-4727-9978-2FB04DCE84AF}
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
 	"sdk": {
-		"version": "8.0.100",
+		"version": "9.0.100",
 		"rollForward": "latestFeature",
 		"allowPrerelease": false
 	}
diff --git a/src/WeixinAuth/WeixinAuth.csproj b/src/WeixinAuth/WeixinAuth.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
+		<TargetFrameworks>net9.0;net8.0;net7.0;net6.0;net5.0;netcoreapp3.1</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<!--<Nullable>enable</Nullable>-->
 		<PackageId>Myvas.AspNetCore.Authentication.WeixinAuth</PackageId>
@@ -23,6 +23,10 @@
 		<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="9.0.0" />
+	</ItemGroup>
+
 	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.0" />
 	</ItemGroup>
diff --git a/test/WeixinAuth.UnitTest/WeixinAuth.UnitTest.csproj b/test/WeixinAuth.UnitTest/WeixinAuth.UnitTest.csproj
@@ -1,12 +1,12 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.12" />
+		<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
 		<PackageReference Include="xunit" Version="2.9.3" />
 		<PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
diff --git a/test/WeixinAuth.UnitTest/WeixinAuthTests.cs b/test/WeixinAuth.UnitTest/WeixinAuthTests.cs
@@ -750,7 +750,7 @@ public async Task AuthenticateWithoutCookieWillReturnNone()
                 {
                     var result = await context.AuthenticateAsync(WeixinAuthDefaults.AuthenticationScheme);
                     Assert.False(result.Succeeded);
-                    {//8.0
+                    {//7.0, 8.0, 9.0
                         Assert.True(result.None);
                         Assert.Null(result.Failure);
                     }
diff --git a/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestExtensions.cs b/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestExtensions.cs
@@ -0,0 +1,91 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Security.Claims;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml;
+using System.Xml.Linq;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.TestHost;
+
+namespace UnitTest
+{
+    public static class TestExtensions
+    {
+        public const string CookieAuthenticationScheme = "External";
+
+        public static async Task<TestTransaction> SendAsync(this TestServer server, string uri, params string[] cookies)
+        {
+            var request = new HttpRequestMessage(HttpMethod.Get, uri);
+            if (cookies != null && cookies.Count() > 0)
+            {
+                request.Headers.Add("Cookie", string.Join("; ", cookies));
+            }
+
+            var transaction = new TestTransaction
+            {
+                Request = request,
+                Response = await server.CreateClient().SendAsync(request),
+            };
+
+            if (transaction.Response.Headers.Contains("Set-Cookie"))
+            {
+                transaction.SetCookie = transaction.Response.Headers.GetValues("Set-Cookie").ToList();
+            }
+            transaction.ResponseText = await transaction.Response.Content.ReadAsStringAsync();
+
+            if (transaction.Response.Content != null &&
+                transaction.Response.Content.Headers.ContentType != null &&
+                transaction.Response.Content.Headers.ContentType.MediaType == "text/xml")
+            {
+                transaction.ResponseElement = XElement.Parse(transaction.ResponseText);
+            }
+            return transaction;
+        }
+
+        public static Task DescribeAsync(this HttpResponse res, ClaimsPrincipal principal)
+        {
+            res.StatusCode = 200;
+            res.ContentType = "text/xml";
+            var xml = new XElement("xml");
+            if (principal != null)
+            {
+                foreach (var identity in principal.Identities)
+                {
+                    xml.Add(identity.Claims.Select(claim =>
+                        new XElement("claim", new XAttribute("type", claim.Type),
+                        new XAttribute("value", claim.Value),
+                        new XAttribute("issuer", claim.Issuer))));
+                }
+            }
+            var xmlBytes = Encoding.UTF8.GetBytes(xml.ToString());
+            return res.Body.WriteAsync(xmlBytes, 0, xmlBytes.Length);
+        }
+
+        public static Task DescribeAsync(this HttpResponse res, IEnumerable<AuthenticationToken> tokens)
+        {
+            res.StatusCode = 200;
+            res.ContentType = "text/xml";
+            var xml = new XElement("xml");
+            if (tokens != null)
+            {
+                foreach (var token in tokens)
+                {
+                    xml.Add(new XElement("token", new XAttribute("name", token.Name),
+                        new XAttribute("value", token.Value)));
+                }
+            }
+            var xmlBytes = Encoding.UTF8.GetBytes(xml.ToString());
+            return res.Body.WriteAsync(xmlBytes, 0, xmlBytes.Length);
+        }
+
+    }
+}
diff --git a/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestHandlers.cs b/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestHandlers.cs
@@ -0,0 +1,116 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved. See License.txt in the project root for license information.
+
+using System.Security.Claims;
+using System.Text.Encodings.Web;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+
+namespace UnitTest
+{
+    public class TestAuthHandler : AuthenticationHandler<AuthenticationSchemeOptions>, IAuthenticationSignInHandler
+    {
+        public TestAuthHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder) : base(options, logger, encoder)
+        { }
+
+        public int SignInCount { get; set; }
+        public int SignOutCount { get; set; }
+        public int ForbidCount { get; set; }
+        public int ChallengeCount { get; set; }
+        public int AuthenticateCount { get; set; }
+
+        protected override Task HandleChallengeAsync(AuthenticationProperties properties)
+        {
+            ChallengeCount++;
+            return Task.CompletedTask;
+        }
+
+        protected override Task HandleForbiddenAsync(AuthenticationProperties properties)
+        {
+            ForbidCount++;
+            return Task.CompletedTask;
+        }
+
+        protected override Task<AuthenticateResult> HandleAuthenticateAsync()
+        {
+            AuthenticateCount++;
+            var principal = new ClaimsPrincipal();
+            var id = new ClaimsIdentity();
+            id.AddClaim(new Claim(ClaimTypes.NameIdentifier, Scheme.Name, ClaimValueTypes.String, Scheme.Name));
+            principal.AddIdentity(id);
+            return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(principal, new AuthenticationProperties(), Scheme.Name)));
+        }
+
+        public Task SignInAsync(ClaimsPrincipal user, AuthenticationProperties properties)
+        {
+            SignInCount++;
+            return Task.CompletedTask;
+        }
+
+        public Task SignOutAsync(AuthenticationProperties properties)
+        {
+            SignOutCount++;
+            return Task.CompletedTask;
+        }
+    }
+
+    public class TestHandler : IAuthenticationSignInHandler
+    {
+        public AuthenticationScheme Scheme { get; set; }
+        public int SignInCount { get; set; }
+        public int SignOutCount { get; set; }
+        public int ForbidCount { get; set; }
+        public int ChallengeCount { get; set; }
+        public int AuthenticateCount { get; set; }
+
+        public Task<AuthenticateResult> AuthenticateAsync()
+        {
+            AuthenticateCount++;
+            var principal = new ClaimsPrincipal();
+            var id = new ClaimsIdentity();
+            id.AddClaim(new Claim(ClaimTypes.NameIdentifier, Scheme.Name, ClaimValueTypes.String, Scheme.Name));
+            principal.AddIdentity(id);
+            return Task.FromResult(AuthenticateResult.Success(new AuthenticationTicket(principal, new AuthenticationProperties(), Scheme.Name)));
+        }
+
+        public Task ChallengeAsync(AuthenticationProperties properties)
+        {
+            ChallengeCount++;
+            return Task.CompletedTask;
+        }
+
+        public Task ForbidAsync(AuthenticationProperties properties)
+        {
+            ForbidCount++;
+            return Task.CompletedTask;
+        }
+
+        public Task InitializeAsync(AuthenticationScheme scheme, HttpContext context)
+        {
+            Scheme = scheme;
+            return Task.CompletedTask;
+        }
+
+        public Task SignInAsync(ClaimsPrincipal user, AuthenticationProperties properties)
+        {
+            SignInCount++;
+            return Task.CompletedTask;
+        }
+
+        public Task SignOutAsync(AuthenticationProperties properties)
+        {
+            SignOutCount++;
+            return Task.CompletedTask;
+        }
+    }
+
+    public class TestHandler2 : TestHandler
+    {
+    }
+
+    public class TestHandler3 : TestHandler
+    {
+    }
+}
diff --git a/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestHttpMessageHandler.cs b/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestHttpMessageHandler.cs
@@ -0,0 +1,24 @@
+﻿// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+using System.Net.Http;
+using System.Threading.Tasks;
+
+namespace UnitTest
+{
+    public class TestHttpMessageHandler : HttpMessageHandler
+    {
+        public Func<HttpRequestMessage, HttpResponseMessage> Sender { get; set; }
+
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, System.Threading.CancellationToken cancellationToken)
+        {
+            if (Sender != null)
+            {
+                return Task.FromResult(Sender(request));
+            }
+
+            return Task.FromResult<HttpResponseMessage>(null);
+        }
+    }
+}
diff --git a/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestServerBuilder.cs b/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestServerBuilder.cs
diff --git a/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestTransaction.cs b/test/WeixinAuth.UnitTest_8.0.x/TestServers/TestTransaction.cs
diff --git a/test/WeixinAuth.UnitTest_8.0.x/WeixinAuth.UnitTest_8.0.x.csproj b/test/WeixinAuth.UnitTest_8.0.x/WeixinAuth.UnitTest_8.0.x.csproj
diff --git a/test/WeixinAuth.UnitTest_8.0.x/WeixinAuthTests.cs b/test/WeixinAuth.UnitTest_8.0.x/WeixinAuthTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.100",`
	`3`	`+ "version": "9.0.100",`
`4`	`4`	`"rollForward": "latestFeature",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,7 @@ public async Task AuthenticateWithoutCookieWillReturnNone()`
`750`	`750`	`{`
`751`	`751`	`var result = await context.AuthenticateAsync(WeixinAuthDefaults.AuthenticationScheme);`
`752`	`752`	`Assert.False(result.Succeeded);`
`753`		`- {//8.0`
	`753`	`+ {//7.0, 8.0, 9.0`
`754`	`754`	`Assert.True(result.None);`
`755`	`755`	`Assert.Null(result.Failure);`
`756`	`756`	`}`