Upgrade core to netstandard2.1

Mooshua · Aug 16, 2023 · 064d78b · 064d78b
1 parent 360296c
commit 064d78b
Show file tree

Hide file tree

Showing 34 changed files with 62 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>BitMod</RootNamespace>
@@ -10,6 +10,7 @@
         <DebugType>embedded</DebugType>
         <Configurations>Debug;Release;Publish</Configurations>
         <Platforms>AnyCPU</Platforms>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs b/api/BitMod/Events/Player/PlayerChangedRoleEventArgs.cs
@@ -12,12 +12,12 @@ public class PlayerChangedRoleEventArgs : IEventArgs, IResponsiblePlayerEvent
         /// <summary>
         /// The player who changed role.
         /// </summary>
-        public BitPlayer Player { get; init; }
+        public BitPlayer Player { get; }
 
         /// <summary>
         /// The new role of the player.
         /// </summary>
-        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
@@ -12,12 +12,12 @@ public class PlayerChangedTeamEventArgs : IEventArgs, IResponsiblePlayerEvent
         /// <summary>
         /// The player who joined a team.
         /// </summary>
-        public BitPlayer Player { get; init; }
+        public BitPlayer Player { get; }
 
         /// <summary>
         /// The new team which the player joined.
         /// </summary>
-        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
@@ -15,7 +15,7 @@ public PlayerConnectedEventArgs(BitServer server, BitPlayer player)
 	/// <summary>
 	/// The player that connected
 	/// </summary>
-	public BitPlayer Player { get; init; }
+	public BitPlayer Player { get; }
 
 	/// <inheritdoc />
 	public BitPlayer ResponsiblePlayer => Player;

diff --git 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.
 	/// </summary>
-	public BitPlayer Player { get; init; }
+	public BitPlayer Player { get; }
 
 	/// <inheritdoc />
 	public BitPlayer ResponsiblePlayer => Player;

diff --git a/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs b/api/BitMod/Events/Player/PlayerDisconnectedEventArgs.cs
@@ -15,7 +15,7 @@ public PlayerDisconnectedEventArgs(BitServer server, BitPlayer player)
 	/// <summary>
 	/// The player that just disconnected.
 	/// </summary>
-	public BitPlayer Player { get; init; }
+	public BitPlayer Player { get; }
 
 	/// <inheritdoc />
 	public BitPlayer ResponsiblePlayer => Player;

diff --git a/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs b/api/BitMod/Events/Player/PlayerKilledPlayerEventArgs.cs
@@ -14,31 +14,31 @@ public class PlayerKilledPlayerEventArgs : IEventArgs, IResponsiblePlayerEvent
         /// <summary>
         /// The killer.
         /// </summary>
-        public BitPlayer Killer { get; init; }
+        public BitPlayer Killer { get; }
 
         /// <summary>
         /// The position of the killer.
         /// </summary>
-        public Vector3 KillerPosition { get; init; }
+        public Vector3 KillerPosition { get; }
 
         /// <summary>
         /// The target.
         /// </summary>
-        public BitPlayer Target { get; init; }
+        public BitPlayer Target { get; }
 
         /// <summary>
         /// The position of the target.
         /// </summary>
-        public Vector3 TargetPosition { get; init; }
+        public Vector3 TargetPosition { get; }
 
         /// <summary>
         /// The tool used to kill the target.
         /// </summary>
-        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
@@ -12,22 +12,22 @@ public class PlayerReportedEventArgs : IEventArgs, IResponsiblePlayerEvent
         /// <summary>
         /// The player who made the report.
         /// </summary>
-        public BitPlayer Reporter { get; init; }
+        public BitPlayer Reporter { get; }
 
         /// <summary>
         /// The player being reported.
         /// </summary>
-        public BitPlayer Reported { get; init; }
+        public BitPlayer Reported { get; }
 
         /// <summary>
         /// The report reason.
         /// </summary>
-        public ReportReason Reason { get; init; }
+        public ReportReason Reason { get; }
 
         /// <summary>
         /// Additional details about the report.
         /// </summary>
-        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
@@ -12,12 +12,12 @@ public class PlayerRequestingToChangeRoleEventArgs : IHookArgs, IResponsiblePlay
         /// <summary>
         /// The player requesting.
         /// </summary>
-        public BitPlayer Player { get; init; }
+        public BitPlayer Player { get; }
 
         /// <summary>
         /// The role the player asking to change.
         /// </summary>
-        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
@@ -15,7 +15,7 @@ public PlayerSpawnedEventArgs(BitServer server, BitPlayer player)
 	/// <summary>
 	/// The player that just spawned.
 	/// </summary>
-	public BitPlayer Player { get; init; }
+	public BitPlayer Player { get; }
 
 	/// <inheritdoc />
 	public BitPlayer ResponsiblePlayer => Player;

diff --git a/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs b/api/BitMod/Events/Player/PlayerSpawningEventArgs.cs
@@ -13,7 +13,7 @@ public class PlayerSpawningEventArgs : IProducerArgs<SpawnRequest>, IResponsible
         /// <summary>
         /// The player who is spawning.
         /// </summary>
-        public BitPlayer Player { get; init; }
+        public BitPlayer Player { get; }
 
         /// <summary>
         /// The spawn request (which you can modify).

diff --git a/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs b/api/BitMod/Events/Player/PlayerTypedMessageEventArgs.cs
@@ -12,17 +12,17 @@ public class PlayerTypedMessageEventArgs : IHookArgs, IResponsiblePlayerEvent
         /// <summary>
         /// The player who typed the message.
         /// </summary>
-        public BitPlayer Player { get; init; }
+        public BitPlayer Player { get; }
 
         /// <summary>
         /// The channel the message was sent in.
         /// </summary>
-        public ChatChannel ChatChannel { get; init; }
+        public ChatChannel ChatChannel { get; }
 
         /// <summary>
         /// The message.
         /// </summary>
-        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
@@ -16,7 +16,7 @@ public GameServerConnectedEventArgs(BitServer server)
 	/// <summary>
 	/// The server that successfully connected
 	/// </summary>
-	public BitServer Server { get; init; }
+	public BitServer Server { get; }
 
 	/// <inheritdoc />
 	public BitServer RelevantGameserver => Server;

diff --git a/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs b/api/BitMod/Events/Server/GameServerConnectingEventArgs.cs
@@ -9,7 +9,7 @@ public class GameServerConnectingEventArgs : IHookArgs
         /// <summary>
         /// IP of incoming connection
         /// </summary>
-        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
@@ -16,7 +16,7 @@ public GameServerDisconnectedEventArgs(BitServer server)
 	/// <summary>
 	/// The server that was disconnected
 	/// </summary>
-	public BitServer Server { get; init; }
+	public BitServer Server { get; }
 
 	/// <inheritdoc />
 	public BitServer RelevantGameserver => Server;

diff --git a/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs b/api/BitMod/Events/Server/GameServerReconnectedEventArgs.cs
@@ -16,7 +16,7 @@ public GameServerReconnectedEventArgs(BitServer server)
 	/// <summary>
 	/// The server that successfully reconnected
 	/// </summary>
-	public BitServer Server { get; init; }
+	public BitServer Server { get; }
 
 	/// <inheritdoc />
 	public BitServer RelevantGameserver => Server;

diff --git a/api/BitMod/Events/Server/GameServerTickEventArgs.cs b/api/BitMod/Events/Server/GameServerTickEventArgs.cs
@@ -16,7 +16,7 @@ public GameServerTickEventArgs(BitServer server)
 	/// <summary>
 	/// The server that is currently ticking
 	/// </summary>
-	public BitServer Server { get; init; }
+	public BitServer Server { get; }
 
 	/// <inheritdoc />
 	public BitServer RelevantGameserver => Server;

diff --git a/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs b/api/BitMod/Events/Stats/GetPlayerStatsEventArgs.cs
@@ -10,12 +10,12 @@ public class GetPlayerStatsEventArgs : IProducerArgs<PlayerStats>
         /// <summary>
         /// The player's SteamID
         /// </summary>
-        public ulong SteamID { get; init; }
+        public ulong SteamID { get; }
 
         /// <summary>
         /// The player's stats (which you can modify)
         /// </summary>
-        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
@@ -10,12 +10,12 @@ public class SavingPlayerStatsEventArgs : IEventArgs
         /// <summary>
         /// The player's SteamID
         /// </summary>
-        public ulong SteamID { get; init; }
+        public ulong SteamID { get; }
 
         /// <summary>
         /// The player's stats
         /// </summary>
-        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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>bitmod_commands</AssemblyName>
@@ -10,8 +10,9 @@
 
         <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
         <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
-    
+
     <ItemGroup>
       <ProjectReference Private="true" Include="..\..\api\BitMod\BitMod.csproj" />
     </ItemGroup>

diff --git a/builtin/BitMod.Flags/BitMod.Flags.csproj b/builtin/BitMod.Flags/BitMod.Flags.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>bitmod_flags</AssemblyName>
@@ -10,6 +10,7 @@
 
         <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
         <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
 

diff --git a/builtin/BitMod.Moderation/BitMod.Moderation.csproj b/builtin/BitMod.Moderation/BitMod.Moderation.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AssemblyName>bitmod_moderation</AssemblyName>
 
         <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
         <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/builtin/BitMod.Provision/BitMod.Provision.csproj b/builtin/BitMod.Provision/BitMod.Provision.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>netstandard2.1</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
         <AssemblyName>bitmod_provision</AssemblyName>
 
         <OutDir>../../dev/plugins/$(AssemblyName)/</OutDir>
         <PublishDir>../../build/plugins/$(AssemblyName)</PublishDir>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>