From 270d436a176904ab39fc0ce97da2027dd6ac1114 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Tue, 18 Dec 2018 20:15:39 -0500 Subject: remove shell code in Windows installer to reduce antivirus false positives --- src/SMAPI.Installer/InteractiveInstaller.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/SMAPI.Installer') diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs index d5866c74..95aed4ca 100644 --- a/src/SMAPI.Installer/InteractiveInstaller.cs +++ b/src/SMAPI.Installer/InteractiveInstaller.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Diagnostics; using System.Globalization; using System.IO; using System.Linq; @@ -13,6 +12,9 @@ using StardewModdingAPI.Internal.ConsoleWriting; using StardewModdingAPI.Toolkit; using StardewModdingAPI.Toolkit.Framework.ModScanning; using StardewModdingAPI.Toolkit.Utilities; +#if !SMAPI_FOR_WINDOWS +using System.Diagnostics; +#endif namespace StardewModdingApi.Installer { @@ -461,6 +463,8 @@ namespace StardewModdingApi.Installer // mark file executable // (MSBuild doesn't keep permission flags for files zipped in a build task.) + // (Note: exclude from Windows build because antivirus apps can flag the process start code as suspicious.) +#if !SMAPI_FOR_WINDOWS new Process { StartInfo = new ProcessStartInfo @@ -470,6 +474,7 @@ namespace StardewModdingApi.Installer CreateNoWindow = true } }.Start(); +#endif } // create mods directory (if needed) -- cgit From 51e65fc8a090996b0bb2f0f4697376135b233654 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 27 Dec 2018 02:40:57 -0500 Subject: enable latest C# features --- src/SMAPI.Installer/StardewModdingAPI.Installer.csproj | 1 + 1 file changed, 1 insertion(+) (limited to 'src/SMAPI.Installer') diff --git a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj index 8000e4e7..083044fb 100644 --- a/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj +++ b/src/SMAPI.Installer/StardewModdingAPI.Installer.csproj @@ -12,6 +12,7 @@ v4.5 512 true + latest x86 -- cgit From c4a82418ac8b09a6965052f5c9173928457fba52 Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Thu, 27 Dec 2018 12:39:10 -0500 Subject: tweak comment header convention --- src/SMAPI.Installer/InteractiveInstaller.cs | 2 +- src/SMAPI.Installer/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/SMAPI.Installer') diff --git a/src/SMAPI.Installer/InteractiveInstaller.cs b/src/SMAPI.Installer/InteractiveInstaller.cs index 95aed4ca..7148b1d9 100644 --- a/src/SMAPI.Installer/InteractiveInstaller.cs +++ b/src/SMAPI.Installer/InteractiveInstaller.cs @@ -22,7 +22,7 @@ namespace StardewModdingApi.Installer internal class InteractiveInstaller { /********* - ** Properties + ** Fields *********/ /// The absolute path to the directory containing the files to copy into the game folder. private readonly string BundlePath; diff --git a/src/SMAPI.Installer/Program.cs b/src/SMAPI.Installer/Program.cs index 0ca5aea0..3c4d8593 100644 --- a/src/SMAPI.Installer/Program.cs +++ b/src/SMAPI.Installer/Program.cs @@ -12,7 +12,7 @@ namespace StardewModdingApi.Installer internal class Program { /********* - ** Properties + ** Fields *********/ /// The absolute path of the installer folder. [SuppressMessage("ReSharper", "AssignNullToNotNullAttribute", Justification = "The assembly location is never null in this context.")] -- cgit