From 19897db7c7fc8d695aa32031e57f68b864d56fae Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 19:24:26 +0200 Subject: [PATCH 1/6] Update Net8 --- PugSharp.Api.Contract/PugSharp.Api.Contract.csproj | 2 +- PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj | 2 +- PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj | 2 +- PugSharp.Api.Json/PugSharp.Api.Json.csproj | 2 +- PugSharp.ApiStats/PugSharp.ApiStats.csproj | 2 +- PugSharp.Config/PugSharp.Config.csproj | 2 +- PugSharp.DebugDummy/PugSharp.DebugDummy.csproj | 2 +- PugSharp.Match.Contract/PugSharp.Match.Contract.csproj | 2 +- PugSharp.Match.Tests/PugSharp.Match.Tests.csproj | 2 +- PugSharp.Match/PugSharp.Match.csproj | 2 +- PugSharp.Server.Contract/PugSharp.Server.Contract.csproj | 2 +- PugSharp.Shared/PugSharp.Shared.csproj | 2 +- PugSharp.Translation/PugSharp.Translation.csproj | 2 +- PugSharp/PugSharp.csproj | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj index 80ec2085..4a5c93b5 100644 --- a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj +++ b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj b/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj index 15dedb0a..71227e6a 100644 --- a/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj +++ b/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable false diff --git a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj index dfcdb3f1..7ca9cb86 100644 --- a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj +++ b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Api.Json/PugSharp.Api.Json.csproj b/PugSharp.Api.Json/PugSharp.Api.Json.csproj index d68bb675..4f78bbd5 100644 --- a/PugSharp.Api.Json/PugSharp.Api.Json.csproj +++ b/PugSharp.Api.Json/PugSharp.Api.Json.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.ApiStats/PugSharp.ApiStats.csproj b/PugSharp.ApiStats/PugSharp.ApiStats.csproj index bce4ba35..06c17e54 100644 --- a/PugSharp.ApiStats/PugSharp.ApiStats.csproj +++ b/PugSharp.ApiStats/PugSharp.ApiStats.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Config/PugSharp.Config.csproj b/PugSharp.Config/PugSharp.Config.csproj index 5f037928..6d4f4c8a 100644 --- a/PugSharp.Config/PugSharp.Config.csproj +++ b/PugSharp.Config/PugSharp.Config.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj b/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj index 0e7429c8..65d07dfc 100644 --- a/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj +++ b/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj @@ -1,7 +1,7 @@  Exe - net7.0 + net8.0 enable enable diff --git a/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj b/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj index 10308871..901f2f00 100644 --- a/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj +++ b/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj @@ -1,6 +1,6 @@ - net7.0 + net8.0 enable enable diff --git a/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj b/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj index 93924078..bd507dcd 100644 --- a/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj +++ b/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable false diff --git a/PugSharp.Match/PugSharp.Match.csproj b/PugSharp.Match/PugSharp.Match.csproj index 48c6f7d2..b2532828 100644 --- a/PugSharp.Match/PugSharp.Match.csproj +++ b/PugSharp.Match/PugSharp.Match.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj b/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj index ebe1389a..dc38ce55 100644 --- a/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj +++ b/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Shared/PugSharp.Shared.csproj b/PugSharp.Shared/PugSharp.Shared.csproj index 9809bf33..babe0a7f 100644 --- a/PugSharp.Shared/PugSharp.Shared.csproj +++ b/PugSharp.Shared/PugSharp.Shared.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable diff --git a/PugSharp.Translation/PugSharp.Translation.csproj b/PugSharp.Translation/PugSharp.Translation.csproj index 2ab6eb7e..4e8a47b3 100644 --- a/PugSharp.Translation/PugSharp.Translation.csproj +++ b/PugSharp.Translation/PugSharp.Translation.csproj @@ -1,6 +1,6 @@  - net7.0 + net8.0 enable enable en diff --git a/PugSharp/PugSharp.csproj b/PugSharp/PugSharp.csproj index 6da01eb4..230b9e6f 100644 --- a/PugSharp/PugSharp.csproj +++ b/PugSharp/PugSharp.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable From 2d7b6ad0de5c08520a8e0adeaa82f8ca14672f08 Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 19:25:02 +0200 Subject: [PATCH 2/6] Update Packages --- PugSharp.Api.Contract/PugSharp.Api.Contract.csproj | 8 ++++---- PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj | 2 +- PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj | 4 ++-- PugSharp.Api.Json/PugSharp.Api.Json.csproj | 6 +++--- PugSharp.ApiStats/PugSharp.ApiStats.csproj | 8 ++++---- PugSharp.Config/PugSharp.Config.csproj | 8 ++++---- PugSharp.DebugDummy/PugSharp.DebugDummy.csproj | 4 ++-- PugSharp.Match.Contract/PugSharp.Match.Contract.csproj | 8 ++++---- PugSharp.Match.Tests/PugSharp.Match.Tests.csproj | 4 ++-- PugSharp.Match/PugSharp.Match.csproj | 6 +++--- PugSharp.Server.Contract/PugSharp.Server.Contract.csproj | 6 +++--- PugSharp.Shared/PugSharp.Shared.csproj | 6 +++--- PugSharp.Translation/PugSharp.Translation.csproj | 6 +++--- PugSharp/PugSharp.csproj | 6 +++--- 14 files changed, 41 insertions(+), 41 deletions(-) diff --git a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj index 4a5c93b5..49a33570 100644 --- a/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj +++ b/PugSharp.Api.Contract/PugSharp.Api.Contract.csproj @@ -6,9 +6,9 @@ - - - - + + + + diff --git a/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj b/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj index 71227e6a..d8a1633d 100644 --- a/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj +++ b/PugSharp.Api.G5Api.Tests/PugSharp.Api.G5Api.Tests.csproj @@ -10,7 +10,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj index 7ca9cb86..9c3160f1 100644 --- a/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj +++ b/PugSharp.Api.G5Api/PugSharp.Api.G5Api.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/PugSharp.Api.Json/PugSharp.Api.Json.csproj b/PugSharp.Api.Json/PugSharp.Api.Json.csproj index 4f78bbd5..14bf47ef 100644 --- a/PugSharp.Api.Json/PugSharp.Api.Json.csproj +++ b/PugSharp.Api.Json/PugSharp.Api.Json.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/PugSharp.ApiStats/PugSharp.ApiStats.csproj b/PugSharp.ApiStats/PugSharp.ApiStats.csproj index 06c17e54..b9f40282 100644 --- a/PugSharp.ApiStats/PugSharp.ApiStats.csproj +++ b/PugSharp.ApiStats/PugSharp.ApiStats.csproj @@ -11,9 +11,9 @@ - - - - + + + + \ No newline at end of file diff --git a/PugSharp.Config/PugSharp.Config.csproj b/PugSharp.Config/PugSharp.Config.csproj index 6d4f4c8a..68965245 100644 --- a/PugSharp.Config/PugSharp.Config.csproj +++ b/PugSharp.Config/PugSharp.Config.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj b/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj index 65d07dfc..61780a8b 100644 --- a/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj +++ b/PugSharp.DebugDummy/PugSharp.DebugDummy.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj b/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj index 901f2f00..37832c6c 100644 --- a/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj +++ b/PugSharp.Match.Contract/PugSharp.Match.Contract.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj b/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj index bd507dcd..bfc5309a 100644 --- a/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj +++ b/PugSharp.Match.Tests/PugSharp.Match.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/PugSharp.Match/PugSharp.Match.csproj b/PugSharp.Match/PugSharp.Match.csproj index b2532828..dd5764e3 100644 --- a/PugSharp.Match/PugSharp.Match.csproj +++ b/PugSharp.Match/PugSharp.Match.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj b/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj index dc38ce55..90426394 100644 --- a/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj +++ b/PugSharp.Server.Contract/PugSharp.Server.Contract.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/PugSharp.Shared/PugSharp.Shared.csproj b/PugSharp.Shared/PugSharp.Shared.csproj index babe0a7f..dc3a9be1 100644 --- a/PugSharp.Shared/PugSharp.Shared.csproj +++ b/PugSharp.Shared/PugSharp.Shared.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/PugSharp.Translation/PugSharp.Translation.csproj b/PugSharp.Translation/PugSharp.Translation.csproj index 4e8a47b3..a86ee511 100644 --- a/PugSharp.Translation/PugSharp.Translation.csproj +++ b/PugSharp.Translation/PugSharp.Translation.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/PugSharp/PugSharp.csproj b/PugSharp/PugSharp.csproj index 230b9e6f..2a758803 100644 --- a/PugSharp/PugSharp.csproj +++ b/PugSharp/PugSharp.csproj @@ -7,14 +7,14 @@ - + none runtime compile; build; native; contentfiles; analyzers; buildtransitive - + - + From 589b9fa54db624922369455e25f6e8147efdc108 Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 20:00:39 +0200 Subject: [PATCH 3/6] Extend console Logging --- PugSharp/PugSharp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PugSharp/PugSharp.cs b/PugSharp/PugSharp.cs index 40c577f3..58f9421a 100644 --- a/PugSharp/PugSharp.cs +++ b/PugSharp/PugSharp.cs @@ -48,7 +48,7 @@ public override void Load(bool hotReload) services.AddLogging(options => { - //options.AddConsole(); + options.AddConsole(); }); var serviceDescriptor = services.FirstOrDefault(descriptor => descriptor.ServiceType == typeof(ILoggerFactory)); From 2de378050f8194f1ac62ff4d573751ad07aad70f Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 20:03:22 +0200 Subject: [PATCH 4/6] Update Pipeline --- .github/workflows/test_and_build.yml | 6 +++--- PugSharp.sln | 14 ++++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index 41720b7a..f7d33af0 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -36,7 +36,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 7.0 + dotnet-version: 8.0 - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -189,7 +189,7 @@ jobs: - name: prepare package structure run: mkdir -p packagebuild/addons/counterstrikesharp/plugins/PugSharp - name: copy package content - run: cp -rf PugSharp/bin/Debug/net7.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp + run: cp -rf PugSharp/bin/Debug/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp - name: copy sample configs run: cp -rf resources/cfg packagebuild/cfg - name: build package @@ -277,7 +277,7 @@ jobs: run: mkdir -p packagebuild/addons/counterstrikesharp/plugins/PugSharp shell: bash - name: copy package content - run: cp -rf PugSharp/bin/Debug/net7.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp + run: cp -rf PugSharp/bin/Debug/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp shell: bash - name: copy sample configs run: cp -rf resources/cfg packagebuild/cfg diff --git a/PugSharp.sln b/PugSharp.sln index 50c778a7..c90f9110 100644 --- a/PugSharp.sln +++ b/PugSharp.sln @@ -39,6 +39,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PugSharp.Shared", "PugSharp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PugSharp.Api.G5Api.Tests", "PugSharp.Api.G5Api.Tests\PugSharp.Api.G5Api.Tests.csproj", "{32CFE830-AF15-497C-806F-EE31F64D8F04}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{4026B00D-BC5D-4F42-B369-1703C8D7460A}" + ProjectSection(SolutionItems) = preProject + .github\dependabot.yml = .github\dependabot.yml + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{600860EC-2A30-46DC-A197-B6709A158169}" + ProjectSection(SolutionItems) = preProject + .github\workflows\test_and_build.yml = .github\workflows\test_and_build.yml + .github\workflows\website_build.yml = .github\workflows\website_build.yml + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -105,6 +116,9 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {600860EC-2A30-46DC-A197-B6709A158169} = {4026B00D-BC5D-4F42-B369-1703C8D7460A} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {AD40617F-6B33-45B4-AF4D-1D5D0EA8F958} EndGlobalSection From 370dba85eeb77fb083ca3a86f31dcee63d007cd3 Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 20:18:34 +0200 Subject: [PATCH 5/6] fix pipeline --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index f7d33af0..d58285be 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -189,7 +189,7 @@ jobs: - name: prepare package structure run: mkdir -p packagebuild/addons/counterstrikesharp/plugins/PugSharp - name: copy package content - run: cp -rf PugSharp/bin/Debug/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp + run: cp -rf PugSharp/bin/Release/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp - name: copy sample configs run: cp -rf resources/cfg packagebuild/cfg - name: build package From c96effc497c3601640eb89221d90e3bf8c181a31 Mon Sep 17 00:00:00 2001 From: TheR00st3r Date: Tue, 9 Apr 2024 20:28:58 +0200 Subject: [PATCH 6/6] Release dir --- .github/workflows/test_and_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_build.yml b/.github/workflows/test_and_build.yml index d58285be..401545b6 100644 --- a/.github/workflows/test_and_build.yml +++ b/.github/workflows/test_and_build.yml @@ -277,7 +277,7 @@ jobs: run: mkdir -p packagebuild/addons/counterstrikesharp/plugins/PugSharp shell: bash - name: copy package content - run: cp -rf PugSharp/bin/Debug/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp + run: cp -rf PugSharp/bin/Release/net8.0/publish/* packagebuild/addons/counterstrikesharp/plugins/PugSharp shell: bash - name: copy sample configs run: cp -rf resources/cfg packagebuild/cfg