diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2946df..504f211 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,8 @@ jobs: strategy: matrix: runtime: [ 'win-x64', 'win-x86', 'linux-x64', linux-musl-x64 ] + fail-fast: false + steps: - name: Checkout uses: actions/checkout@v2 @@ -26,7 +28,7 @@ jobs: run: dotnet restore - name: Build ${{ matrix.runtime }} - run: dotnet publish -c Release -r ${{ matrix.runtime }} + run: dotnet publish -f net6.0 -c Release -r ${{ matrix.runtime }} - name: Upload Files uses: actions/upload-artifact@v3 @@ -39,9 +41,9 @@ jobs: strategy: matrix: framework-version: [ 'net6.0' ] - + fail-fast: false + steps: - - name: Checkout uses: actions/checkout@v2 with: diff --git a/api/BitMod/Attributes/Targets/BitEventAttribute.cs b/api/BitMod/Attributes/Targets/BitEventAttribute.cs index b047ec4..3363b40 100644 --- a/api/BitMod/Attributes/Targets/BitEventAttribute.cs +++ b/api/BitMod/Attributes/Targets/BitEventAttribute.cs @@ -16,7 +16,7 @@ public class BitEventAttribute : BitTargetAttribute public override string Name => "BitEvent"; internal override bool IsValidEvent(Type arg) - => arg.IsAssignableTo(typeof(IEventArgs)); + => typeof(IEventArgs).IsAssignableFrom(arg); internal override void Setup(RouterContext context, LilikoiMutator mutator) { diff --git a/api/BitMod/Attributes/Targets/BitHookAttribute.cs b/api/BitMod/Attributes/Targets/BitHookAttribute.cs index dd6eacc..1b46afe 100644 --- a/api/BitMod/Attributes/Targets/BitHookAttribute.cs +++ b/api/BitMod/Attributes/Targets/BitHookAttribute.cs @@ -25,7 +25,7 @@ public BitHookAttribute(byte priority = 128) public override string Name => "BitHook"; internal override bool IsValidEvent(Type arg) - => arg.IsAssignableTo(typeof(IHookArgs)); + => typeof(IHookArgs).IsAssignableFrom(arg); internal override void Setup(RouterContext context, LilikoiMutator mutator) diff --git a/api/BitMod/BitMod.csproj b/api/BitMod/BitMod.csproj index c522a2b..eb1d793 100644 --- a/api/BitMod/BitMod.csproj +++ b/api/BitMod/BitMod.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 enable enable BitMod @@ -10,6 +10,7 @@ embedded Debug;Release;Publish AnyCPU + latest diff --git a/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs b/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs index ec869c3..409ff8b 100644 --- a/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs @@ -12,12 +12,12 @@ public class PlayerChangedRoleEventArgs : IEventArgs, IResponsiblePlayerEvent /// /// The player who changed role. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// /// The new role of the player. /// - public GameRole Role { get; init; } + public GameRole Role { get; } internal PlayerChangedRoleEventArgs(BitServer server, BitPlayer player, GameRole role) { diff --git a/api/BitMod/Events/Player/PlayerChangedTeamEventArgs.cs b/api/BitMod/Events/Player/PlayerChangedTeamEventArgs.cs index 7e96e78..887e418 100644 --- a/api/BitMod/Events/Player/PlayerChangedTeamEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerChangedTeamEventArgs.cs @@ -12,12 +12,12 @@ public class PlayerChangedTeamEventArgs : IEventArgs, IResponsiblePlayerEvent /// /// The player who joined a team. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// /// The new team which the player joined. /// - public Team Team { get; init; } + public Team Team { get; } internal PlayerChangedTeamEventArgs(BitServer server, BitPlayer player, Team team) { diff --git a/api/BitMod/Events/Player/PlayerConnectedEventArgs.cs b/api/BitMod/Events/Player/PlayerConnectedEventArgs.cs index feaf9b9..0884ed1 100644 --- a/api/BitMod/Events/Player/PlayerConnectedEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerConnectedEventArgs.cs @@ -15,7 +15,7 @@ public PlayerConnectedEventArgs(BitServer server, BitPlayer player) /// /// The player that connected /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// public BitPlayer ResponsiblePlayer => Player; diff --git a/api/BitMod/Events/Player/PlayerDiedEventArgs.cs b/api/BitMod/Events/Player/PlayerDiedEventArgs.cs index b9de850..8050ba9 100644 --- a/api/BitMod/Events/Player/PlayerDiedEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerDiedEventArgs.cs @@ -16,7 +16,7 @@ public PlayerDiedEventArgs(BitServer server, BitPlayer player) /// The player that died. /// For information on the killer, hook PlayerKilledPlayer instead. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// public BitPlayer ResponsiblePlayer => Player; diff --git a/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs b/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs index 6af5e77..0b4e734 100644 --- a/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs @@ -15,7 +15,7 @@ public PlayerDisconnectedEventArgs(BitServer server, BitPlayer player) /// /// The player that just disconnected. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// public BitPlayer ResponsiblePlayer => Player; diff --git a/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs b/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs index 4f42b80..881eb7e 100644 --- a/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs @@ -14,31 +14,31 @@ public class PlayerKilledPlayerEventArgs : IEventArgs, IResponsiblePlayerEvent /// /// The killer. /// - public BitPlayer Killer { get; init; } + public BitPlayer Killer { get; } /// /// The position of the killer. /// - public Vector3 KillerPosition { get; init; } + public Vector3 KillerPosition { get; } /// /// The target. /// - public BitPlayer Target { get; init; } + public BitPlayer Target { get; } /// /// The position of the target. /// - public Vector3 TargetPosition { get; init; } + public Vector3 TargetPosition { get; } /// /// The tool used to kill the target. /// - public string Tool { get; init; } + public string Tool { get; } - public PlayerBody BodyPart { get; init; } + public PlayerBody BodyPart { get; } - public ReasonOfDamage Source { get; init; } + public ReasonOfDamage Source { get; } internal PlayerKilledPlayerEventArgs(BitServer server, BitPlayer killer, Vector3 killerPosition, BitPlayer target, Vector3 targetPosition, string tool, PlayerBody bodyPart, ReasonOfDamage source) { diff --git a/api/BitMod/Events/Player/PlayerReportedEventArgs.cs b/api/BitMod/Events/Player/PlayerReportedEventArgs.cs index 39feb6c..68df5d6 100644 --- a/api/BitMod/Events/Player/PlayerReportedEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerReportedEventArgs.cs @@ -12,22 +12,22 @@ public class PlayerReportedEventArgs : IEventArgs, IResponsiblePlayerEvent /// /// The player who made the report. /// - public BitPlayer Reporter { get; init; } + public BitPlayer Reporter { get; } /// /// The player being reported. /// - public BitPlayer Reported { get; init; } + public BitPlayer Reported { get; } /// /// The report reason. /// - public ReportReason Reason { get; init; } + public ReportReason Reason { get; } /// /// Additional details about the report. /// - public string Detail { get; init; } + public string Detail { get; } internal PlayerReportedEventArgs(BitServer server, BitPlayer reporter, BitPlayer reported, ReportReason reason, string detail) { diff --git a/api/BitMod/Events/Player/PlayerRequestingToChangeRoleEventArgs.cs b/api/BitMod/Events/Player/PlayerRequestingToChangeRoleEventArgs.cs index 499917b..7229c07 100644 --- a/api/BitMod/Events/Player/PlayerRequestingToChangeRoleEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerRequestingToChangeRoleEventArgs.cs @@ -12,12 +12,12 @@ public class PlayerRequestingToChangeRoleEventArgs : IHookArgs, IResponsiblePlay /// /// The player requesting. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// /// The role the player asking to change. /// - public GameRole Role { get; init; } + public GameRole Role { get; } public PlayerRequestingToChangeRoleEventArgs(BitServer server, BitPlayer player, GameRole role) { diff --git a/api/BitMod/Events/Player/PlayerSpawnedEventArgs.cs b/api/BitMod/Events/Player/PlayerSpawnedEventArgs.cs index c7e0b52..722c935 100644 --- a/api/BitMod/Events/Player/PlayerSpawnedEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerSpawnedEventArgs.cs @@ -15,7 +15,7 @@ public PlayerSpawnedEventArgs(BitServer server, BitPlayer player) /// /// The player that just spawned. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// public BitPlayer ResponsiblePlayer => Player; diff --git a/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs b/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs index 224f939..7db8090 100644 --- a/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs @@ -13,7 +13,7 @@ public class PlayerSpawningEventArgs : IProducerArgs, IResponsible /// /// The player who is spawning. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// /// The spawn request (which you can modify). diff --git a/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs b/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs index a1ba04d..cc6e94a 100644 --- a/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs +++ b/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs @@ -12,17 +12,17 @@ public class PlayerTypedMessageEventArgs : IHookArgs, IResponsiblePlayerEvent /// /// The player who typed the message. /// - public BitPlayer Player { get; init; } + public BitPlayer Player { get; } /// /// The channel the message was sent in. /// - public ChatChannel ChatChannel { get; init; } + public ChatChannel ChatChannel { get; } /// /// The message. /// - public string Message { get; init; } + public string Message { get; } internal PlayerTypedMessageEventArgs(BitServer server, BitPlayer player, ChatChannel chatChannel, string message) { diff --git a/api/BitMod/Events/Server/GameServerConnectedEventArgs.cs b/api/BitMod/Events/Server/GameServerConnectedEventArgs.cs index 003f825..d66d2d3 100644 --- a/api/BitMod/Events/Server/GameServerConnectedEventArgs.cs +++ b/api/BitMod/Events/Server/GameServerConnectedEventArgs.cs @@ -16,7 +16,7 @@ public GameServerConnectedEventArgs(BitServer server) /// /// The server that successfully connected /// - public BitServer Server { get; init; } + public BitServer Server { get; } /// public BitServer RelevantGameserver => Server; diff --git a/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs b/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs index aea861c..280e1f2 100644 --- a/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs +++ b/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs @@ -9,7 +9,7 @@ public class GameServerConnectingEventArgs : IHookArgs /// /// IP of incoming connection /// - public IPAddress IPAddress { get; init; } + public IPAddress IPAddress { get; } public GameServerConnectingEventArgs(IPAddress ipAddress) { diff --git a/api/BitMod/Events/Server/GameServerDisconnectedEventArgs.cs b/api/BitMod/Events/Server/GameServerDisconnectedEventArgs.cs index 12c007e..a8a81c0 100644 --- a/api/BitMod/Events/Server/GameServerDisconnectedEventArgs.cs +++ b/api/BitMod/Events/Server/GameServerDisconnectedEventArgs.cs @@ -16,7 +16,7 @@ public GameServerDisconnectedEventArgs(BitServer server) /// /// The server that was disconnected /// - public BitServer Server { get; init; } + public BitServer Server { get; } /// public BitServer RelevantGameserver => Server; diff --git a/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs b/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs index af2822a..391d46d 100644 --- a/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs +++ b/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs @@ -16,7 +16,7 @@ public GameServerReconnectedEventArgs(BitServer server) /// /// The server that successfully reconnected /// - public BitServer Server { get; init; } + public BitServer Server { get; } /// public BitServer RelevantGameserver => Server; diff --git a/api/BitMod/Events/Server/GameServerTickEventArgs.cs b/api/BitMod/Events/Server/GameServerTickEventArgs.cs index 75f87d6..d80b893 100644 --- a/api/BitMod/Events/Server/GameServerTickEventArgs.cs +++ b/api/BitMod/Events/Server/GameServerTickEventArgs.cs @@ -16,7 +16,7 @@ public GameServerTickEventArgs(BitServer server) /// /// The server that is currently ticking /// - public BitServer Server { get; init; } + public BitServer Server { get; } /// public BitServer RelevantGameserver => Server; diff --git a/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs b/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs index 6ca7395..7a3ad46 100644 --- a/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs +++ b/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs @@ -10,12 +10,12 @@ public class GetPlayerStatsEventArgs : IProducerArgs /// /// The player's SteamID /// - public ulong SteamID { get; init; } + public ulong SteamID { get; } /// /// The player's stats (which you can modify) /// - public PlayerStats OfficialStats { get; set; } + public PlayerStats OfficialStats { get; } public GetPlayerStatsEventArgs(ulong steamID, PlayerStats officialStats) { diff --git a/api/BitMod/Events/Stats/SavingPlayerStatsEventArgs.cs b/api/BitMod/Events/Stats/SavingPlayerStatsEventArgs.cs index ea4bf90..6b894b4 100644 --- a/api/BitMod/Events/Stats/SavingPlayerStatsEventArgs.cs +++ b/api/BitMod/Events/Stats/SavingPlayerStatsEventArgs.cs @@ -10,12 +10,12 @@ public class SavingPlayerStatsEventArgs : IEventArgs /// /// The player's SteamID /// - public ulong SteamID { get; init; } + public ulong SteamID { get; } /// /// The player's stats /// - public PlayerStats PlayerStats { get; init; } + public PlayerStats PlayerStats { get; } internal SavingPlayerStatsEventArgs(ulong steamID, PlayerStats playerStats) { diff --git a/builtin/BitMod.Commands/BitMod.Commands.csproj b/builtin/BitMod.Commands/BitMod.Commands.csproj index a239b67..4b0aa42 100644 --- a/builtin/BitMod.Commands/BitMod.Commands.csproj +++ b/builtin/BitMod.Commands/BitMod.Commands.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 enable enable bitmod_commands @@ -10,8 +10,9 @@ ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest - + diff --git a/builtin/BitMod.Flags/BitMod.Flags.csproj b/builtin/BitMod.Flags/BitMod.Flags.csproj index 36a38f2..d0a098c 100644 --- a/builtin/BitMod.Flags/BitMod.Flags.csproj +++ b/builtin/BitMod.Flags/BitMod.Flags.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 enable enable bitmod_flags @@ -10,6 +10,7 @@ ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest diff --git a/builtin/BitMod.Moderation/BitMod.Moderation.csproj b/builtin/BitMod.Moderation/BitMod.Moderation.csproj index dfbb07c..7174165 100644 --- a/builtin/BitMod.Moderation/BitMod.Moderation.csproj +++ b/builtin/BitMod.Moderation/BitMod.Moderation.csproj @@ -1,13 +1,14 @@ - net6.0 + netstandard2.1 enable enable bitmod_moderation ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest diff --git a/builtin/BitMod.Provision/BitMod.Provision.csproj b/builtin/BitMod.Provision/BitMod.Provision.csproj index ae84415..4fe89e0 100644 --- a/builtin/BitMod.Provision/BitMod.Provision.csproj +++ b/builtin/BitMod.Provision/BitMod.Provision.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 enable enable @@ -9,6 +9,7 @@ ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest diff --git a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj index b5d92ac..2e46524 100644 --- a/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj +++ b/builtin/BitMod.Whitelist/BitMod.Whitelist.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 enable enable bitmod_whitelist @@ -10,6 +10,7 @@ ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest diff --git a/samples/SamplePlugin/SamplePlugin.csproj b/samples/SamplePlugin/SamplePlugin.csproj index 5dbdf0e..55efdbc 100644 --- a/samples/SamplePlugin/SamplePlugin.csproj +++ b/samples/SamplePlugin/SamplePlugin.csproj @@ -9,6 +9,7 @@ ../../dev/plugins/$(AssemblyName)/ ../../build/plugins/$(AssemblyName) + latest diff --git a/standalone/BitMod.Config/BitMod.Config.csproj b/standalone/BitMod.Config/BitMod.Config.csproj index 9fcb080..83c2036 100644 --- a/standalone/BitMod.Config/BitMod.Config.csproj +++ b/standalone/BitMod.Config/BitMod.Config.csproj @@ -7,6 +7,7 @@ embedded Debug;Release;Publish AnyCPU + latest diff --git a/standalone/BitMod.Launcher/BitMod.Launcher.csproj b/standalone/BitMod.Launcher/BitMod.Launcher.csproj index f0125b9..daa923c 100644 --- a/standalone/BitMod.Launcher/BitMod.Launcher.csproj +++ b/standalone/BitMod.Launcher/BitMod.Launcher.csproj @@ -12,6 +12,7 @@ ../../build ../../dev + latest diff --git a/standalone/BitMod.Logging/BitMod.Logging.csproj b/standalone/BitMod.Logging/BitMod.Logging.csproj index fb77a3d..9f33541 100644 --- a/standalone/BitMod.Logging/BitMod.Logging.csproj +++ b/standalone/BitMod.Logging/BitMod.Logging.csproj @@ -7,6 +7,7 @@ embedded Debug;Release;Publish AnyCPU + latest diff --git a/standalone/BitMod.Plugins/BitMod.Plugins.csproj b/standalone/BitMod.Plugins/BitMod.Plugins.csproj index a2cb143..99457aa 100644 --- a/standalone/BitMod.Plugins/BitMod.Plugins.csproj +++ b/standalone/BitMod.Plugins/BitMod.Plugins.csproj @@ -7,6 +7,7 @@ embedded Debug;Release;Publish AnyCPU + latest diff --git a/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj b/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj index 64b21e5..08f8573 100644 --- a/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj +++ b/tests/BitMod.Benchmarks/BitMod.Benchmarks.csproj @@ -8,6 +8,7 @@ Windows Debug;Release;Publish AnyCPU + latest diff --git a/tests/BitMod.Tests/BitMod.Tests.csproj b/tests/BitMod.Tests/BitMod.Tests.csproj index 329041d..6bc0e30 100644 --- a/tests/BitMod.Tests/BitMod.Tests.csproj +++ b/tests/BitMod.Tests/BitMod.Tests.csproj @@ -12,6 +12,8 @@ Debug;Release;Publish AnyCPU + + latest