From ab66266b4bc4d7b1a7ae76d05693e9dd30c03989 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 8 Oct 2022 21:32:10 -0400
Subject: update installer for VdfConverter & rework avoid custom models

---
 build/windows/prepare-install-package.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/windows/prepare-install-package.ps1 b/build/windows/prepare-install-package.ps1
index 87a4fe01..002bcbca 100644
--- a/build/windows/prepare-install-package.ps1
+++ b/build/windows/prepare-install-package.ps1
@@ -154,7 +154,7 @@ foreach ($folder in $folders) {
     cp -Recurse "$smapiBin/i18n" "$bundlePath/smapi-internal"
 
     # bundle smapi-internal
-    foreach ($name in @("0Harmony.dll", "0Harmony.xml", "Mono.Cecil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "MonoMod.Common.dll", "Newtonsoft.Json.dll", "Pathoschild.Http.Client.dll", "Pintail.dll", "TMXTile.dll", "SMAPI.Toolkit.dll", "SMAPI.Toolkit.pdb", "SMAPI.Toolkit.xml", "SMAPI.Toolkit.CoreInterfaces.dll", "SMAPI.Toolkit.CoreInterfaces.pdb", "SMAPI.Toolkit.CoreInterfaces.xml", "System.Net.Http.Formatting.dll")) {
+    foreach ($name in @("0Harmony.dll", "0Harmony.xml", "Mono.Cecil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "MonoMod.Common.dll", "Newtonsoft.Json.dll", "Pathoschild.Http.Client.dll", "Pintail.dll", "TMXTile.dll", "SMAPI.Toolkit.dll", "SMAPI.Toolkit.pdb", "SMAPI.Toolkit.xml", "SMAPI.Toolkit.CoreInterfaces.dll", "SMAPI.Toolkit.CoreInterfaces.pdb", "SMAPI.Toolkit.CoreInterfaces.xml", "System.Net.Http.Formatting.dll", "VdfConverter.dll")) {
         cp "$smapiBin/$name" "$bundlePath/smapi-internal"
     }
 
-- 
cgit 


From d143ab1077d7a3fb8638f0cc494aadf8688a0952 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 9 Oct 2022 14:45:50 -0400
Subject: update to Harmony 2.2.2

---
 build/0Harmony.dll | Bin 238592 -> 241152 bytes
 build/0Harmony.xml |  27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

(limited to 'build')

diff --git a/build/0Harmony.dll b/build/0Harmony.dll
index 492255be..72ca2b61 100644
Binary files a/build/0Harmony.dll and b/build/0Harmony.dll differ
diff --git a/build/0Harmony.xml b/build/0Harmony.xml
index 8499d20b..f1b9b4cf 100644
--- a/build/0Harmony.xml
+++ b/build/0Harmony.xml
@@ -845,7 +845,7 @@
             
         </member>
         <member name="F:HarmonyLib.ExceptionBlockType.BeginExceptFilterBlock">
-            <summary>The beginning of an except filter block</summary>
+            <summary>The beginning of an except filter block (currently not supported to use in a patch)</summary>
             
         </member>
         <member name="F:HarmonyLib.ExceptionBlockType.BeginFaultBlock">
@@ -2660,6 +2660,18 @@
              <param name="operand">The optional operand</param>
              <param name="name">The optional name</param>
             
+        </member>
+        <member name="M:HarmonyLib.CodeMatch.#ctor(System.Linq.Expressions.Expression{System.Action},System.String)">
+             <summary>Creates a code match that calls a method</summary>
+             <param name="expression">The lambda expression using the method</param>
+             <param name="name">The optional name</param>
+            
+        </member>
+        <member name="M:HarmonyLib.CodeMatch.#ctor(System.Linq.Expressions.LambdaExpression,System.String)">
+             <summary>Creates a code match that calls a method</summary>
+             <param name="expression">The lambda expression using the method</param>
+             <param name="name">The optional name</param>
+            
         </member>
         <member name="M:HarmonyLib.CodeMatch.#ctor(HarmonyLib.CodeInstruction,System.String)">
              <summary>Creates a code match</summary>
@@ -3216,6 +3228,13 @@
              <param name="e">The enum</param>
              <returns>True if the instruction loads the constant</returns>
             
+        </member>
+        <member name="M:HarmonyLib.CodeInstructionExtensions.LoadsConstant(HarmonyLib.CodeInstruction,System.String)">
+             <summary>Tests if the code instruction loads a string constant</summary>
+             <param name="code">The <see cref="T:HarmonyLib.CodeInstruction"/></param>
+             <param name="str">The string</param>
+             <returns>True if the instruction loads the constant</returns>
+            
         </member>
         <member name="M:HarmonyLib.CodeInstructionExtensions.LoadsField(HarmonyLib.CodeInstruction,System.Reflection.FieldInfo,System.Boolean)">
              <summary>Tests if the code instruction loads a field</summary>
@@ -3346,7 +3365,11 @@
              <summary>A file log for debugging</summary>
             
         </member>
-        <member name="F:HarmonyLib.FileLog.logPath">
+        <member name="P:HarmonyLib.FileLog.LogWriter">
+             <summary>Set this to make Harmony write its log content to this stream</summary>
+            
+        </member>
+        <member name="P:HarmonyLib.FileLog.LogPath">
              <summary>Full pathname of the log file, defaults to a file called <c>harmony.log.txt</c> on your Desktop</summary>
             
         </member>
-- 
cgit 


From 4d2ad379b4198fa7a341c6ba2bb6455d488b414f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 9 Oct 2022 19:29:18 -0400
Subject: fix package error

---
 build/windows/prepare-install-package.ps1 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/windows/prepare-install-package.ps1 b/build/windows/prepare-install-package.ps1
index 002bcbca..71de1154 100644
--- a/build/windows/prepare-install-package.ps1
+++ b/build/windows/prepare-install-package.ps1
@@ -154,10 +154,14 @@ foreach ($folder in $folders) {
     cp -Recurse "$smapiBin/i18n" "$bundlePath/smapi-internal"
 
     # bundle smapi-internal
-    foreach ($name in @("0Harmony.dll", "0Harmony.xml", "Mono.Cecil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "MonoMod.Common.dll", "Newtonsoft.Json.dll", "Pathoschild.Http.Client.dll", "Pintail.dll", "TMXTile.dll", "SMAPI.Toolkit.dll", "SMAPI.Toolkit.pdb", "SMAPI.Toolkit.xml", "SMAPI.Toolkit.CoreInterfaces.dll", "SMAPI.Toolkit.CoreInterfaces.pdb", "SMAPI.Toolkit.CoreInterfaces.xml", "System.Net.Http.Formatting.dll", "VdfConverter.dll")) {
+    foreach ($name in @("0Harmony.dll", "0Harmony.xml", "Mono.Cecil.dll", "Mono.Cecil.Mdb.dll", "Mono.Cecil.Pdb.dll", "MonoMod.Common.dll", "Newtonsoft.Json.dll", "Pathoschild.Http.Client.dll", "Pintail.dll", "TMXTile.dll", "SMAPI.Toolkit.dll", "SMAPI.Toolkit.pdb", "SMAPI.Toolkit.xml", "SMAPI.Toolkit.CoreInterfaces.dll", "SMAPI.Toolkit.CoreInterfaces.pdb", "SMAPI.Toolkit.CoreInterfaces.xml", "System.Net.Http.Formatting.dll")) {
         cp "$smapiBin/$name" "$bundlePath/smapi-internal"
     }
 
+    if ($folder -eq "windows") {
+        cp "$smapiBin/VdfConverter.dll" "$bundlePath/smapi-internal"
+    }
+
     cp "$smapiBin/SMAPI.config.json" "$bundlePath/smapi-internal/config.json"
     cp "$smapiBin/SMAPI.metadata.json" "$bundlePath/smapi-internal/metadata.json"
     if ($folder -eq "linux" -or $folder -eq "macOS") {
-- 
cgit 


From ee77efcc976ef1a5ee64933a6174d2fac9c6d0f9 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sun, 9 Oct 2022 19:42:24 -0400
Subject: prepare for release

---
 build/common.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build')

diff --git a/build/common.targets b/build/common.targets
index 7fe66fab..02cf69bd 100644
--- a/build/common.targets
+++ b/build/common.targets
@@ -7,7 +7,7 @@ repo. It imports the other MSBuild files as needed.
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!--set general build properties -->
-    <Version>3.16.2</Version>
+    <Version>3.17.0</Version>
     <Product>SMAPI</Product>
     <LangVersion>latest</LangVersion>
     <AssemblySearchPaths>$(AssemblySearchPaths);{GAC}</AssemblySearchPaths>
-- 
cgit