diff --git a/0 - Build-Publish-Move.bat b/0 - Build-Publish-Move.bat new file mode 100644 index 0000000..bc726bc --- /dev/null +++ b/0 - Build-Publish-Move.bat @@ -0,0 +1,13 @@ +@echo off + +dotnet restore + +dotnet build --no-restore -c Release + +dotnet nuget Panosen.AspNetCore.Authentication.Basic\bin\Release\Panosen.AspNetCore.Authentication.Basic.*.nupkg -s https://package.savory.cn/v3/index.json --skip-duplicate +dotnet nuget Panosen.AspNetCore.Authentication.Header\bin\Release\Panosen.AspNetCore.Authentication.Header.*.nupkg -s https://package.savory.cn/v3/index.json --skip-duplicate + +move /Y Panosen.AspNetCore.Authentication.Basic\bin\Release\Panosen.AspNetCore.Authentication.Basic.*.nupkg D:\LocalSavoryNuget\ +move /Y Panosen.AspNetCore.Authentication.Header\bin\Release\Panosen.AspNetCore.Authentication.Header.*.nupkg D:\LocalSavoryNuget\ + +pause \ No newline at end of file diff --git a/0 - Copy-Pdb-To-Nuget.bat b/0 - Copy-Pdb-To-Nuget.bat new file mode 100644 index 0000000..791e0f6 --- /dev/null +++ b/0 - Copy-Pdb-To-Nuget.bat @@ -0,0 +1,7 @@ +dotnet restore + +dotnet build --no-restore -c Debug + +copy-pdb-to-nuget debug + +pause \ No newline at end of file diff --git a/0 - Update-Version.bat b/0 - Update-Version.bat new file mode 100644 index 0000000..8fc6d0a --- /dev/null +++ b/0 - Update-Version.bat @@ -0,0 +1,3 @@ +netversion update + +pause \ No newline at end of file diff --git a/Panosen.AspNetCore.Authentication.Basic/BasicAuthenticationExtension.cs b/Panosen.AspNetCore.Authentication.Basic/BasicAuthenticationExtension.cs index 1af36f3..bd567b0 100644 --- a/Panosen.AspNetCore.Authentication.Basic/BasicAuthenticationExtension.cs +++ b/Panosen.AspNetCore.Authentication.Basic/BasicAuthenticationExtension.cs @@ -17,31 +17,31 @@ public static class BasicAuthenticationExtension /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder) - => builder.AddBasic(BasicAuthenticationDefaults.AuthenticationScheme); + public static AuthenticationBuilder AddPanosenBasicAuthentication(this AuthenticationBuilder builder) + => builder.AddPanosenBasicAuthentication(BasicAuthenticationDefaults.AuthenticationScheme); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme) - => builder.AddBasic(authenticationScheme, configureOptions: null); + public static AuthenticationBuilder AddPanosenBasicAuthentication(this AuthenticationBuilder builder, string authenticationScheme) + => builder.AddPanosenBasicAuthentication(authenticationScheme, configureOptions: null); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, Action configureOptions) - => builder.AddBasic(BasicAuthenticationDefaults.AuthenticationScheme, configureOptions); + public static AuthenticationBuilder AddPanosenBasicAuthentication(this AuthenticationBuilder builder, Action configureOptions) + => builder.AddPanosenBasicAuthentication(BasicAuthenticationDefaults.AuthenticationScheme, configureOptions); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, Action configureOptions) - => builder.AddBasic(authenticationScheme, displayName: null, configureOptions: configureOptions); + public static AuthenticationBuilder AddPanosenBasicAuthentication(this AuthenticationBuilder builder, string authenticationScheme, Action configureOptions) + => builder.AddPanosenBasicAuthentication(authenticationScheme, displayName: null, configureOptions: configureOptions); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddBasic(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) + public static AuthenticationBuilder AddPanosenBasicAuthentication(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) { builder.Services.AddOptions(authenticationScheme); diff --git a/Panosen.AspNetCore.Authentication.Basic/Panosen.AspNetCore.Authentication.Basic.csproj b/Panosen.AspNetCore.Authentication.Basic/Panosen.AspNetCore.Authentication.Basic.csproj index 66f6c0c..58272a5 100644 --- a/Panosen.AspNetCore.Authentication.Basic/Panosen.AspNetCore.Authentication.Basic.csproj +++ b/Panosen.AspNetCore.Authentication.Basic/Panosen.AspNetCore.Authentication.Basic.csproj @@ -3,7 +3,7 @@ Panosen.AspNetCore.Authentication.Basic HarrisZhang - 1.0.0 + 1.0.2 netstandard2.0 Panosen.AspNetCore.Authentication.Basic Panosen.AspNetCore.Authentication.Basic diff --git a/Panosen.AspNetCore.Authentication.Header/HeaderAuthenticationExtension.cs b/Panosen.AspNetCore.Authentication.Header/HeaderAuthenticationExtension.cs index 959271a..b35f1d9 100644 --- a/Panosen.AspNetCore.Authentication.Header/HeaderAuthenticationExtension.cs +++ b/Panosen.AspNetCore.Authentication.Header/HeaderAuthenticationExtension.cs @@ -17,31 +17,31 @@ public static class HeaderAuthenticationExtension /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddHeader(this AuthenticationBuilder builder) - => builder.AddHeader(HeaderAuthenticationDefaults.AuthenticationScheme); + public static AuthenticationBuilder AddPanosenHeaderAuthentication(this AuthenticationBuilder builder) + => builder.AddPanosenHeaderAuthentication(HeaderAuthenticationDefaults.AuthenticationScheme); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddHeader(this AuthenticationBuilder builder, string authenticationScheme) - => builder.AddHeader(authenticationScheme, configureOptions: null); + public static AuthenticationBuilder AddPanosenHeaderAuthentication(this AuthenticationBuilder builder, string authenticationScheme) + => builder.AddPanosenHeaderAuthentication(authenticationScheme, configureOptions: null); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddHeader(this AuthenticationBuilder builder, Action configureOptions) - => builder.AddHeader(HeaderAuthenticationDefaults.AuthenticationScheme, configureOptions); + public static AuthenticationBuilder AddPanosenHeaderAuthentication(this AuthenticationBuilder builder, Action configureOptions) + => builder.AddPanosenHeaderAuthentication(HeaderAuthenticationDefaults.AuthenticationScheme, configureOptions); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddHeader(this AuthenticationBuilder builder, string authenticationScheme, Action configureOptions) - => builder.AddHeader(authenticationScheme, displayName: null, configureOptions: configureOptions); + public static AuthenticationBuilder AddPanosenHeaderAuthentication(this AuthenticationBuilder builder, string authenticationScheme, Action configureOptions) + => builder.AddPanosenHeaderAuthentication(authenticationScheme, displayName: null, configureOptions: configureOptions); /// /// 添加基础身份认证 /// - public static AuthenticationBuilder AddHeader(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) + public static AuthenticationBuilder AddPanosenHeaderAuthentication(this AuthenticationBuilder builder, string authenticationScheme, string displayName, Action configureOptions) { builder.Services.AddOptions(authenticationScheme) .Validate(options => !string.IsNullOrEmpty(options.HeaderKey), "options.HeaderKey is null or empty"); diff --git a/Panosen.AspNetCore.Authentication.Header/Panosen.AspNetCore.Authentication.Header.csproj b/Panosen.AspNetCore.Authentication.Header/Panosen.AspNetCore.Authentication.Header.csproj index 52667c4..eea719c 100644 --- a/Panosen.AspNetCore.Authentication.Header/Panosen.AspNetCore.Authentication.Header.csproj +++ b/Panosen.AspNetCore.Authentication.Header/Panosen.AspNetCore.Authentication.Header.csproj @@ -1,9 +1,9 @@ - + Panosen.AspNetCore.Authentication.Header HarrisZhang - 1.0.0 + 1.0.2 netstandard2.0 Panosen.AspNetCore.Authentication.Header Panosen.AspNetCore.Authentication.Header diff --git a/Sample/Startup.cs b/Sample/Startup.cs index 3667bad..bb7bc52 100644 --- a/Sample/Startup.cs +++ b/Sample/Startup.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -29,11 +29,11 @@ public void ConfigureServices(IServiceCollection services) services.AddSingleton(); services.AddSingleton(); - ////ӻ֤ - services.AddAuthentication(BasicAuthenticationDefaults.AuthenticationScheme).AddBasic(); + ////添加基础身份认证 + services.AddAuthentication(BasicAuthenticationDefaults.AuthenticationScheme).AddPanosenBasicAuthentication(); - //Header֤ - services.AddAuthentication(HeaderAuthenticationDefaults.AuthenticationScheme).AddHeader(options => + //添加Header身份认证 + services.AddAuthentication(HeaderAuthenticationDefaults.AuthenticationScheme).AddPanosenHeaderAuthentication(options => { options.HeaderKey = "NUGET-API-KEY"; }); @@ -51,7 +51,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) app.UseRouting(); - //ʹû֤ + //使用基础身份认证 app.UseAuthentication(); app.UseAuthorization(); diff --git a/publish-to-nuget.bat b/publish-to-nuget.bat deleted file mode 100644 index dfaad42..0000000 --- a/publish-to-nuget.bat +++ /dev/null @@ -1,5 +0,0 @@ -dotnet restore - -dotnet build -c Release - -pause \ No newline at end of file