From d35f45fc3242d330a2021017054e932eff64f2ca Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 7 Jan 2023 17:55:15 -0500
Subject: fix game assemblies not excluded from release zip when bundle type
 not set

---
 .../Framework/ModFileManager.cs                    | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'src/SMAPI.ModBuildConfig')

diff --git a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
index 00f3f439..d47e492a 100644
--- a/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
+++ b/src/SMAPI.ModBuildConfig/Framework/ModFileManager.cs
@@ -215,13 +215,24 @@ namespace StardewModdingAPI.ModBuildConfig.Framework
                     return true;
             }
 
-            // check for bundled assembly types
-            // When bundleAssemblyTypes is set, *all* dependencies are copied into the build output but only those which match the given assembly types should be bundled.
-            if (bundleAssemblyTypes != ExtraAssemblyTypes.None)
+            // ignore by assembly type
+            ExtraAssemblyTypes type = this.GetExtraAssemblyType(file, modDllName);
+            switch (bundleAssemblyTypes)
             {
-                var type = this.GetExtraAssemblyType(file, modDllName);
-                if (type != ExtraAssemblyTypes.None && !bundleAssemblyTypes.HasFlag(type))
-                    return true;
+                // Only explicitly-referenced assemblies are in the build output. These should be added to the zip,
+                // since it's possible the game won't load them (except game assemblies which will always be loaded
+                // separately). If they're already loaded, SMAPI will just ignore them.
+                case ExtraAssemblyTypes.None:
+                    if (type is ExtraAssemblyTypes.Game)
+                        return true;
+                    break;
+
+                // All assemblies are in the build output (due to how .NET builds references), but only those which
+                // match the bundled type should be in the zip.
+                default:
+                    if (type != ExtraAssemblyTypes.None && !bundleAssemblyTypes.HasFlag(type))
+                        return true;
+                    break;
             }
 
             return false;
-- 
cgit 


From 5518b8d461732796b0da5f4c9ba85be96bddc205 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 8 Jan 2023 16:48:30 -0500
Subject: update packages

---
 src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.ModBuildConfig')

diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
index cded6f65..efc808a1 100644
--- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
+++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
@@ -24,7 +24,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="16.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 
     <!--
       This is imported through Microsoft.Build.Utilities.Core. When installed by a mod, NuGet
-- 
cgit 


From 25b8e13ba827a0512f5089d3bd22e8ed1a15e7ba Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 9 Jan 2023 12:27:29 -0500
Subject: prepare for release

---
 src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/SMAPI.ModBuildConfig')

diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
index efc808a1..badabfc7 100644
--- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
+++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj
@@ -10,7 +10,7 @@
     <!--NuGet package-->
     <PackageId>Pathoschild.Stardew.ModBuildConfig</PackageId>
     <Title>Build package for SMAPI mods</Title>
-    <Version>4.0.2</Version>
+    <Version>4.1.0</Version>
     <Authors>Pathoschild</Authors>
     <Description>Automates the build configuration for crossplatform Stardew Valley SMAPI mods. For SMAPI 3.13.0 or later.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-- 
cgit