h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 08:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1309 from huoyaoyuan/net46

Browse Source 
Use .net 4.6 features
This commit is contained in:
Dean Herbert 2017-09-25 13:26:16 +08:00 committed by GitHub
commit 6349c50510
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit e1352a8b0b5d1ba8acd9335a56c714d2ccc2f6a6 Subproject commit 5f3a7fe4d0537820a33b817a41623b4b22a3ec59

4
osu.Game/IO/Legacy/SerializationReader.cs
View File

@ -49,7 +49,7 @@ namespace osu.Game.IO.Legacy
int len = ReadInt32(); int len = ReadInt32();
if (len > 0) return ReadBytes(len); if (len > 0) return ReadBytes(len);
if (len < 0) return null; if (len < 0) return null;
return new byte[0]; return Array.Empty<byte>();
} }
/// <summary> Reads a char array from the buffer, handling nulls and the array length. </summary> /// <summary> Reads a char array from the buffer, handling nulls and the array length. </summary>
@ -58,7 +58,7 @@ namespace osu.Game.IO.Legacy
int len = ReadInt32(); int len = ReadInt32();
if (len > 0) return ReadChars(len); if (len > 0) return ReadChars(len);
if (len < 0) return null; if (len < 0) return null;
return new char[0]; return Array.Empty<char>();
} }
/// <summary> Reads a DateTime from the buffer. </summary> /// <summary> Reads a DateTime from the buffer. </summary>

9
osu.Game/Online/API/APIRequest.cs
View File

@ -2,7 +2,6 @@
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System; using System;
using osu.Framework.Extensions;
using osu.Framework.IO.Network; using osu.Framework.IO.Network;
namespace osu.Game.Online.API namespace osu.Game.Online.API
@ -70,13 +69,11 @@ namespace osu.Game.Online.API
protected virtual string Uri => $@"{API.Endpoint}/api/v2/{Target}"; protected virtual string Uri => $@"{API.Endpoint}/api/v2/{Target}";
private double remainingTime => Math.Max(0, Timeout - (DateTime.Now.TotalMilliseconds() - (startTime ?? 0))); private double remainingTime => Math.Max(0, Timeout - (DateTimeOffset.UtcNow - (startTime ?? DateTimeOffset.MinValue)).TotalMilliseconds);
public bool ExceededTimeout => remainingTime == 0; public bool ExceededTimeout => remainingTime == 0;
private double? startTime; private DateTimeOffset? startTime;
public double StartTime => startTime ?? -1;
protected APIAccess API; protected APIAccess API;
protected WebRequest WebRequest; protected WebRequest WebRequest;
@ -96,7 +93,7 @@ namespace osu.Game.Online.API
return; return;
if (startTime == null) if (startTime == null)
startTime = DateTime.Now.TotalMilliseconds(); startTime = DateTimeOffset.UtcNow;
if (remainingTime <= 0) if (remainingTime <= 0)
throw new TimeoutException(@"API request timeout hit"); throw new TimeoutException(@"API request timeout hit");

5
osu.Game/Online/API/OAuthToken.cs
View File

@ -4,7 +4,6 @@
using System; using System;
using System.Globalization; using System.Globalization;
using Newtonsoft.Json; using Newtonsoft.Json;
using osu.Framework.Extensions;
namespace osu.Game.Online.API namespace osu.Game.Online.API
{ {
@ -22,12 +21,12 @@ namespace osu.Game.Online.API
{ {
get get
{ {
return AccessTokenExpiry - DateTime.Now.ToUnixTimestamp(); return AccessTokenExpiry - DateTimeOffset.UtcNow.ToUnixTimeSeconds();
} }
set set
{ {
AccessTokenExpiry = DateTime.Now.AddSeconds(value).ToUnixTimestamp(); AccessTokenExpiry = DateTimeOffset.Now.AddSeconds(value).ToUnixTimeSeconds();
} }
} }

2
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -127,7 +127,7 @@ namespace osu.Game.Overlays.Mods
if (mod == null) if (mod == null)
{ {
Mods = new Mod[0]; Mods = Array.Empty<Mod>();
Alpha = 0; Alpha = 0;
} }
else else