From 02a3687f8a7be65d2d52bc4466e62440456ee139 Mon Sep 17 00:00:00 2001 From: Digitalroot Date: Wed, 15 May 2024 10:35:56 -0700 Subject: [PATCH] Update for Ashlands --- .github/workflows/discord.yml | 16 ---------- .github/workflows/release.yml | 4 ++- .../.ts/manifest.json | 4 +-- ...lroot.Valheim.SlopeCombatAssistance.csproj | 6 ++-- .../packages.lock.json | 32 ++++++------------- src/Digitalroot.Valheim.SlopeCombatFix.sln | 3 +- src/UnitTests/UnitTests.csproj | 6 ++-- 7 files changed, 21 insertions(+), 50 deletions(-) delete mode 100644 .github/workflows/discord.yml diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml deleted file mode 100644 index b2ed5b9..0000000 --- a/.github/workflows/discord.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Discord Webhook - -on: - push: - branches: [ "main" ] # Default release branch - paths: - - 'src/**' - - '.github/workflows/**' - -jobs: - discord: - uses: Digitalroot-Valheim/.github/.github/workflows/discord.yml@main - with: - repo_name: ${{ github.event.repository.name }} - secrets: - webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 99a2dea..cbe7157 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,6 +27,8 @@ jobs: nexus-cookie-nxid-header: ${{ secrets.NEXUS_COOKIE_HEADER_NEXUSID }} nexus-cookie-sid-header: ${{ secrets.NEXUS_COOKIE_HEADER_SID_DEVELOP }} ts-api-key: ${{ secrets.TS_SERVICEACCOUNT }} + webhook_url: ${{ secrets.VALHEIM_DISCORD_TITANS_WEBHOOK_URL }} + with: sln-file-name: Digitalroot.Valheim.SlopeCombatFix proj-file-name: Digitalroot.Valheim.SlopeCombatAssistance @@ -37,4 +39,4 @@ jobs: ts-name: Digitalroots_Slope_Combat_Assistance ts-description: "Digitalroot's take on the Slope Combat Fix mod. DoD compatible." ts-categories: "client-side server-side tweaks" #https://thunderstore.io/api/experimental/community/valheim/category/ - ts-dependencies: denikson-BepInExPack_Valheim@5.4.2105 ValheimModding-Jotunn@2.12.1 + ts-dependencies: ValheimModding-Jotunn-2.20.0 diff --git a/src/Digitalroot.Valheim.SlopeCombatAssistance/.ts/manifest.json b/src/Digitalroot.Valheim.SlopeCombatAssistance/.ts/manifest.json index df29730..4cce475 100644 --- a/src/Digitalroot.Valheim.SlopeCombatAssistance/.ts/manifest.json +++ b/src/Digitalroot.Valheim.SlopeCombatAssistance/.ts/manifest.json @@ -5,8 +5,8 @@ "description": "Digitalroot's take on the Slope Combat Fix mod. DoD compatible.", "version_number": "%VERSION_NUMBER%", "dependencies": [ - "denikson-BepInExPack_Valheim-5.4.1901", - "ValheimModding-Jotunn-2.10.0" + "denikson-BepInExPack_Valheim-5.4.2202", + "ValheimModding-Jotunn-2.20.0" ], "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.SlopeCombatFix" } diff --git a/src/Digitalroot.Valheim.SlopeCombatAssistance/Digitalroot.Valheim.SlopeCombatAssistance.csproj b/src/Digitalroot.Valheim.SlopeCombatAssistance/Digitalroot.Valheim.SlopeCombatAssistance.csproj index 09afc7e..6df2d75 100644 --- a/src/Digitalroot.Valheim.SlopeCombatAssistance/Digitalroot.Valheim.SlopeCombatAssistance.csproj +++ b/src/Digitalroot.Valheim.SlopeCombatAssistance/Digitalroot.Valheim.SlopeCombatAssistance.csproj @@ -38,16 +38,16 @@ all - + all - + all runtime compile; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/Digitalroot.Valheim.SlopeCombatAssistance/packages.lock.json b/src/Digitalroot.Valheim.SlopeCombatAssistance/packages.lock.json index 67d0435..e60786a 100644 --- a/src/Digitalroot.Valheim.SlopeCombatAssistance/packages.lock.json +++ b/src/Digitalroot.Valheim.SlopeCombatAssistance/packages.lock.json @@ -14,9 +14,9 @@ }, "Digitalroot.References.Unity": { "type": "Direct", - "requested": "[2022.3.12, )", - "resolved": "2022.3.12", - "contentHash": "QgMwg+WAnbvmjxSuL+PKjr+35B0FhO0Thw9ddoSBrfBkYsMSCYAqJ0APsN2AQfXn3zVdJgP7Rw2S41DJfuBxRQ==" + "requested": "[2022.3.17, )", + "resolved": "2022.3.17", + "contentHash": "edxgtveXwn+ACtMyak1McLwoQxKm/GXdh8Drcx2hoFl5VoFeR9wdwEz1yJdVtbamtecZOVghEn3tKKR3ekqOeg==" }, "Digitalroot.Valheim.Build.Targets": { "type": "Direct", @@ -26,24 +26,15 @@ }, "Digitalroot.Valheim.Common.References": { "type": "Direct", - "requested": "[0.217.38, )", - "resolved": "0.217.38", - "contentHash": "y8KIE7aSMeFytv1ks7CJIoDLWUPN4vzaSkWN2r4kDhkoq65rmmxB1UsjI+VZvfs9LZ5COfZwdQlz628/2Nclgg==" + "requested": "[0.218.15, )", + "resolved": "0.218.15", + "contentHash": "Qg5YEUrGP9yBimtvSyfmODhOMFwErdGt6ZmFyz2zU1CeW4pgXA+VHIskqA2oHHkzp/6FLhr0ZR5laeAQ+Ah8aA==" }, "Digitalroot.Valheim.References.JvL": { "type": "Direct", - "requested": "[2.15.2, )", - "resolved": "2.15.2", - "contentHash": "+GcLrGLT7mqaniFbBthYMNgRClTbDP0VSEBN+Leo56rDm4YFHbZVUanXOzJK+dWIEtttIeDINKtAJt4iljjdiw==" - }, - "Microsoft.NETFramework.ReferenceAssemblies": { - "type": "Direct", - "requested": "[1.0.3, )", - "resolved": "1.0.3", - "contentHash": "vUc9Npcs14QsyOD01tnv/m8sQUnGTGOw1BCmKcv77LBJY7OxhJ+zJF7UD/sCL3lYNFuqmQEVlkfS4Quif6FyYg==", - "dependencies": { - "Microsoft.NETFramework.ReferenceAssemblies.net48": "1.0.3" - } + "requested": "[2.20.0, )", + "resolved": "2.20.0", + "contentHash": "4CCkEMVzlRDPeMQutVbRc3N0Ru4I28+2gbL788KD3+TkkqRX38+YMt1ez8gy42rka/IJ1SquxZdQnUJDnq/gcw==" }, "BepInEx.BaseLib": { "type": "Transitive", @@ -58,11 +49,6 @@ "MonoMod.RuntimeDetour": "21.12.13.1" } }, - "Microsoft.NETFramework.ReferenceAssemblies.net48": { - "type": "Transitive", - "resolved": "1.0.3", - "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ==" - }, "Mono.Cecil": { "type": "Transitive", "resolved": "0.11.4", diff --git a/src/Digitalroot.Valheim.SlopeCombatFix.sln b/src/Digitalroot.Valheim.SlopeCombatFix.sln index 24e82e3..575ed7f 100644 --- a/src/Digitalroot.Valheim.SlopeCombatFix.sln +++ b/src/Digitalroot.Valheim.SlopeCombatFix.sln @@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{E64D EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1960DCD1-3C51-48FF-BFF8-5FE4C3CBABB2}" ProjectSection(SolutionItems) = preProject - ..\.github\workflows\discord.yml = ..\.github\workflows\discord.yml ..\.github\workflows\nuget.autoupdate.yml = ..\.github\workflows\nuget.autoupdate.yml ..\.github\workflows\release.yml = ..\.github\workflows\release.yml EndProjectSection @@ -26,7 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{C9898E63-1 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Digitalroot.Valheim.SlopeCombatAssistance", "Digitalroot.Valheim.SlopeCombatAssistance\Digitalroot.Valheim.SlopeCombatAssistance.csproj", "{80CDA45A-1494-483A-8B28-F4307498A9E4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{6733B4AD-DE8B-4831-913F-D91658716F23}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "UnitTests\UnitTests.csproj", "{6733B4AD-DE8B-4831-913F-D91658716F23}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index 5da37cc..72cbe11 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -7,10 +7,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive