Switched CompatibilityLevel to ServerMustHaveMod to allow for crosspl…

…ay. Updated for Ashlands
Digitalroot-Valheim · May 14, 2024 · 0c68602 · 0c68602
1 parent ff452b1
commit 0c68602
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 69 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
@@ -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.MaxDungeonRooms
  proj-file-name: Digitalroot.Valheim.MaxDungeonRooms
@@ -36,6 +38,6 @@ jobs:
  ts-enable-upload: true
  ts-name: Max_Dungeon_Rooms
  ts-description: "Raises the chance to spawn larger dungeons."
- ts-categories: "client-side server-side tweaks" #https://thunderstore.io/api/experimental/community/valheim/category/
- ts-dependencies: [email protected] ValheimModding-Jotunn@2.12.1
- 
+ ts-categories: "server-side tweaks" #https://thunderstore.io/api/experimental/community/valheim/category/
+ ts-dependencies: ValheimModding-Jotunn@2.19.4
+
diff --git a/src/Digitalroot.Valheim.MaxDungeonRooms.sln b/src/Digitalroot.Valheim.MaxDungeonRooms.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
@@ -55,16 +54,20 @@ Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
  Release|Any CPU = Release|Any CPU
+ ReleaseCrossplay|Any CPU = ReleaseCrossplay|Any CPU
  EndGlobalSection
  GlobalSection(ProjectConfigurationPlatforms) = postSolution
  {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.ReleaseCrossplay|Any CPU.ActiveCfg = ReleaseCrossplay|Any CPU
+ {BDA6FE96-4BB4-486A-8A51-51EE3FDEF7A9}.ReleaseCrossplay|Any CPU.Build.0 = ReleaseCrossplay|Any CPU
  {0432ADCD-7643-4A4E-A09C-A24003C2F2E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {0432ADCD-7643-4A4E-A09C-A24003C2F2E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {0432ADCD-7643-4A4E-A09C-A24003C2F2E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {0432ADCD-7643-4A4E-A09C-A24003C2F2E7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0432ADCD-7643-4A4E-A09C-A24003C2F2E7}.ReleaseCrossplay|Any CPU.ActiveCfg = ReleaseCrossplay|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/src/Digitalroot.Valheim.MaxDungeonRooms/.ts/manifest.json b/src/Digitalroot.Valheim.MaxDungeonRooms/.ts/manifest.json
@@ -5,8 +5,8 @@
  "description": "Raises the chance to spawn larger dungeons.",
  "version_number": "%VERSION_NUMBER%",
  "dependencies": [
- "denikson-BepInExPack_Valheim-5.4.2105",
- "ValheimModding-Jotunn-2.12.4"
+ "denikson-BepInExPack_Valheim-5.4.2202",
+ "ValheimModding-Jotunn-2.19.4"
  ],
  "website_url": "https://github.com/Digitalroot-Valheim/Digitalroot.Valheim.MaxDungeonRooms"
 }
diff --git a/src/Digitalroot.Valheim.MaxDungeonRooms/Digitalroot.Valheim.MaxDungeonRooms.csproj b/src/Digitalroot.Valheim.MaxDungeonRooms/Digitalroot.Valheim.MaxDungeonRooms.csproj
@@ -28,7 +28,7 @@
  https://digitalroot-valheim-nuget.s3.us-west-2.amazonaws.com/index.json
  </RestoreAdditionalProjectSources>
  <VersionPrefix>0.0.1</VersionPrefix>
- <Configurations>Debug;Release</Configurations>
+ <Configurations>Debug;Release;ReleaseCrossplay</Configurations>
  </PropertyGroup>
 
  <ItemGroup>
@@ -48,18 +48,18 @@
  <PackageReference Include="Digitalroot.Valheim.Build.Targets" Version="1.0.21">
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="Digitalroot.Valheim.Common.AssemblyInfo" Version="1.0.16">
+ <PackageReference Include="Digitalroot.Valheim.Common.AssemblyInfo" Version="1.0.17">
  <PrivateAssets>all</PrivateAssets>
  <ExcludeAssets>runtime</ExcludeAssets>
  <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
  </PackageReference>
- <PackageReference Include="Digitalroot.Valheim.Common.Log" Version="1.1.46" />
- <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.217.38">
+ <PackageReference Include="Digitalroot.Valheim.Common.Log" Version="1.1.52" />
+ <PackageReference Include="Digitalroot.Valheim.Common.References" Version="0.218.14">
  <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.19.4" />
  <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.MaxDungeonRooms/Main.cs b/src/Digitalroot.Valheim.MaxDungeonRooms/Main.cs
@@ -11,7 +11,8 @@ namespace Digitalroot.Valheim.MaxDungeonRooms
 {
  [BepInPlugin(Guid, Name, Version)]
  [BepInDependency(Jotunn.Main.ModGuid)]
- [NetworkCompatibility(CompatibilityLevel.EveryoneMustHaveMod, VersionStrictness.Minor)]
+ [NetworkCompatibility(CompatibilityLevel.ServerMustHaveMod, VersionStrictness.Minor)]
+
  public partial class Main : BaseUnityPlugin, ITraceableLogging
  {
  private Harmony _harmony;
@@ -37,6 +38,7 @@ public Main()
  {
  try
  {
+ // CompatibilityLevel.ServerMustHaveMod = 4
  #if DEBUG
  EnableTrace = true;
  #else

diff --git a/src/Digitalroot.Valheim.MaxDungeonRooms/packages.lock.json b/src/Digitalroot.Valheim.MaxDungeonRooms/packages.lock.json
@@ -20,30 +20,30 @@
  },
  "Digitalroot.Valheim.Common.AssemblyInfo": {
  "type": "Direct",
- "requested": "[1.0.16, )",
- "resolved": "1.0.16",
- "contentHash": "+QeepsgH/cRv93h1NrhKLnjARUYNplFWVrFX4MBYLV2K2MQ9hGWV/bhR4As/2IOeNVKX42x5wJqw4YFbZLky/w=="
+ "requested": "[1.0.17, )",
+ "resolved": "1.0.17",
+ "contentHash": "EMa138YM/LPqUEnJixjQlL8pBo+UvZULBrpFmq/8Lu7TggcJgwhLQ3n5534sh/vV7D5w4LZu1iJRrScMrRidlg=="
  },
  "Digitalroot.Valheim.Common.Log": {
  "type": "Direct",
- "requested": "[1.1.46, )",
- "resolved": "1.1.46",
- "contentHash": "WgwWYfcJJae4pQI0oRxkLj/NvFvYILo4p2P3nQkLX0i9fPpVB+eDlgAGUEsyG76PmsM/N7eZpGeiFvbnSDEEJQ==",
+ "requested": "[1.1.52, )",
+ "resolved": "1.1.52",
+ "contentHash": "lVupf88cUsqjD0rgm8YidGiHlHNkWG4vO8X9eBHO0mJ0CeC4kqnhRrFYASeLlrnyQ0LtUCCtVa0t9ruw8qHCyw==",
  "dependencies": {
- "Digitalroot.Valheim.Common.Json": "1.0.34"
+ "Digitalroot.Valheim.Common.Json": "1.0.40"
  }
  },
  "Digitalroot.Valheim.Common.References": {
  "type": "Direct",
- "requested": "[0.217.38, )",
- "resolved": "0.217.38",
- "contentHash": "y8KIE7aSMeFytv1ks7CJIoDLWUPN4vzaSkWN2r4kDhkoq65rmmxB1UsjI+VZvfs9LZ5COfZwdQlz628/2Nclgg=="
+ "requested": "[0.218.14, )",
+ "resolved": "0.218.14",
+ "contentHash": "8dMznAyPkousBWKy1zoq6JvYYLxEatNqoDoB9Ys/KfXSOHWnlLvrYmHwxB8tLb6lvruEQO0nBL/Il123lCIg/A=="
  },
  "Digitalroot.Valheim.References.JvL": {
  "type": "Direct",
- "requested": "[2.15.2, )",
- "resolved": "2.15.2",
- "contentHash": "+GcLrGLT7mqaniFbBthYMNgRClTbDP0VSEBN+Leo56rDm4YFHbZVUanXOzJK+dWIEtttIeDINKtAJt4iljjdiw=="
+ "requested": "[2.19.4, )",
+ "resolved": "2.19.4",
+ "contentHash": "dQd2yW6vti6c3emnD+uxNd+wU//LkHKLabkZV3aetFTco9mE+tFyNqZEe3xzk0dFfUyblmF06KqM9m8gJFBfdg=="
  },
  "ErrorProne.NET.CoreAnalyzers": {
  "type": "Direct",
@@ -66,40 +66,25 @@
  "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.40",
+ "contentHash": "Iabdb4/ro5RtpLmIYpwcgvhkA3sCG57H/A3Mt7VZ+3E1u58w9Mi+asqhujrOmKBJeGbEBjfvv3UfFw4hLQM8wQ==",
  "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"
  }
  },
- "fastJSON": {
- "type": "Transitive",
- "resolved": "2.4.0.4",
- "contentHash": "lbxY+miTOvCNbNfOk8HcbmBD9F6wv2dRKZlMjtJBm6rjA5vFKXBYtR6eoIe96HnCHOE1nCJbMsaZDKGNPg5mIA=="
- },
  "HarmonyX": {
  "type": "Transitive",
  "resolved": "2.7.0",
@@ -108,10 +93,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
@@ -5,14 +5,14 @@
 
  <IsPackable>false</IsPackable>
 
- <Configurations>Debug;Release</Configurations>
+ <Configurations>Debug;Release;ReleaseCrossplay</Configurations>
  </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>