Merge branch 'develop' into stable

3 files changed, 30 insertions, 78 deletions

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);
             }
         }
 
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,25 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
-    <AssemblyName>SMAPI.ModBuildConfig</AssemblyName>
     <RootNamespace>StardewModdingAPI.ModBuildConfig</RootNamespace>
-    <Version>3.0.0</Version>
+    <Version>3.1.0</Version>
     <TargetFramework>net45</TargetFramework>
-    <LangVersion>latest</LangVersion>
     <PlatformTarget>x86</PlatformTarget>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SMAPI.Toolkit\SMAPI.Toolkit.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Include="..\..\build\find-game-folder.targets" Link="build\find-game-folder.targets" />
-    <None Include="..\..\docs\technical\mod-package.md" Link="mod-build-config.md" />
-  </ItemGroup>
-
-  <ItemGroup>
     <Reference Include="Microsoft.Build" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
@@ -28,19 +16,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="..\..\docs\technical\mod-package.md">
-      <Link>mod-package.md</Link>
-    </None>
+    <ProjectReference Include="..\SMAPI.Toolkit\SMAPI.Toolkit.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="assets\nuget-icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    <None Include="..\..\build\find-game-folder.targets" Link="build\find-game-folder.targets" />
+    <None Include="..\..\docs\technical\mod-package.md" Link="mod-package.md" />
+    <None Update="assets\nuget-icon.png" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <Import Project="..\SMAPI.Internal\SMAPI.Internal.projitems" Label="Shared" />
   <Import Project="..\..\build\common.targets" />
   <Import Project="..\..\build\prepare-nuget-package.targets" />
-
 </Project>
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 @@
   **********************************************-->
   <!-- common -->
   <ItemGroup>
-    <Reference Include="$(GameExecutableName)">
-      <HintPath>$(GamePath)\$(GameExecutableName).exe</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="StardewValley.GameData">
-      <HintPath>$(GamePath)\StardewValley.GameData.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="StardewModdingAPI">
-      <HintPath>$(GamePath)\StardewModdingAPI.exe</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="SMAPI.Toolkit.CoreInterfaces">
-      <HintPath>$(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="xTile">
-      <HintPath>$(GamePath)\xTile.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="0Harmony" Condition="'$(EnableHarmony)' == 'true'">
-      <HintPath>$(GamePath)\smapi-internal\0Harmony.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
+    <Reference Include="$(GameExecutableName)" HintPath="$(GamePath)\$(GameExecutableName).exe" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="StardewValley.GameData" HintPath="$(GamePath)\StardewValley.GameData.dll" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="StardewModdingAPI" HintPath="$(GamePath)\StardewModdingAPI.exe" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="SMAPI.Toolkit.CoreInterfaces" HintPath="$(GamePath)\smapi-internal\SMAPI.Toolkit.CoreInterfaces.dll" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="xTile" HintPath="$(GamePath)\xTile.dll" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="0Harmony" Condition="'$(EnableHarmony)' == 'true'" HintPath="$(GamePath)\smapi-internal\0Harmony.dll" Private="$(CopyModReferencesToBuildOutput)" />
   </ItemGroup>
 
   <!-- Windows -->
   <ItemGroup Condition="$(OS) == 'Windows_NT'">
-    <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86">
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
-    <Reference Include="Netcode">
-      <HintPath>$(GamePath)\Netcode.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
+    <Reference Include="Microsoft.Xna.Framework, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="Microsoft.Xna.Framework.Game, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="Microsoft.Xna.Framework.Graphics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="Microsoft.Xna.Framework.Xact, Version=4.0.0.0, Culture=neutral, PublicKeyToken=842cf8be1de50553, processorArchitecture=x86" Private="$(CopyModReferencesToBuildOutput)" />
+    <Reference Include="Netcode" HintPath="$(GamePath)\Netcode.dll" Private="$(CopyModReferencesToBuildOutput)" />
   </ItemGroup>
 
   <!-- Linux/Mac -->
   <ItemGroup Condition="$(OS) != 'Windows_NT'">
-    <Reference Include="MonoGame.Framework">
-      <HintPath>$(GamePath)\MonoGame.Framework.dll</HintPath>
-      <Private>$(CopyModReferencesToBuildOutput)</Private>
-    </Reference>
+    <Reference Include="MonoGame.Framework" HintPath="$(GamePath)\MonoGame.Framework.dll" Private="$(CopyModReferencesToBuildOutput)" />
   </ItemGroup>