From f90591399081c6ab95952e6949a15d7cf1f3f90d Mon Sep 17 00:00:00 2001 From: Norgerman Date: Mon, 17 Nov 2025 17:04:47 +0800 Subject: [PATCH] net 10.0 --- .github/workflows/build.yml | 4 +- .github/workflows/publish.yml | 4 +- Directory.Build.props | 4 +- Shark.Client/Shark.Client.Project.props | 5 +- Shark.Commons/Shark.Commons.csproj | 6 +-- Shark.Plugins/Shark.Plugins.csproj | 4 +- Shark.Server/Shark.Server.Project.props | 4 +- Shark.sln | 65 ------------------------- Shark.slnx | 16 ++++++ 9 files changed, 31 insertions(+), 81 deletions(-) delete mode 100644 Shark.sln create mode 100644 Shark.slnx diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56d6862..1e9b402 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index b868850..1e7e9ea 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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}} diff --git a/Directory.Build.props b/Directory.Build.props index 438aab4..9df7fcb 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,8 +1,8 @@ - 7.2.1 + 7.3.0 - net8.0 + net10.0 Norgerman Shark Copyright 2019 (c) Norgerman. diff --git a/Shark.Client/Shark.Client.Project.props b/Shark.Client/Shark.Client.Project.props index 33fcfb7..013525e 100644 --- a/Shark.Client/Shark.Client.Project.props +++ b/Shark.Client/Shark.Client.Project.props @@ -11,9 +11,8 @@ - - - + + diff --git a/Shark.Commons/Shark.Commons.csproj b/Shark.Commons/Shark.Commons.csproj index 8f14770..33e0b3e 100644 --- a/Shark.Commons/Shark.Commons.csproj +++ b/Shark.Commons/Shark.Commons.csproj @@ -8,8 +8,8 @@ - - - + + + diff --git a/Shark.Plugins/Shark.Plugins.csproj b/Shark.Plugins/Shark.Plugins.csproj index aed6d82..44a4b05 100644 --- a/Shark.Plugins/Shark.Plugins.csproj +++ b/Shark.Plugins/Shark.Plugins.csproj @@ -3,7 +3,7 @@ - - + + diff --git a/Shark.Server/Shark.Server.Project.props b/Shark.Server/Shark.Server.Project.props index 2a414d6..1072f22 100644 --- a/Shark.Server/Shark.Server.Project.props +++ b/Shark.Server/Shark.Server.Project.props @@ -6,8 +6,8 @@ - - + + diff --git a/Shark.sln b/Shark.sln deleted file mode 100644 index 918458e..0000000 --- a/Shark.sln +++ /dev/null @@ -1,65 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.0.31903.59 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Server", "Shark.Server\Shark.Server.csproj", "{08971640-D508-4CA1-BC0E-5A2BB094403A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Commons", "Shark.Commons\Shark.Commons.csproj", "{152CAA10-E38A-4362-BC02-231AE7EEB5E4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Client", "Shark.Client\Shark.Client.csproj", "{5242BF7A-A713-43B6-A38E-5912A58BC0F6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Client.Tool", "Shark.Client.Tool\Shark.Client.Tool.csproj", "{EAB3F679-31E6-4F29-BCB3-BD1D64C89F6F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Server.Tool", "Shark.Server.Tool\Shark.Server.Tool.csproj", "{6AA59A81-6FC7-47E7-9A9D-09A53E0B0EBB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D2DBDED8-8CC2-47E3-97F9-F7F8A6CCA8E2}" - ProjectSection(SolutionItems) = preProject - .gitignore = .gitignore - config.yml = config.yml - Directory.Build.props = Directory.Build.props - LICENSE = LICENSE - privoxy-config.txt = privoxy-config.txt - README.md = README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shark.Plugins", "Shark.Plugins\Shark.Plugins.csproj", "{79F1BA75-FE9E-43CF-94BC-DB65B3623930}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {08971640-D508-4CA1-BC0E-5A2BB094403A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08971640-D508-4CA1-BC0E-5A2BB094403A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08971640-D508-4CA1-BC0E-5A2BB094403A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08971640-D508-4CA1-BC0E-5A2BB094403A}.Release|Any CPU.Build.0 = Release|Any CPU - {152CAA10-E38A-4362-BC02-231AE7EEB5E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {152CAA10-E38A-4362-BC02-231AE7EEB5E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {152CAA10-E38A-4362-BC02-231AE7EEB5E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {152CAA10-E38A-4362-BC02-231AE7EEB5E4}.Release|Any CPU.Build.0 = Release|Any CPU - {5242BF7A-A713-43B6-A38E-5912A58BC0F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5242BF7A-A713-43B6-A38E-5912A58BC0F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5242BF7A-A713-43B6-A38E-5912A58BC0F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5242BF7A-A713-43B6-A38E-5912A58BC0F6}.Release|Any CPU.Build.0 = Release|Any CPU - {EAB3F679-31E6-4F29-BCB3-BD1D64C89F6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EAB3F679-31E6-4F29-BCB3-BD1D64C89F6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EAB3F679-31E6-4F29-BCB3-BD1D64C89F6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EAB3F679-31E6-4F29-BCB3-BD1D64C89F6F}.Release|Any CPU.Build.0 = Release|Any CPU - {6AA59A81-6FC7-47E7-9A9D-09A53E0B0EBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6AA59A81-6FC7-47E7-9A9D-09A53E0B0EBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6AA59A81-6FC7-47E7-9A9D-09A53E0B0EBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6AA59A81-6FC7-47E7-9A9D-09A53E0B0EBB}.Release|Any CPU.Build.0 = Release|Any CPU - {79F1BA75-FE9E-43CF-94BC-DB65B3623930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79F1BA75-FE9E-43CF-94BC-DB65B3623930}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79F1BA75-FE9E-43CF-94BC-DB65B3623930}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79F1BA75-FE9E-43CF-94BC-DB65B3623930}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F75EA340-77AD-4B9D-A241-9B552B3B3C40} - EndGlobalSection -EndGlobal diff --git a/Shark.slnx b/Shark.slnx new file mode 100644 index 0000000..677d4d5 --- /dev/null +++ b/Shark.slnx @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + +