!2045 feat(#I4HCGX): add framework target net6.0

* chore: 项目指定 net6
* Merge branch 'main' into dev-net6
* chore: 更新框架到 6.0
* chore: update framework to net5/net6
This commit is contained in:
Argo 2021-11-08 08:06:04 +00:00
parent 9dac2bcb0f
commit 8e8e2d67b6
5 changed files with 12 additions and 16 deletions

View File

@ -1,6 +1,6 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
<Copyright>Argo Zhang</Copyright> <Copyright>Argo Zhang</Copyright>
<Authors>Argo Zhang(argo@163.com)</Authors> <Authors>Argo Zhang(argo@163.com)</Authors>
<Company>Longbow</Company> <Company>Longbow</Company>

View File

@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsWebProject>true</IsWebProject> <IsWebProject>true</IsWebProject>
</PropertyGroup> </PropertyGroup>

View File

@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk.Razor"> <Project Sdk="Microsoft.NET.Sdk.Razor">
<PropertyGroup>
<IsPackable>true</IsPackable>
<Version>5.0.0</Version>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<SupportedPlatform Include="browser" /> <SupportedPlatform Include="browser" />
</ItemGroup> </ItemGroup>
@ -27,7 +22,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -15,13 +15,13 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="6.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Http" Version="6.0" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="6.0" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0-rc.*" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable> <IsPackable>false</IsPackable>
</PropertyGroup> </PropertyGroup>