Skip to content

Commit 1efd978

Browse files
committed
Senaprc.CO2NET.AspNet v1.4.0 .NET 6.0 和 .NET 8.0 程序集不再依赖 Microsoft.AspNetCore.Hosting.Abstractions 和 Microsoft.AspNetCore.Http.Abstractions
1 parent 2564316 commit 1efd978

File tree

3 files changed

+26
-12
lines changed

3 files changed

+26
-12
lines changed

src/Senparc.CO2NET.AspNet/Register.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
修改标识:Senparc - 20221219
1111
修改描述:v1.1.3 优化 UseSenparcGlobal 方法
1212
13+
修改标识:Senparc - 20240728
14+
修改描述:v1.4.0 .NET 6.0 和 .NET 8.0 程序集不再依赖 Microsoft.AspNetCore.Hosting.Abstractions 和 Microsoft.AspNetCore.Http.Abstractions
15+
1316
----------------------------------------------------------------*/
1417

1518
#if !NET462
16-
using Microsoft.AspNetCore.Hosting;
1719
using Microsoft.AspNetCore.Builder;
1820
using System;
1921
using System.Collections.Generic;

src/Senparc.CO2NET.AspNet/RegisterServices/RegisterService.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,14 @@
1111
修改描述:v1.1.3 优化 RegisterService.StartStart() 方法,根据 env
1212
参数自动判断是否为网站项目,并获取运行根目录
1313
14+
修改标识:Senparc - 20240728
15+
修改描述:v1.4.0 .NET 6.0 和 .NET 8.0 程序集不再依赖 Microsoft.AspNetCore.Hosting.Abstractions 和 Microsoft.AspNetCore.Http.Abstractions
16+
1417
----------------------------------------------------------------*/
1518

1619

1720
#if !NET462
21+
1822
using Microsoft.AspNetCore.Hosting;
1923
using Senparc.CO2NET.RegisterServices;
2024
using System;
@@ -43,7 +47,11 @@ public static Senparc.CO2NET.RegisterServices.RegisterService Start(
4347
//提供网站根目录
4448
if (env != null && env.ContentRootPath != null)
4549
{
50+
#if NETSTANDARD2_0 || NETSTANDARD2_1
4651
if (env is Microsoft.AspNetCore.Hosting.IHostingEnvironment webHostingEnv)
52+
#else
53+
if (env is IWebHostEnvironment webHostingEnv)
54+
#endif
4755
{
4856
Senparc.CO2NET.Config.RootDirectoryPath = webHostingEnv.ContentRootPath;
4957
}

src/Senparc.CO2NET.AspNet/Senparc.CO2NET.AspNet.csproj

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net462;netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
4-
<Version>1.3.3</Version>
4+
<Version>1.4.0-beta1</Version>
55
<AssemblyName>Senparc.CO2NET.AspNet</AssemblyName>
66
<RootNamespace>Senparc.CO2NET.AspNet</RootNamespace>
77
<GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
@@ -22,14 +22,15 @@
2222
<PackageProjectUrl>https://github.com/Senparc/Senparc.CO2NET</PackageProjectUrl>
2323
<PackageIcon>icon.jpg</PackageIcon>
2424
<PackageReleaseNotes>
25-
v0.1.0 构建基础代码,从 Senparc.CO2NET 分离 ASP.NET (以及 ASP.NET Core)代码
26-
v0.4.300.4 提供 GetRequestMemoryStreamAsync() 异步方法
27-
v1.0.1 更新 UseSenparcGlobal 参数输入方式
28-
v1.1.2
29-
1、优化 UseSenparcGlobal 方法
30-
2、添加 .NET 6.0 / 7.0 依赖
31-
v1.3.0 升级到 .NET 8.0
32-
</PackageReleaseNotes>
25+
v0.1.0 构建基础代码,从 Senparc.CO2NET 分离 ASP.NET (以及 ASP.NET Core)代码
26+
v0.4.300.4 提供 GetRequestMemoryStreamAsync() 异步方法
27+
v1.0.1 更新 UseSenparcGlobal 参数输入方式
28+
v1.1.2
29+
1、优化 UseSenparcGlobal 方法
30+
2、添加 .NET 6.0 / 7.0 依赖
31+
v1.3.0 升级到 .NET 8.0
32+
v1.4.0 .NET 6.0 和 .NET 8.0 程序集不再依赖 Microsoft.AspNetCore.Hosting.Abstractions 和 Microsoft.AspNetCore.Http.Abstractions
33+
</PackageReleaseNotes>
3334
<RepositoryUrl>https://github.com/Senparc/Senparc.CO2NET</RepositoryUrl>
3435
<Configurations>Debug;Release;Test</Configurations>
3536
</PropertyGroup>
@@ -79,12 +80,15 @@
7980
8081
</ItemGroup>-->
8182
<!--<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.0') OR ('$(TargetFramework)' == 'netstandard2.1')">-->
82-
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
83-
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
83+
<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'net8.0'">
84+
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions">
8485
<Version>2.2.0</Version>
8586
</PackageReference>
8687
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions">
8788
<Version>2.2.0</Version>
8889
</PackageReference>
8990
</ItemGroup>
91+
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net8.0'">
92+
<PackageReference Include="Microsoft.AspNetCore.App" />
93+
</ItemGroup>
9094
</Project>

0 commit comments

Comments
 (0)