Merge pull request #47 from JohnsonNicholas/develop

Merge Develop into Base

BetterShippingBox/BetterShippingBox.csproj

@@ -10,7 +10,10 @@
  <WarningLevel>4</WarningLevel>
  <NuGetPackageImportStamp>
  </NuGetPackageImportStamp>
- <ModZipPath>C:\Users\Kylindra\Source\SDVMods\_releases</ModZipPath>
+ </PropertyGroup>
+ <PropertyGroup>
+ <DeployModFolderName>$(MSBuildProjectName)</DeployModFolderName>
+ <DeployModZipTo>$(SolutionDir)\_releases</DeployModZipTo>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
  <PlatformTarget>AnyCPU</PlatformTarget>
@@ -30,6 +33,9 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
  <PlatformTarget>x86</PlatformTarget>
  </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
+ <PlatformTarget>x86</PlatformTarget>
+ </PropertyGroup>
  <ItemGroup>
  <Reference Include="System.Core" />
  </ItemGroup>
@@ -45,11 +51,11 @@
  </None>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
- <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.1\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.1\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
+ <Import Project="..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets" Condition="Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  <PropertyGroup>
  <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
- <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.1\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.1\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
+ <Error Condition="!Exists('..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Pathoschild.Stardew.ModBuildConfig.2.0.2\build\Pathoschild.Stardew.ModBuildConfig.targets'))" />
  </Target>
 </Project>

BetterShippingBox/BetterShippingBox/BetterShippingBox.cs

@@ -16,7 +16,7 @@ public override void Entry(IModHelper helper)
 
  private void MenuEvents_OnMenuChanged(object sender, EventArgsClickableMenuChanged e)
  {
- if (e.NewMenu is ItemGrabMenu && (e.NewMenu as ItemGrabMenu).shippingBin)
+ if ((e.NewMenu is ItemGrabMenu menu) && (menu.shippingBin))
  {
  Game1.activeClickableMenu = new BetterShippingMenu();
  }

BetterShippingBox/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
- <package id="Pathoschild.Stardew.ModBuildConfig" version="2.0.1" targetFramework="net452" />
+ <package id="Pathoschild.Stardew.ModBuildConfig" version="2.0.2" targetFramework="net452" />
 </packages>