Skip to content

Commit

Permalink
feat: 升级到.net7
Browse files Browse the repository at this point in the history
  • Loading branch information
@withsalt
withsalt committed Nov 9, 2022
1 parent 2a0f0a9 commit bf4eda3
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion src/BilibiliLiveAreaTool/BilibiliLiveAreaTool.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/BilibiliLiveCommon/BilibiliLiveCommon.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions src/BilibiliLiveMonitor/BilibiliLiveMonitor.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
</PropertyGroup>
Expand All @@ -12,7 +12,7 @@
<PackageReference Include="Quartz.Extensions.Hosting" Version="3.5.0" />
<PackageReference Include="Quartz.Plugins" Version="3.5.0" />
<PackageReference Include="Quartz.Plugins.TimeZoneConverter" Version="3.5.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
24 changes: 12 additions & 12 deletions src/BilibiliLiver/BilibiliLiver.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<AssemblyVersion>3.0.1</AssemblyVersion>
<FileVersion>3.0.1</FileVersion>
<TargetFramework>net7.0</TargetFramework>
<AssemblyVersion>3.1.0</AssemblyVersion>
<FileVersion>3.1.0</FileVersion>
<Authors>withsalt</Authors>
<Version>3.0.3</Version>
<Version>3.1.0</Version>
<Description>B站直播工具。</Description>
</PropertyGroup>

Expand All @@ -21,14 +21,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.4" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.1.5" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/BilibiliLiver/BilibiliLiver.csproj.user
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_LastSelectedProfileId>F:\TempProjects\BilibiliLiveTools\src\BilibiliLiver\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
<_LastSelectedProfileId>D:\Projects\BilibiliLiveTools\src\BilibiliLiver\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
</PropertyGroup>
</Project>
7 changes: 3 additions & 4 deletions src/BilibiliLiver/Properties/PublishProfiles/FolderProfile.pubxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<SelfContained>true</SelfContained>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<PublishSingleFile>true</PublishSingleFile>
<RuntimeIdentifier>linux-arm64</RuntimeIdentifier>
<PublishSingleFile>false</PublishSingleFile>
<PublishTrimmed>false</PublishTrimmed>
<PublishReadyToRun>false</PublishReadyToRun>
</PropertyGroup>
</Project>
3 changes: 2 additions & 1 deletion src/BilibiliLiver/Properties/PublishProfiles/FolderProfile.pubxml.user
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2022-04-25T15:14:40.9026200Z;True|2022-04-17T22:02:22.0362717+08:00;True|2022-04-17T20:57:41.8699679+08:00;True|2022-04-17T20:55:58.7954276+08:00;True|2022-04-17T00:43:18.6323335+08:00;True|2022-04-17T00:41:55.8944433+08:00;True|2022-04-17T00:35:37.8392537+08:00;True|2022-04-17T00:35:18.6510081+08:00;True|2022-04-17T00:35:12.5960038+08:00;True|2022-04-17T00:12:58.3502251+08:00;True|2022-04-16T18:40:51.8018968+08:00;True|2022-04-16T18:40:40.4162879+08:00;True|2022-04-16T18:40:30.9611410+08:00;True|2022-04-16T18:21:02.2569853+08:00;True|2022-04-16T18:20:44.0473429+08:00;True|2022-04-14T23:24:26.2935815+08:00;True|2022-04-13T22:06:08.5331750+08:00;True|2022-04-13T22:05:38.7648028+08:00;True|2022-04-13T22:03:04.7417417+08:00;True|2022-04-13T22:02:56.6660944+08:00;True|2022-04-13T22:00:59.4502664+08:00;True|2022-04-13T22:00:07.1571285+08:00;True|2021-04-22T20:24:39.6104990+08:00;False|2021-04-22T20:24:03.6995554+08:00;True|2021-04-22T20:23:00.4831701+08:00;True|2021-04-22T20:21:51.8124127+08:00;True|2021-04-22T20:20:51.4069098+08:00;True|2021-04-21T23:13:29.6381456+08:00;True|2021-04-21T23:13:13.4874317+08:00;True|2021-04-21T23:01:13.8171475+08:00;True|2021-04-21T22:48:16.7290093+08:00;False|2021-04-21T22:47:37.5772589+08:00;False|2021-04-21T22:46:51.8841941+08:00;</History>
<History>True|2022-11-09T08:58:29.9202044Z;True|2022-11-09T16:58:04.3351128+08:00;True|2022-11-09T16:57:34.9285103+08:00;True|2022-11-09T16:57:08.4855676+08:00;True|2022-11-09T16:56:36.1361285+08:00;True|2022-11-09T16:54:59.9343130+08:00;True|2022-11-09T16:54:34.5632925+08:00;True|2022-04-25T23:14:40.9026200+08:00;True|2022-04-17T22:02:22.0362717+08:00;True|2022-04-17T20:57:41.8699679+08:00;True|2022-04-17T20:55:58.7954276+08:00;True|2022-04-17T00:43:18.6323335+08:00;True|2022-04-17T00:41:55.8944433+08:00;True|2022-04-17T00:35:37.8392537+08:00;True|2022-04-17T00:35:18.6510081+08:00;True|2022-04-17T00:35:12.5960038+08:00;True|2022-04-17T00:12:58.3502251+08:00;True|2022-04-16T18:40:51.8018968+08:00;True|2022-04-16T18:40:40.4162879+08:00;True|2022-04-16T18:40:30.9611410+08:00;True|2022-04-16T18:21:02.2569853+08:00;True|2022-04-16T18:20:44.0473429+08:00;True|2022-04-14T23:24:26.2935815+08:00;True|2022-04-13T22:06:08.5331750+08:00;True|2022-04-13T22:05:38.7648028+08:00;True|2022-04-13T22:03:04.7417417+08:00;True|2022-04-13T22:02:56.6660944+08:00;True|2022-04-13T22:00:59.4502664+08:00;True|2022-04-13T22:00:07.1571285+08:00;True|2021-04-22T20:24:39.6104990+08:00;False|2021-04-22T20:24:03.6995554+08:00;True|2021-04-22T20:23:00.4831701+08:00;True|2021-04-22T20:21:51.8124127+08:00;True|2021-04-22T20:20:51.4069098+08:00;True|2021-04-21T23:13:29.6381456+08:00;True|2021-04-21T23:13:13.4874317+08:00;True|2021-04-21T23:01:13.8171475+08:00;True|2021-04-21T22:48:16.7290093+08:00;False|2021-04-21T22:47:37.5772589+08:00;False|2021-04-21T22:46:51.8841941+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
6 changes: 3 additions & 3 deletions src/BilibiliLiverTests/BilibiliLiverTests.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
<PackageReference Include="coverlet.collector" Version="3.1.2">
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit bf4eda3

Please sign in to comment.