Update for Ashlands

Digitalroot-Valheim · May 15, 2024 · a45e2dc · a45e2dc
1 parent b17e58c
commit a45e2dc
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 67 deletions.
diff --git a/.github/workflows/discord.yml b/.github/workflows/discord.yml
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,15 +26,16 @@ 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.BetterClubs
       proj-file-name: Digitalroot.Valheim.BetterClubs
-      #create-github-release: false
       is-nuget-package: false
       nexus-enable-upload: true
       nexus-mod-id: 1288
       ts-enable-upload: true
       ts-name: Better_Clubs
       ts-description: "Add new upgrades for the Club weapon."
       ts-categories: Server-side Client-side Tweaks
-      ts-dependencies: [email protected] ValheimModding-Jotunn@2.14.6
+      ts-dependencies: ValheimModding-Jotunn-2.20.0
diff --git a/src/Digitalroot.Valheim.BetterClubs.sln b/src/Digitalroot.Valheim.BetterClubs.sln
@@ -14,7 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{4DB4
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{B5463D38-F4E4-44BB-877A-0465C4B96D87}"
 	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

diff --git a/src/Digitalroot.Valheim.BetterClubs/.nx/header.png b/src/Digitalroot.Valheim.BetterClubs/.nx/header.png
diff --git a/src/Digitalroot.Valheim.BetterClubs/.ts/manifest.json b/src/Digitalroot.Valheim.BetterClubs/.ts/manifest.json
@@ -5,8 +5,8 @@
   "description": "Adds new upgrades for the Club weapon.",
   "version_number": "%VERSION_NUMBER%",
   "dependencies": [
-    "denikson-BepInExPack_Valheim-5.4.2105",
-    "ValheimModding-Jotunn-2.11.5"
+    "denikson-BepInExPack_Valheim-5.4.2202",
+    "ValheimModding-Jotunn-2.20.0"
   ],
   "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.BetterClubs"
 }
diff --git a/src/Digitalroot.Valheim.BetterClubs/Digitalroot.Valheim.BetterClubs.csproj b/src/Digitalroot.Valheim.BetterClubs/Digitalroot.Valheim.BetterClubs.csproj
@@ -52,13 +52,13 @@
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.Common.Names" Version="1.4.18" />
-    <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.217.38">
+    <PackageReference Include="Digitalroot.Valheim.Common.Names" Version="1.4.30" />
+    <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.218.15">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Digitalroot.Valheim.References.JvL" Version="2.15.2" />
+    <PackageReference Include="Digitalroot.Valheim.References.JvL" Version="2.20.0" />
     <PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Digitalroot.Valheim.BetterClubs/packages.lock.json b/src/Digitalroot.Valheim.BetterClubs/packages.lock.json
@@ -20,24 +20,24 @@
       },
       "Digitalroot.Valheim.Common.Names": {
         "type": "Direct",
-        "requested": "[1.4.18, )",
-        "resolved": "1.4.18",
-        "contentHash": "FqjWNLeVXk6J14c7GWftZ8aIpsqPJ3uXKy+HXgS66SjED/h6j5EEirUZnDMGe7A/6GboNUA06/JDp3R8qfR2kg==",
+        "requested": "[1.4.30, )",
+        "resolved": "1.4.30",
+        "contentHash": "K66KrjXNaIE/igUTE4/UpVfmnIXKOduwzPoSI8u2SHZqf7wutFlBASZx66ek7A/nNi9S/4aXTWnwMX35NAs8oA==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Utils": "1.0.55"
+          "Digitalroot.Valheim.Common.Utils": "1.0.63"
         }
       },
       "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=="
+        "requested": "[2.20.0, )",
+        "resolved": "2.20.0",
+        "contentHash": "4CCkEMVzlRDPeMQutVbRc3N0Ru4I28+2gbL788KD3+TkkqRX38+YMt1ez8gy42rka/IJ1SquxZdQnUJDnq/gcw=="
       },
       "ErrorProne.NET.CoreAnalyzers": {
         "type": "Direct",
@@ -60,56 +60,41 @@
           "Fody": "6.3.0"
         }
       },
-      "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"
-        }
-      },
       "BepInEx.BaseLib": {
         "type": "Transitive",
         "resolved": "5.4.20",
         "contentHash": "0bXgYxbCEN2Ixp3kiFEhyw+RASeFQeg/ww+lbMt7if6XMeVS60eg6epNsMA8Jbx57dmNOzNevkKKw8mP8SUMqw=="
       },
       "Digitalroot.References.Unity": {
         "type": "Transitive",
-        "resolved": "2022.3.12",
-        "contentHash": "QgMwg+WAnbvmjxSuL+PKjr+35B0FhO0Thw9ddoSBrfBkYsMSCYAqJ0APsN2AQfXn3zVdJgP7Rw2S41DJfuBxRQ=="
+        "resolved": "2022.3.17",
+        "contentHash": "edxgtveXwn+ACtMyak1McLwoQxKm/GXdh8Drcx2hoFl5VoFeR9wdwEz1yJdVtbamtecZOVghEn3tKKR3ekqOeg=="
       },
       "Digitalroot.Valheim.Common.Json": {
         "type": "Transitive",
-        "resolved": "1.0.34",
-        "contentHash": "L7xiFHkundjUriPdJeqpy+V65EjaJpIrQu925VV1E1JbvL16jcVDY32Hj5HoREUEe1Tn8VJSYJBU6SJTqha2kw==",
+        "resolved": "1.0.41",
+        "contentHash": "GScGAJd21loJA8SLAZ6ZhnP40T3wEF79uEUpL9GDPirr/nwFnybUeafZwKtSWvauPVZT/x/fXc8SJ5j68WjQ5Q==",
         "dependencies": {
-          "Digitalroot.References.Unity": "2022.3.12",
-          "Digitalroot.Valheim.Common.References": "0.217.30",
-          "fastJSON": "2.4.0.4"
+          "Digitalroot.References.Unity": "2022.3.17",
+          "LibZ.Tool": "1.2.0"
         }
       },
       "Digitalroot.Valheim.Common.Log": {
         "type": "Transitive",
-        "resolved": "1.1.46",
-        "contentHash": "WgwWYfcJJae4pQI0oRxkLj/NvFvYILo4p2P3nQkLX0i9fPpVB+eDlgAGUEsyG76PmsM/N7eZpGeiFvbnSDEEJQ==",
+        "resolved": "1.1.53",
+        "contentHash": "VYKplEKfk0NkkyNnjSrEf+RfMwphb7C5dU0eM5xdDcTLFRmacl2GbyLMIe6ugQiHwtTiFmXom5L+Ucu2tThldQ==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Json": "1.0.34"
+          "Digitalroot.Valheim.Common.Json": "1.0.41"
         }
       },
       "Digitalroot.Valheim.Common.Utils": {
         "type": "Transitive",
-        "resolved": "1.0.55",
-        "contentHash": "J9VWU0c+GLXvUYKlBx0zeN5t49iCEnYWC27O2/CSC6IitOe3tR3YhSCanFvAQPNuR0UOpjmbUgHegA3t6NS6AQ==",
+        "resolved": "1.0.63",
+        "contentHash": "Wak3IG6fL3NMQ4w7PK27idvfi/v5bY/QMgrH+fyaw0a8bDRYMseNvL3tED9XEbXhzsbYWBCk2IEsJ4EDUaDKxQ==",
         "dependencies": {
-          "Digitalroot.Valheim.Common.Log": "1.1.46"
+          "Digitalroot.Valheim.Common.Log": "1.1.53"
         }
       },
-      "fastJSON": {
-        "type": "Transitive",
-        "resolved": "2.4.0.4",
-        "contentHash": "lbxY+miTOvCNbNfOk8HcbmBD9F6wv2dRKZlMjtJBm6rjA5vFKXBYtR6eoIe96HnCHOE1nCJbMsaZDKGNPg5mIA=="
-      },
       "HarmonyX": {
         "type": "Transitive",
         "resolved": "2.7.0",
@@ -118,10 +103,10 @@
           "MonoMod.RuntimeDetour": "21.12.13.1"
         }
       },
-      "Microsoft.NETFramework.ReferenceAssemblies.net48": {
+      "LibZ.Tool": {
         "type": "Transitive",
-        "resolved": "1.0.3",
-        "contentHash": "zMk4D+9zyiEWByyQ7oPImPN/Jhpj166Ky0Nlla4eXlNL8hI/BtSJsgR8Inldd4NNpIAH3oh8yym0W2DrhXdSLQ=="
+        "resolved": "1.2.0",
+        "contentHash": "jcZROJ28bmrZx/RaFHcTlSy3x4SmSsMolJiKoluFFrE7oMiXUnYx1K+SJeHJhow05W0Rg9oi9HEyZWwdYSV3cw=="
       },
       "Mono.Cecil": {
         "type": "Transitive",

diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>