Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-09-07 18:55:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump netcore usages to net5

Browse Source 
nhse.core still is netstandard2.0
only tests/sprites/winforms got bumped
This commit is contained in:
Kurt
2020-12-02 21:35:24 -08:00
parent 6fbff26184
commit c027a2cb44
12 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
NHSE.Core/Structures/Building/BuildingType.cs
View File

@@ -3,9 +3,7 @@
/// <summary>
/// Building model &amp; interior that is loaded when the <see cref="Building"/> is entered.
/// </summary>
#pragma warning disable CA1027 // Mark enums with FlagsAttribute
public enum BuildingType : ushort
#pragma warning restore CA1027 // Mark enums with FlagsAttribute
{
None = 0,
PlayerHouse1 = 1,

2
NHSE.Core/Structures/Item/ItemMenuIconType.cs
View File

@@ -3,9 +3,7 @@ namespace NHSE.Core
/// <summary>
/// Menu icons (image shown in the inventory) of Items
/// </summary>
#pragma warning disable CA1027 // Mark enums with FlagsAttribute
public enum ItemMenuIconType : ushort
#pragma warning restore CA1027 // Mark enums with FlagsAttribute
{
Akoyagai,
Amaebi,

2
NHSE.Core/Structures/Item/ItemSizeType.cs
View File

@@ -3,9 +3,7 @@
/// <summary>
/// Sizes of Items
/// </summary>
#pragma warning disable CA1027 // Mark enums with FlagsAttribute
public enum ItemSizeType : byte
#pragma warning restore CA1027 // Mark enums with FlagsAttribute
{
S_0_5x1_0_Wall,
S_1_0x0_5,

1
NHSE.Parsing/Properties/Resources.Designer.cs generated
View File

@@ -8,6 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: System.Resources.NeutralResourcesLanguage("en")]
namespace NHSE.Parsing.Properties {
using System;

6
NHSE.Sprites/NHSE.Sprites.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net46;net5.0</TargetFrameworks>
<LangVersion>8</LangVersion>
<Nullable>enable</Nullable>
</PropertyGroup>
@@ -10,8 +10,8 @@
<Folder Include="Resources\MenuIcon\" />
<Folder Include="Resources\Villagers\" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<ItemGroup Condition="$(TargetFramework.StartsWith('net5'))">
<PackageReference Include="System.Drawing.Common" Version="4.7.0" />
<PackageReference Include="System.Resources.Extensions" Version="4.7.0" />
</ItemGroup>

1
NHSE.Sprites/Properties/Resources.Designer.cs generated
View File

@@ -8,6 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: System.Resources.NeutralResourcesLanguage("en")]
namespace NHSE.Sprites.Properties {
using System;

2
NHSE.Tests/NHSE.Tests.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

1
NHSE.Tests/Properties/Resources.Designer.cs generated
View File

@@ -8,6 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: System.Resources.NeutralResourcesLanguage("en")]
namespace NHSE.Tests.Properties {
using System;

8
NHSE.WinForms/Controls/ItemGridEditor.cs
View File

@@ -53,7 +53,7 @@ private void InitializeSlots()
ChangePage();
}
private void Slot_MouseWheel(object sender, MouseEventArgs e)
private void Slot_MouseWheel(object? sender, MouseEventArgs e)
{
var delta = e.Delta < 0 ? 1 : -1; // scrolling down increases page #
var newpage = Math.Min(PageCount - 1, Math.Max(0, Page + delta));
@@ -85,8 +85,10 @@ public void Slot_MouseLeave(object? sender, EventArgs e)
public static string GetItemText(Item item) => GameInfo.Strings.GetItemName(item);
public void Slot_MouseClick(object sender, MouseEventArgs e)
public void Slot_MouseClick(object? sender, MouseEventArgs e)
{
if (sender == null)
return;
switch (ModifierKeys)
{
case Keys.Control | Keys.Alt: ClickClone(sender, e); break;
@@ -171,7 +173,7 @@ private void SetItemSprite(Item item, PictureBox pb)
pb.Image = ItemSprite.GetItemMarkup(item, font, dw, dh, backing);
}
private int GetPageJump()
private static int GetPageJump()
{
return ModifierKeys switch
{

2
NHSE.WinForms/NHSE.WinForms.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net46;net5.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<AssemblyName>NHSE</AssemblyName>
<PackageId>NHSE</PackageId>

1
NHSE.WinForms/Properties/Resources.Designer.cs generated
View File

@@ -8,6 +8,7 @@
// </auto-generated>
//------------------------------------------------------------------------------
[assembly: System.Resources.NeutralResourcesLanguage("en")]
namespace NHSE.WinForms.Properties {
using System;

11
NHSE.WinForms/Subforms/Program/ImageFetcher.cs
View File

@@ -71,7 +71,7 @@ private void B_Download_Click(object sender, EventArgs e)
private void ProgressChanged(object sender, DownloadProgressChangedEventArgs e) => PBar_MultiUse.Value = e.ProgressPercentage;
private void Completed(object sender, AsyncCompletedEventArgs e)
private void Completed(object? sender, AsyncCompletedEventArgs e)
{
if (e.Error != null)
{
@@ -138,8 +138,13 @@ private async void CheckNetworkFileSizeAsync()
{
using var webClient = new WebClient();
await webClient.OpenReadTaskAsync(new Uri(AllHosts[CB_HostSelect.SelectedIndex], UriKind.Absolute)).ConfigureAwait(false);
var totalSizeBytes = Convert.ToInt64(webClient.ResponseHeaders["Content-Length"]);
var hdr = webClient.ResponseHeaders?["Content-Length"];
if (hdr == null)
{
L_FileSize.Text = "Failed.";
return;
}
var totalSizeBytes = Convert.ToInt64(hdr);
var totalSizeMb = totalSizeBytes / 1e+6;
L_FileSize.Text = $"{totalSizeMb:0.##}MB";
}