Skip to content

net 10.0 #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Norgerman merged 1 commit into from
Nov 17, 2025
Merged

net 10.0 #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
- name: Checkout code
uses: actions/checkout@master
- name: Setup dotnet
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'

- run: dotnet build
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:
- name: Checkout code
uses: actions/checkout@master
- name: Setup dotnet
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v5
with:
dotnet-version: '8.0.x'
dotnet-version: '10.0.x'
source-url: https://nuget.pkg.github.com/okawali/index.json
env:
NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand Down
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<VersionPrefix>7.2.1</VersionPrefix>
<VersionPrefix>7.3.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Authors>Norgerman</Authors>
<PackageTags>Shark</PackageTags>
<Copyright>Copyright 2019 (c) Norgerman.</Copyright>
Expand Down
5 changes: 2 additions & 3 deletions Shark.Client/Shark.Client.Project.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@

<ItemGroup>
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions Shark.Commons/Shark.Commons.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Shark.Plugins/Shark.Plugins.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ProjectReference Include="..\Shark.Commons\Shark.Commons.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="McMaster.NETCore.Plugins" Version="1.4.0" />
<PackageReference Include="Norgerman.Cryptography.Scrypt" Version="2.4.0" />
<PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
<PackageReference Include="Norgerman.Cryptography.Scrypt" Version="2.5.0" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Shark.Server/Shark.Server.Project.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

<ItemGroup>
<PackageReference Include="Mono.Options" Version="6.12.0.148" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" />
<PackageReference Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
</ItemGroup>

Expand Down
65 changes: 0 additions & 65 deletions Shark.sln
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions Shark.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path=".gitignore" />
<File Path="config.yml" />
<File Path="Directory.Build.props" />
<File Path="LICENSE" />
<File Path="privoxy-config.txt" />
<File Path="README.md" />
</Folder>
<Project Path="Shark.Client.Tool/Shark.Client.Tool.csproj" />
<Project Path="Shark.Client/Shark.Client.csproj" />
<Project Path="Shark.Commons/Shark.Commons.csproj" />
<Project Path="Shark.Plugins/Shark.Plugins.csproj" />
<Project Path="Shark.Server.Tool/Shark.Server.Tool.csproj" />
<Project Path="Shark.Server/Shark.Server.csproj" />
</Solution>