Skip to content

Commit

Permalink
nuget: 版本更新到8.08,使用版本通配符配置依赖库版本
Browse files Browse the repository at this point in the history
  • Loading branch information
gmf520 committed Sep 6, 2024
1 parent 87a7037 commit 80c3fc9
Show file tree
Hide file tree
Showing 29 changed files with 141 additions and 144 deletions.
22 changes: 11 additions & 11 deletions build/OSharpNS.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>OSharpNS</id>
<version>8.0.1-preview.501</version>
<version>8.0.8</version>
<title>OSharpFramework(.NET6.0/.NETCoreApp3.1)</title>
<authors>柳柳软件(66soft.net)</authors>
<owners>LiuliuSoft nnc</owners>
Expand All @@ -16,18 +16,18 @@
<tags>osharp</tags>
<dependencies>
<group targetFramework=".NETCoreApp3.1">
<dependency id="OSharp.Core" version="8.0.1-preview.501" />
<dependency id="OSharp.EntityFrameworkCore" version="8.0.1-preview.501" />
<dependency id="OSharp.AutoMapper" version="8.0.1-preview.501" />
<dependency id="OSharp.AspNetCore" version="8.0.1-preview.501" />
<dependency id="OSharp.Log4Net" version="8.0.1-preview.501" />
<dependency id="OSharp.Core" version="8.0.8" />
<dependency id="OSharp.EntityFrameworkCore" version="8.0.8" />
<dependency id="OSharp.AutoMapper" version="8.0.8" />
<dependency id="OSharp.AspNetCore" version="8.0.8" />
<dependency id="OSharp.Log4Net" version="8.0.8" />
</group>
<group targetFramework="net6.0">
<dependency id="OSharp.Core" version="8.0.1-preview.501" />
<dependency id="OSharp.EntityFrameworkCore" version="8.0.1-preview.501" />
<dependency id="OSharp.AutoMapper" version="8.0.1-preview.501" />
<dependency id="OSharp.AspNetCore" version="8.0.1-preview.501" />
<dependency id="OSharp.Log4Net" version="8.0.1-preview.501" />
<dependency id="OSharp.Core" version="8.0.8" />
<dependency id="OSharp.EntityFrameworkCore" version="8.0.8" />
<dependency id="OSharp.AutoMapper" version="8.0.8" />
<dependency id="OSharp.AspNetCore" version="8.0.8" />
<dependency id="OSharp.Log4Net" version="8.0.8" />
</group>
</dependencies>
</metadata>
Expand Down
10 changes: 5 additions & 5 deletions build/version.props
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>
<PropertyGroup>
<VersionMain>8.0</VersionMain>
<VersionPrefix>1</VersionPrefix>
<VersionPrefix>8</VersionPrefix>
<VersionSuffix>-preview.</VersionSuffix>
<VersionSuffixVersion>529</VersionSuffixVersion>
<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>
<!--<Version>$(VersionMain).$(VersionPrefix)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>-->
<!--<Version>$(VersionMain).$(VersionPrefix)$(VersionSuffix)$(VersionSuffixVersion)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix).$(VersionSuffixVersion)</FileVersion>-->
<Version>$(VersionMain).$(VersionPrefix)</Version>
<FileVersion>$(VersionMain).$(VersionPrefix)</FileVersion>
</PropertyGroup>
</Project>
8 changes: 4 additions & 4 deletions samples/web/Liuliu.Demo.Web/Liuliu.Demo.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.4.0" />
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="[6.0.27, 7.0.0)">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[6.0.16, 7.0.0)" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.*" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions samples/web/Liuliu.Demo.WebApi/Liuliu.Demo.WebApi.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,30 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.27" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.16" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.27">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.*" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.16" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.12" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.16">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.*" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<ProjectReference Include="..\..\..\src\OSharp.EntityFrameworkCore.Oracle\OSharp.EntityFrameworkCore.Oracle.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.2">
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MiniRazor" Version="2.2.2" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageReference Include="MiniRazor" Version="2.*" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.*" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions samples/wpf/OSharp.CodeGenerator/OSharp.CodeGenerator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AsmResolver.DotNet" Version="5.4.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.11.0" />
<PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.2.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.22">
<PackageReference Include="AsmResolver.DotNet" Version="5.*" />
<PackageReference Include="MahApps.Metro" Version="2.*" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="4.*" />
<PackageReference Include="MahApps.Metro.SimpleChildWindow" Version="2.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Notifications.Wpf.Core" Version="1.4.1" />
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="All" />
<PackageReference Include="Notifications.Wpf.Core" Version="1.*" />
<PackageReference Include="PropertyChanged.Fody" Version="4.*" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
18 changes: 9 additions & 9 deletions src/OSharp.AspNetCore/OSharp.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.*" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="7.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.*" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.*" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp\OSharp.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion src/OSharp.AutoMapper/OSharp.AutoMapper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AutoMapper" Version="13.*" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[6.0.2, 7.0.0)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[7.0.0, 8.0.0)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="[8.0.0, 9.0.0)" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[6.21.130, 7.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[7.21.13, 8.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Oracle.EntityFrameworkCore" Version="[8.21.121, 9.0.0)" />
<PackageReference Include="Oracle.EntityFrameworkCore" Version="8.*" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\OSharp.EntityFrameworkCore\OSharp.EntityFrameworkCore.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[6.0.22, 7.0.0)" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[7.0.11, 8.0.0)" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.*" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.*" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.*" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/OSharp.EntityFrameworkCore/OSharp.EntityFrameworkCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Dapper" Version="2.1.28" />
<PackageReference Include="Dapper" Version="2.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[6.0.27, 7.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[6.102.1.1, 7.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="6.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.*" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[7.0.16, 8.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[7.102.1.1, 8.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="7.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.*" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[8.0.2, 9.0.0)" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="[8.102.1.1, 9.0.0)" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="8.*" />
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/OSharp.Exceptionless/OSharp.Exceptionless.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Exceptionless.AspNetCore" Version="6.0.3" />
<PackageReference Include="Exceptionless.AspNetCore" Version="6.*" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/OSharp.Hangfire/OSharp.Hangfire.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Hangfire" Version="1.8.11" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
<PackageReference Include="Hangfire" Version="1.8.*" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.*" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/OSharp.Hosting.Apis/OSharp.Hosting.Apis.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.4.0" />
<PackageReference Include="AspectCore.Extensions.Hosting" Version="2.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[6.0.16, 7.0.0)" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[7.0.12, 8.0.0)" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.*" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="[8.0.1, 9.0.0)" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.*" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/OSharp.Hosting.Core/OSharp.Hosting.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="MailKit" Version="4.3.0" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
<PackageReference Include="MailKit" Version="4.*" />
<PackageReference Include="Lazy.Captcha.Core" Version="2.*" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/OSharp.Identity/Authentication/AuthenticationPackBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,13 @@ protected virtual AuthenticationBuilder AddOAuth2(IServiceCollection services, A
opts.ClientSecret = options.ClientSecret;
});
break;
case "GitHub":
builder.AddGitHub(opts =>
{
opts.ClientId = options.ClientId;
opts.ClientSecret = options.ClientSecret;
});
break;
//case "GitHub":
// builder.AddGitHub(opts =>
// {
// opts.ClientId = options.ClientId;
// opts.ClientSecret = options.ClientSecret;
// });
// break;
}
}

Expand Down
Loading

0 comments on commit 80c3fc9

Please sign in to comment.