h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-06 04:53:12 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into patch-1

Browse Source
This commit is contained in:
Dan Balasescu 2019-11-15 08:13:01 +09:00 committed by GitHub
commit a52aa88141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CodeAnalysis/BannedSymbols.txt Normal file
View File

@ -0,0 +1,4 @@
M:System.Object.Equals(System.Object,System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
M:System.Object.Equals(System.Object)~System.Boolean;Don't use object.Equals. Use IEquatable<T> or EqualityComparer<T>.Default instead.
M:System.ValueType.Equals(System.Object)~System.Boolean;Don't use object.Equals(Fallbacks to ValueType). Use IEquatable<T> or EqualityComparer<T>.Default instead.
T:System.IComparable;Don't use non-generic IComparable. Use generic version instead.

4
Directory.Build.props
View File

@ -14,6 +14,10 @@
<ItemGroup Label="Resources"> <ItemGroup Label="Resources">
<EmbeddedResource Include="Resources\**\*.*" /> <EmbeddedResource Include="Resources\**\*.*" />
</ItemGroup> </ItemGroup>
<ItemGroup Label="Code Analysis">
<PackageReference Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="2.9.7" PrivateAssets="All" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)CodeAnalysis\BannedSymbols.txt" />
</ItemGroup>
<PropertyGroup Label="Project"> <PropertyGroup Label="Project">
<!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway. <!-- DeepEqual is not netstandard-compatible. This is fine since we run tests with .NET Framework anyway.
This is required due to https://github.com/NuGet/Home/issues/5740 --> This is required due to https://github.com/NuGet/Home/issues/5740 -->

2
osu.Game/Online/Leaderboards/Leaderboard.cs
View File

@ -101,7 +101,7 @@ namespace osu.Game.Online.Leaderboards
get => scope; get => scope;
set set
{ {
if (value.Equals(scope)) if (EqualityComparer<TScope>.Default.Equals(value, scope))
return; return;
scope = value; scope = value;

2
osu.Game/Overlays/DirectOverlay.cs
View File

@ -47,7 +47,7 @@ namespace osu.Game.Overlays
get => beatmapSets; get => beatmapSets;
set set
{ {
if (beatmapSets?.Equals(value) ?? false) return; if (ReferenceEquals(beatmapSets, value)) return;
beatmapSets = value?.ToList(); beatmapSets = value?.ToList();

2
osu.Game/Overlays/SocialOverlay.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Overlays
get => users; get => users;
set set
{ {
if (users?.Equals(value) ?? false) if (ReferenceEquals(users, value))
return; return;
users = value?.ToList(); users = value?.ToList();

2
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -102,7 +102,7 @@ namespace osu.Game.Screens.Menu
private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes) private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes)
{ {
d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time) d.FadeTo(Math.Max(0, ((ReferenceEquals(d, leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time)
.Then() .Then()
.FadeOut(beatLength, Easing.In); .FadeOut(beatLength, Easing.In);
} }

6
osu.Game/Screens/Play/KeyCounterAction.cs
View File

@ -1,6 +1,8 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic;
namespace osu.Game.Screens.Play namespace osu.Game.Screens.Play
{ {
public class KeyCounterAction<T> : KeyCounter public class KeyCounterAction<T> : KeyCounter
@ -16,7 +18,7 @@ namespace osu.Game.Screens.Play
public bool OnPressed(T action, bool forwards) public bool OnPressed(T action, bool forwards)
{ {
if (!action.Equals(Action)) if (!EqualityComparer<T>.Default.Equals(action, Action))
return false; return false;
IsLit = true; IsLit = true;
@ -27,7 +29,7 @@ namespace osu.Game.Screens.Play
public bool OnReleased(T action, bool forwards) public bool OnReleased(T action, bool forwards)
{ {
if (!action.Equals(Action)) if (!EqualityComparer<T>.Default.Equals(action, Action))
return false; return false;
IsLit = false; IsLit = false;

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -405,7 +405,7 @@ namespace osu.Game.Screens.Select
// We may be arriving here due to another component changing the bindable Beatmap. // We may be arriving here due to another component changing the bindable Beatmap.
// In these cases, the other component has already loaded the beatmap, so we don't need to do so again. // In these cases, the other component has already loaded the beatmap, so we don't need to do so again.
if (!Equals(beatmap, Beatmap.Value.BeatmapInfo)) if (!EqualityComparer<BeatmapInfo>.Default.Equals(beatmap, Beatmap.Value.BeatmapInfo))
{ {
Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\""); Logger.Log($"beatmap changed from \"{Beatmap.Value.BeatmapInfo}\" to \"{beatmap}\"");