Skip to content

Commit

Permalink
Tidy projects up, add .NET 8 support
Browse files Browse the repository at this point in the history
  • Loading branch information
gehongyan committed Nov 15, 2023
1 parent 74db349 commit 8f2b0cc
Show file tree
Hide file tree
Showing 22 changed files with 90 additions and 71 deletions.
28 changes: 14 additions & 14 deletions src/Kook.Net.sln → Kook.Net.sln
Original file line number Diff line number Diff line change
@@ -1,47 +1,47 @@

Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Core", "Kook.Net.Core\Kook.Net.Core.csproj", "{8E872B01-8D8A-498A-A31F-0D6599299876}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Core", "src\Kook.Net.Core\Kook.Net.Core.csproj", "{8E872B01-8D8A-498A-A31F-0D6599299876}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Implementations", "Implementations", "{58B166AB-82DD-472F-AC70-9318DA4F881E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{1E3AD043-5861-4B7F-8CE6-0EE9B4D6CB91}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Rest", "Kook.Net.Rest\Kook.Net.Rest.csproj", "{57F76D67-0E55-4609-A61C-3A4C3073CA0E}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Rest", "src\Kook.Net.Rest\Kook.Net.Rest.csproj", "{57F76D67-0E55-4609-A61C-3A4C3073CA0E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Tests.Unit", "..\test\Kook.Net.Tests.Unit\Kook.Net.Tests.Unit.csproj", "{0DC41632-CF8D-4E1C-85E7-9B60308B5834}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Tests.Unit", "test\Kook.Net.Tests.Unit\Kook.Net.Tests.Unit.csproj", "{0DC41632-CF8D-4E1C-85E7-9B60308B5834}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.WebSocket", "Kook.Net.WebSocket\Kook.Net.WebSocket.csproj", "{9A4ED2A6-5560-434A-89A6-5EAA8024383F}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.WebSocket", "src\Kook.Net.WebSocket\Kook.Net.WebSocket.csproj", "{9A4ED2A6-5560-434A-89A6-5EAA8024383F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{8DE556F9-829D-48D3-A41C-FA57207CAE72}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.SimpleBot", "..\samples\Kook.Net.Samples.SimpleBot\Kook.Net.Samples.SimpleBot.csproj", "{FD42006A-B8F2-468B-816F-67914EAEA943}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.SimpleBot", "samples\Kook.Net.Samples.SimpleBot\Kook.Net.Samples.SimpleBot.csproj", "{FD42006A-B8F2-468B-816F-67914EAEA943}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net", "Kook.Net\Kook.Net.csproj", "{DBDF4A03-8FF0-4A0F-BB88-EBB061E35A77}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net", "src\Kook.Net\Kook.Net.csproj", "{DBDF4A03-8FF0-4A0F-BB88-EBB061E35A77}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.ReactionRoleBot", "..\samples\Kook.Net.Samples.ReactionRoleBot\Kook.Net.Samples.ReactionRoleBot.csproj", "{BDDB543B-69D2-4472-9C09-E40DD74D260C}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.ReactionRoleBot", "samples\Kook.Net.Samples.ReactionRoleBot\Kook.Net.Samples.ReactionRoleBot.csproj", "{BDDB543B-69D2-4472-9C09-E40DD74D260C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{B51E68C1-B6FC-49A3-B04D-57BB0C19B192}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Commands", "Kook.Net.Commands\Kook.Net.Commands.csproj", "{10ED905D-0060-40BF-8A79-46D52714DB30}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Commands", "src\Kook.Net.Commands\Kook.Net.Commands.csproj", "{10ED905D-0060-40BF-8A79-46D52714DB30}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.TextCommands", "..\samples\Kook.Net.Samples.TextCommands\Kook.Net.Samples.TextCommands.csproj", "{42BEF15F-724B-46A7-93F2-341D8D0B2759}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.TextCommands", "samples\Kook.Net.Samples.TextCommands\Kook.Net.Samples.TextCommands.csproj", "{42BEF15F-724B-46A7-93F2-341D8D0B2759}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Tests.Integration", "..\test\Kook.Net.Tests.Integration\Kook.Net.Tests.Integration.csproj", "{E1A2F066-6FE5-452E-946C-6D818E83C881}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Tests.Integration", "test\Kook.Net.Tests.Integration\Kook.Net.Tests.Integration.csproj", "{E1A2F066-6FE5-452E-946C-6D818E83C881}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Experimental", "Experimental", "{BB39595B-5DCE-4B1C-8740-A013C261E317}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Experimental", "Kook.Net.Experimental\Kook.Net.Experimental.csproj", "{95881FD6-BAF5-43A6-9D75-9F9181FC9D21}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Experimental", "src\Kook.Net.Experimental\Kook.Net.Experimental.csproj", "{95881FD6-BAF5-43A6-9D75-9F9181FC9D21}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "SolutionItems", "{55F21D65-BA1A-4A4B-B370-FD2CA0204EB2}"
ProjectSection(SolutionItems) = preProject
Kook.Net.targets = Kook.Net.targets
EndProjectSection
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Kook.Net.Samples.VisualBasic", "..\samples\Kook.Net.Samples.VisualBasic\Kook.Net.Samples.VisualBasic.vbproj", "{43C91115-7D09-4A28-95CD-380C3B00EAE0}"
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Kook.Net.Samples.VisualBasic", "samples\Kook.Net.Samples.VisualBasic\Kook.Net.Samples.VisualBasic.vbproj", "{43C91115-7D09-4A28-95CD-380C3B00EAE0}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Kook.Net.Samples.FSharp", "..\samples\Kook.Net.Samples.FSharp\Kook.Net.Samples.FSharp.fsproj", "{DCD692BE-9D91-4DE1-8603-CD8923C59B6A}"
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Kook.Net.Samples.FSharp", "samples\Kook.Net.Samples.FSharp\Kook.Net.Samples.FSharp.fsproj", "{DCD692BE-9D91-4DE1-8603-CD8923C59B6A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.Docker", "..\samples\Kook.Net.Samples.Docker\Kook.Net.Samples.Docker.csproj", "{B8A50094-A959-4807-AB36-6256A1EEEE61}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kook.Net.Samples.Docker", "samples\Kook.Net.Samples.Docker\Kook.Net.Samples.Docker.csproj", "{B8A50094-A959-4807-AB36-6256A1EEEE61}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
9 changes: 7 additions & 2 deletions src/Kook.Net.targets → Kook.Net.targets
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<VersionPrefix>0.5.2</VersionPrefix>
<IsPackable>false</IsPackable>
<!-- <VersionSuffix>rc</VersionSuffix>-->
<LangVersion>latest</LangVersion>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
Expand All @@ -13,8 +14,9 @@
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/gehongyan/Kook.Net.git</RepositoryUrl>
<Company>gehongyan</Company>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net7.0;net6.0;net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net7.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<PackageReadmeFile>README.md</PackageReadmeFile>
<TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net7.0;net6.0;net462;netstandard2.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0;net7.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
<NoWarn>$(NoWarn);NU1803</NoWarn>
<PackageVersion>$(Version)</PackageVersion>
<WarningLevel>6</WarningLevel>
Expand All @@ -26,4 +28,7 @@
<Version Condition=" '$(VersionSuffix)' != '' ">$(VersionPrefix)-$(VersionSuffix)</Version>
</PropertyGroup>

<ItemGroup>
<None Include="../../README.md" Pack="true" PackagePath="\"/>
</ItemGroup>
</Project>
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/gehongyan/Kook.Net/push-or-pr.yml?branch=master)
![GitHub Top Language](https://img.shields.io/github/languages/top/gehongyan/Kook.Net)
[![Nuget Version](https://img.shields.io/nuget/v/Kook.Net)](https://www.nuget.org/packages/Kook.Net)
[![Nuget](https://img.shields.io/nuget/dt/Kook.Net.Core?color=%230099ff)](https://www.nuget.org/packages/Kook.Net)
[![Nuget](https://img.shields.io/nuget/dt/Kook.Net?color=%230099ff)](https://www.nuget.org/packages/Kook.Net)
[![License](https://img.shields.io/github/license/gehongyan/Kook.Net)](https://github.com/gehongyan/Kook.Net/blob/master/LICENSE)
[![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fgehongyan%2FKook.Net.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Fgehongyan%2FKook.Net?ref=badge_shield)
[![Chat on Kook](https://www.kookapp.cn/api/v3/badge/guild?guild_id=1591057729615250)](https://kook.top/EvxnOb)
Expand All @@ -22,6 +22,7 @@

## Targets

- [.NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0)
- [.NET 7.0](https://dotnet.microsoft.com/download/dotnet/7.0)
- [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
- [.NET Standard 2.1](https://learn.microsoft.com/dotnet/standard/net-standard?tabs=net-standard-2-1)
Expand Down Expand Up @@ -81,8 +82,8 @@ for portion of the code in this repository according to [this license](https://g
Special thanks to [Discord.Net](https://github.com/discord-net/Discord.Net) for such a great project.

<p>
<img src="./assets/Rider_Icon.svg" height="50"/>
<img src="./assets/ReSharper_Icon.png" height="50"/>
<img src="./assets/Rider_Icon.svg" height="50" alt="RiderIcon"/>
<img src="./assets/ReSharper_Icon.png" height="50" alt="Resharper_Icon"/>
</p>

Special thanks to [JetBrains](https://www.jetbrains.com) for providing free licenses for their awesome tools -
Expand Down
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ title: 首页

Kook.Net 是一个对 [KOOK(原开黑啦)API] 进行功能封装的类库,以 C# 编写,编译所采用的目标框架包括

- [.NET 8.0](https://dotnet.microsoft.com/download/dotnet/8.0)
- [.NET 7.0](https://dotnet.microsoft.com/download/dotnet/7.0)
- [.NET 6.0](https://dotnet.microsoft.com/download/dotnet/6.0)
- [.NET Standard 2.1](https://learn.microsoft.com/dotnet/standard/net-standard?tabs=net-standard-2-1)
Expand Down
7 changes: 7 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMinor",
"allowPrerelease": true
}
}
File renamed without changes.
4 changes: 2 additions & 2 deletions samples/Kook.Net.Samples.Docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
WORKDIR /app

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /samples
COPY ["Kook.Net.Samples.Docker/Kook.Net.Samples.Docker.csproj", "Kook.Net.Samples.Docker/"]
RUN dotnet restore "Kook.Net.Samples.Docker/Kook.Net.Samples.Docker.csproj"
Expand Down
10 changes: 8 additions & 2 deletions samples/Kook.Net.Samples.Docker/Kook.Net.Samples.Docker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Kook.Net" Version="0.5.2" />
</ItemGroup>

<ItemGroup>
<Content Include="..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
Expand All @@ -16,11 +16,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
<PackageReference Include="Serilog" Version="2.12.0"/>
<PackageReference Include="Serilog.AspNetCore" Version="6.1.0"/>
<PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1"/>
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Serilog" Version="3.1.1" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
<PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
Expand All @@ -16,8 +16,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0"/>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>Kook.Net.Samples.VisualBasic</RootNamespace>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<RootNamespace>Kook.Net.Samples.VisualBasic</RootNamespace>
<TargetFramework>net8.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>


<ItemGroup>
<ProjectReference Include="..\..\src\Kook.Net\Kook.Net.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\Kook.Net\Kook.Net.csproj"/>
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Kook.Net.Commands/Kook.Net.Commands.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets"/>
<Import Project="../../Kook.Net.targets"/>

<PropertyGroup>
<RootNamespace>Kook.Commands</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 4 additions & 3 deletions src/Kook.Net.Core/Kook.Net.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets"/>
<Import Project="../../Kook.Net.targets"/>

<PropertyGroup>
<RootNamespace>Kook</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Collections.Immutable" Version="7.0.0"/>
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
<PackageReference Include="System.Text.Json" Version="7.0.2"/>
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

</Project>
3 changes: 2 additions & 1 deletion src/Kook.Net.Experimental/Kook.Net.Experimental.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets" />
<Import Project="../../Kook.Net.targets" />

<PropertyGroup>
<RootNamespace>Kook.Rest</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions src/Kook.Net.Rest/Kook.Net.Rest.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets" />
<Import Project="../../Kook.Net.targets" />

<PropertyGroup>
<RootNamespace>Kook.Rest</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand All @@ -12,7 +13,7 @@

<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.Text.Json" Version="7.0.2" />
<PackageReference Include="System.Text.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 2 additions & 1 deletion src/Kook.Net.WebSocket/Kook.Net.WebSocket.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets"/>
<Import Project="../../Kook.Net.targets"/>

<PropertyGroup>
<RootNamespace>Kook.WebSocket</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
Expand Down
3 changes: 2 additions & 1 deletion src/Kook.Net/Kook.Net.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<Import Project="../Kook.Net.targets"/>
<Import Project="../../Kook.Net.targets"/>

<PropertyGroup>
<RootNamespace>Kook</RootNamespace>
<IsPackable>true</IsPackable>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 0 additions & 7 deletions src/global.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>disable</Nullable>
<IsPackable>false</IsPackable>
<RootNamespace>Kook.Net.Tests</RootNamespace>
Expand All @@ -10,17 +10,17 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.10.0"/>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
<PackageReference Include="xunit" Version="2.4.2"/>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="xunit" Version="2.6.1" />
</ItemGroup>

<ItemGroup Condition=" $([System.Text.RegularExpressions.Regex]::IsMatch($(TargetFramework), '^net\d\.\d$')) ">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 8f2b0cc

Please sign in to comment.