From a090b6c21c877e8835f25e1d70d667abf07d1d3c Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sat, 16 May 2020 11:29:40 -0400 Subject: use newer C# features --- src/SMAPI.ModBuildConfig/DeployModTask.cs | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'src/SMAPI.ModBuildConfig') diff --git a/src/SMAPI.ModBuildConfig/DeployModTask.cs b/src/SMAPI.ModBuildConfig/DeployModTask.cs index 96d95e06..ced05a28 100644 --- a/src/SMAPI.ModBuildConfig/DeployModTask.cs +++ b/src/SMAPI.ModBuildConfig/DeployModTask.cs @@ -153,23 +153,22 @@ namespace StardewModdingAPI.ModBuildConfig // create zip file Directory.CreateDirectory(outputFolderPath); - using (Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write)) - using (ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create)) + using Stream zipStream = new FileStream(zipPath, FileMode.Create, FileAccess.Write); + using ZipArchive archive = new ZipArchive(zipStream, ZipArchiveMode.Create); + + foreach (var fileEntry in files) { - foreach (var fileEntry in files) - { - string relativePath = fileEntry.Key; - FileInfo file = fileEntry.Value; + string relativePath = fileEntry.Key; + FileInfo file = fileEntry.Value; - // get file info - string filePath = file.FullName; - string entryName = folderName + '/' + relativePath.Replace(Path.DirectorySeparatorChar, '/'); + // get file info + string filePath = file.FullName; + string entryName = folderName + '/' + relativePath.Replace(Path.DirectorySeparatorChar, '/'); - // add to zip - using (Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read)) - using (Stream fileStreamInZip = archive.CreateEntry(entryName).Open()) - fileStream.CopyTo(fileStreamInZip); - } + // add to zip + using Stream fileStream = new FileStream(filePath, FileMode.Open, FileAccess.Read); + using Stream fileStreamInZip = archive.CreateEntry(entryName).Open(); + fileStream.CopyTo(fileStreamInZip); } } -- cgit From 79181012ee01e93c1af7c4bf8bd1a3a717274ded Mon Sep 17 00:00:00 2001 From: Jesse Plamondon-Willard Date: Sun, 14 Jun 2020 10:55:52 -0400 Subject: tweak build files --- .../SMAPI.ModBuildConfig.csproj | 25 ++-------- src/SMAPI.ModBuildConfig/build/smapi.targets | 56 +++++----------------- 2 files changed, 17 insertions(+), 64 deletions(-) (limited to 'src/SMAPI.ModBuildConfig') diff --git a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj index ccbd9a85..5061b01b 100644 --- a/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj +++ b/src/SMAPI.ModBuildConfig/SMAPI.ModBuildConfig.csproj @@ -1,24 +1,12 @@  - - SMAPI.ModBuildConfig StardewModdingAPI.ModBuildConfig - 3.0.0 + 3.1.0 net45 - latest x86 false - - - - - - - - - @@ -28,19 +16,16 @@ - - mod-package.md - + - - PreserveNewest - + + + - diff --git a/src/SMAPI.ModBuildConfig/build/smapi.targets b/src/SMAPI.ModBuildConfig/build/smapi.targets index 5ca9f032..bfee3b33 100644 --- a/src/SMAPI.ModBuildConfig/build/smapi.targets +++ b/src/SMAPI.ModBuildConfig/build/smapi.targets @@ -38,58 +38,26 @@ **********************************************--> - - $(GamePath)\$(GameExecutableName).exe - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\StardewValley.GameData.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\StardewModdingAPI.exe - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\xTile.dll - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\smapi-internal\0Harmony.dll - $(CopyModReferencesToBuildOutput) - + + + + + + - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(CopyModReferencesToBuildOutput) - - - $(GamePath)\Netcode.dll - $(CopyModReferencesToBuildOutput) - + + + + + - - $(GamePath)\MonoGame.Framework.dll - $(CopyModReferencesToBuildOutput) - + -- cgit