Merge branch 'feature/net8_v5' into develop

Author: Tkael

.editorconfig

@@ -51,6 +51,7 @@ dotnet_style_object_initializer = true
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
 dotnet_style_prefer_auto_properties = true:suggestion
 dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_collection_expression = false
 dotnet_style_prefer_conditional_expression_over_assignment = true
 dotnet_style_prefer_conditional_expression_over_return = true
 dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
@@ -225,3 +226,15 @@ dotnet_naming_style.begins_with_i.required_prefix = I
 dotnet_naming_style.begins_with_i.required_suffix = 
 dotnet_naming_style.begins_with_i.word_separator = 
 dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+# IDE0055: Fix formatting
+dotnet_diagnostic.IDE0055.severity = none
+
+# CA1507: Use nameof to express symbol names
+dotnet_diagnostic.CA1507.severity = none
+
+# IDE0057: Use range operator
+dotnet_diagnostic.IDE0057.severity = none
+
+# IDE0056: Use index operator
+dotnet_diagnostic.IDE0056.severity = none

BuildInstaller/BuildInstaller.csproj

@@ -37,8 +37,6 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.CSharp" />
-        <PackageReference Include="System.Runtime" />
-        <PackageReference Include="System.Runtime.Extensions" />
     </ItemGroup>
 
     <!--Check for unused dependencies in Directory.Packages.props-->

CargoMonitor/CargoMonitor.cs

@@ -26,11 +26,11 @@ namespace EddiCargoMonitor
     public class CargoMonitor : IEddiMonitor
     {
         // Observable collection for us to handle changes
-        public ObservableCollection<Cargo> inventory { get; private set; } = new ObservableCollection<Cargo>();
+        public ObservableCollection<Cargo> inventory { get; private set; } = [];
         public int cargoCarried => inventory.Sum(c => c.total);
         private DateTime updateDat;
 
-        private static readonly object inventoryLock = new object();
+        private static readonly object inventoryLock = new();
         [UsedImplicitly] public event EventHandler InventoryUpdatedEvent;
 
         public string MonitorName()
@@ -75,7 +75,7 @@ public CargoMonitor(CargoMonitorConfiguration configuration = null)
 
         private void ConfigChanged ( object sender, PropertyChangedEventArgs e )
         {
-            if ( e.PropertyName.Equals( nameof(ConfigService.Instance.missionMonitorConfiguration) ) )
+            if ( e.PropertyName?.Equals( nameof(ConfigService.Instance.missionMonitorConfiguration) ) ?? false )
             {
                 CalculateCargoNeeds();
             }
@@ -237,7 +237,7 @@ internal void _handleCargoEvent(CargoEvent @event)
                     }
 
                     // Update existing cargo in the manifest
-                    while (infoList.Any())
+                    while ( infoList.Count > 0 )
                     {
                         var name = infoList.ToList().First().name;
                         var cargoInfo = infoList.Where(i => i.name.Equals(name, StringComparison.OrdinalIgnoreCase)).ToList();
@@ -536,8 +536,8 @@ public IDictionary<string, Tuple<Type, object>> GetVariables ()
             {
                 return new Dictionary<string, Tuple<Type, object>>
                 {
-                    ["inventory"] = new Tuple<Type, object>(typeof(List<Cargo>), inventory.ToList() ),
-                    ["cargoCarried"] = new Tuple<Type, object>(typeof(int), cargoCarried)
+                    ["inventory"] = new(typeof(List<Cargo>), inventory.ToList() ),
+                    ["cargoCarried"] = new(typeof(int), cargoCarried)
                 };                
             }
         }
@@ -564,7 +564,7 @@ private void readInventory(CargoMonitorConfiguration configuration = null)
             lock (inventoryLock)
             {
                 // Obtain current cargo inventory from configuration
-                configuration = configuration ?? ConfigService.Instance.cargoMonitorConfiguration;
+                configuration ??= ConfigService.Instance.cargoMonitorConfiguration;
                 updateDat = configuration.updatedat;
 
                 // Build a new inventory
@@ -573,10 +573,7 @@ private void readInventory(CargoMonitorConfiguration configuration = null)
                 // Start with the materials we have in the log
                 foreach (var cargo in configuration.cargo)
                 {
-                    if (cargo.commodityDef == null)
-                    {
-                        cargo.commodityDef = CommodityDefinition.FromEDName(cargo.edname);
-                    }
+                    cargo.commodityDef ??= CommodityDefinition.FromEDName(cargo.edname);
                     newInventory.Add(cargo);
                 }
 
@@ -632,10 +629,9 @@ private void _RemoveCargoWithEDName(string edname)
             {
                 if (edname != null)
                 {
-                    edname = edname.ToLowerInvariant();
                     for (var i = 0; i < inventory.Count; i++)
                     {
-                        if (inventory[i].edname.ToLowerInvariant() == edname)
+                        if ( string.Equals( inventory[ i ].edname, edname, StringComparison.InvariantCultureIgnoreCase ) )
                         {
                             inventory.RemoveAt(i);
                             break;
@@ -652,8 +648,8 @@ public Cargo GetCargoWithEDName(string edname)
             {
                 return null;
             }
-            edname = edname.ToLowerInvariant();
-            return inventory.FirstOrDefault(c => c.edname.ToLowerInvariant() == edname);
+            return inventory.FirstOrDefault(c =>
+                string.Equals( c.edname, edname, StringComparison.InvariantCultureIgnoreCase ) );
         }
 
         [CanBeNull]
@@ -663,7 +659,7 @@ public Cargo GetCargoWithMissionId ( ulong missionid, out int amount )
             foreach ( var cargo in inventory.ToList() )
             {
                 var missionCargo = cargo.missionCargo.Where( c => c.Key == missionid ).ToList();
-                if ( missionCargo.Any() )
+                if ( missionCargo.Count > 0 )
                 {
                     amount = missionCargo.Sum( c => c.Value );
                     return cargo;
@@ -672,7 +668,7 @@ public Cargo GetCargoWithMissionId ( ulong missionid, out int amount )
             return null;
         }
 
-        private void UpdateCargoFromInfo ( Cargo cargo, List<CargoInfoItem> infoList )
+        private static void UpdateCargoFromInfo ( Cargo cargo, List<CargoInfoItem> infoList )
         {
             cargo.missionCargo = infoList.Where( i => i.missionid != null ).ToDictionary( i => (ulong)i.missionid, i => i.count );
             cargo.stolen = infoList.Where( i => i.missionid == null ).Sum( i => i.stolen );
@@ -686,8 +682,9 @@ private void CalculateCargoNeeds ()
                 var missionsConfig = ConfigService.Instance.missionMonitorConfiguration;
                 var missions = missionsConfig.missions
                     .Where( m =>
-                        m?.CommodityDefinition != null &&
-                        m.amount != null &&
+                        m != null &&
+                        m.CommodityDefinition != null &&
+                        m.amount is not null &&
                         m.delivered < m.amount &&
                         !m.communal )
                     .ToList();

CargoMonitor/ConfigurationWindow.xaml

@@ -1,13 +1,13 @@
 <UserControl x:Class="EddiCargoMonitor.ConfigurationWindow"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:System="clr-namespace:System;assembly=mscorlib"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:EddiCargoMonitor"
              xmlns:resx="clr-namespace:EddiCargoMonitor.Properties"
              xmlns:utility="clr-namespace:Utilities;assembly=Utilities"
              xmlns:eddiDataDefinitions="clr-namespace:EddiDataDefinitions;assembly=EddiDataDefinitions"
+             xmlns:System="clr-namespace:System;assembly=System.Runtime"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="800">
     <DockPanel LastChildFill="True" Background="#FFE5E5E5" Margin="0,5">

CargoMonitor/ConfigurationWindow.xaml.cs

@@ -9,7 +9,7 @@ namespace EddiCargoMonitor
     /// </summary>
     public partial class ConfigurationWindow : UserControl
     {
-        private CargoMonitor cargoMonitor()
+        private static CargoMonitor cargoMonitor()
         {
             return (CargoMonitor)EDDI.Instance.ObtainMonitor("Cargo monitor");
         }

CargoMonitor/EddiCargoMonitor.csproj

@@ -22,8 +22,6 @@
         <PackageReference Include="JetBrains.Annotations" />
         <PackageReference Include="Microsoft.CSharp" />
         <PackageReference Include="Newtonsoft.Json" />
-        <PackageReference Include="System.Runtime" />
-        <PackageReference Include="System.Runtime.Extensions" />
     </ItemGroup>
     <ItemGroup>
         <Compile Update="Properties\CargoMonitor.Designer.cs">

ChangeLog.md

@@ -2,6 +2,13 @@
 
 Full details of the variables available for each noted event, and VoiceAttack integrations, are available in the individual [event pages](https://github.com/EDCD/EDDI/wiki/Events).
 
+## 5.0.0
+  * Core
+    * Target framework updated to .Net 8.
+  * VoiceAttack Responder 
+    * (**BREAKING CHANGE**) Updated to target VoiceAttack 2.0.0+. VoiceAttack 1.X is no longer supported. 
+    * Under the hood, EDDI now runs as a separate process from VoiceAttack. Only the plugin component of EDDI runs within the VoiceAttack process. This should improve stability and performance for both EDDI and VoiceAttack.
+  
 ## 4.1.9
   * Core
     * Add support for the Kestrel Mk. II.

CommanderMonitor/CommanderMonitor.cs

@@ -23,8 +23,8 @@ namespace EddiCommanderMonitor
     [UsedImplicitly]
     public class CommanderMonitor : IEddiMonitor, INotifyPropertyChanged
     {
-        private static readonly object commanderLock = new object();
-        private readonly CancellationTokenSource cts = new CancellationTokenSource();
+        private static readonly object commanderLock = new();
+        private readonly CancellationTokenSource cts = new();
 
         #region Monitored Variables
 
@@ -84,12 +84,12 @@ public class GenderOption
         }
 
         [UsedImplicitly]
-        public static ObservableCollection<GenderOption> GenderOptions { get; set; } = new ObservableCollection<GenderOption>
-        {
-            new GenderOption { Gender = Gender.Male, DisplayName = Properties.Resources.tab_commander_gender_m },
-            new GenderOption { Gender = Gender.Female, DisplayName = Properties.Resources.tab_commander_gender_f },
-            new GenderOption { Gender = Gender.Neither, DisplayName = Properties.Resources.tab_commander_gender_n }
-        };
+        public static ObservableCollection<GenderOption> GenderOptions { get; set; } =
+        [
+            new() { Gender = Gender.Male, DisplayName = Properties.Resources.tab_commander_gender_m },
+            new() { Gender = Gender.Female, DisplayName = Properties.Resources.tab_commander_gender_f },
+            new() { Gender = Gender.Neither, DisplayName = Properties.Resources.tab_commander_gender_n }
+        ];
 
         [CanBeNull]
         public StarSystem HomeStarSystem // May be null when the commander hasn't set a home star system
@@ -155,7 +155,7 @@ private async Task FetchHomeSystemAsync ( string systemName )
 
         private static bool _isFetchingHomeSystem;
 
-        public ObservableCollection<Station> HomeStationOptions { get; } = new ObservableCollection<Station>();
+        public ObservableCollection<Station> HomeStationOptions { get; } = [ ];
 
         private void UpdateHomeStationOptions ()
         {
@@ -245,7 +245,8 @@ private async Task FetchSquadronSystemAsync(string systemName)
                 // Ensure collection modifications happen on the UI thread
                 if ( System.Windows.Application.Current?.Dispatcher?.CheckAccess() == false )
                 {
-                    await System.Windows.Application.Current.Dispatcher.InvokeAsync( () => FetchSquadronSystemAsync(systemName) );
+                    await System.Windows.Application.Current.Dispatcher.InvokeAsync( async () =>
+                        await FetchSquadronSystemAsync( systemName ) );
                     return;
                 }
 
@@ -273,7 +274,7 @@ private async Task FetchSquadronSystemAsync(string systemName)
 
         private static bool _isFetchingSquadronSystem;
 
-        public ObservableCollection<Faction> SquadronFactions { get; } = new ObservableCollection<Faction>();
+        public ObservableCollection<Faction> SquadronFactions { get; } = [ ];
 
         private void UpdateSquadronFactions ()
         {
@@ -311,8 +312,8 @@ public Faction SelectedSquadronFaction
         }
         private Faction _selectedSquadronFaction;
 
-        public ObservableCollection<Power> SquadronPowers => new ObservableCollection<Power>( Power.AllOfThem
-            .Except( new [] { Power.None } )
+        public static ObservableCollection<Power> SquadronPowers => new( Power.AllOfThem
+            .Except( [ Power.None ] )
             .OrderBy( p => p.localizedName )
             .Prepend( Power.None )
             .ToHashSet() );
@@ -487,7 +488,7 @@ private void handleCarrierJumpedEvent ( CarrierJumpedEvent @event )
             {
                 SetCommanderTitle( @event.controllingsystemfaction.Allegiance );
             }
-            if ( ( @event.docked || @event.onFoot ) && @event.factions.Any() && EDDI.Instance.CurrentStarSystem != null )
+            if ( ( @event.docked || @event.onFoot ) && @event.factions.Count > 0 && EDDI.Instance.CurrentStarSystem != null )
             {
                 if ( @event.timestamp >= updatedAt && 
                      TryUpdateSquadronHomeSystem( @event.systemAddress, @event.factions ) )
@@ -603,7 +604,7 @@ private void handleJumpedEvent ( JumpedEvent @event )
             {
                 SetCommanderTitle( @event.controllingfaction?.Allegiance );
             }
-            if ( @event.factions.Any() && EDDI.Instance.CurrentStarSystem != null )
+            if ( @event.factions.Count > 0 && EDDI.Instance.CurrentStarSystem != null )
             {
                 if ( @event.timestamp >= updatedAt &&
                      TryUpdateSquadronHomeSystem( @event.systemAddress, @event.factions ) )
@@ -619,7 +620,7 @@ private void handleLocationEvent ( LocationEvent @event )
             {
                 SetCommanderTitle( @event.controllingsystemfaction.Allegiance );
             }
-            if ( @event.factions.Any() && EDDI.Instance.CurrentStarSystem != null )
+            if ( @event.factions.Count > 0 && EDDI.Instance.CurrentStarSystem != null )
             {
                 if ( @event.timestamp >= updatedAt &&
                      TryUpdateSquadronHomeSystem( @event.systemAddress, @event.factions ) )
@@ -786,7 +787,7 @@ private void handleSquadronStatusEvent ( SquadronStatusEvent @event )
 
         private bool TryUpdateSquadronHomeSystem ( ulong currentSystemAddress, List<Faction> systemFactions )
         {
-            bool update = false;
+            var update = false;
 
             // Check if current system is inhabited by or HQ for squadron faction
             var squadronFaction = systemFactions.FirstOrDefault( f =>
@@ -875,12 +876,14 @@ private void SetCommanderTitle ( Superpower controllingFactionAllegiance )
                 if ( controllingFactionAllegiance != null )
                 {
                     if ( controllingFactionAllegiance.invariantName == Superpower.Federation.invariantName &&
-                         Cmdr.federationrating != null && Cmdr.federationrating.rank > minFederationRankForTitle )
+                         Cmdr.federationrating is { } rating &&
+                         rating.rank > minFederationRankForTitle )
                     {
                         Cmdr.title = Cmdr.federationrating.localizedName;
                     }
                     else if ( controllingFactionAllegiance.invariantName == Superpower.Empire.invariantName &&
-                              Cmdr.empirerating != null && Cmdr.empirerating.rank > minEmpireRankForTitle )
+                              Cmdr.empirerating is { } empireRating &&
+                              empireRating.rank > minEmpireRankForTitle )
                     {
                         Cmdr.title = Cmdr.empirerating.maleRank.localizedName;
                     }
@@ -891,7 +894,7 @@ private void SetCommanderTitle ( Superpower controllingFactionAllegiance )
         private Commander ReadCommander ( CommanderConfiguration configuration = null )
         {
             // Obtain current commander from our configuration
-            configuration = configuration ?? ConfigService.Instance.commanderConfiguration;
+            configuration ??= ConfigService.Instance.commanderConfiguration;
             var commander = new Commander
             {
                 name = configuration.commanderName,

CommanderMonitor/EddiCommanderMonitor.csproj

@@ -11,20 +11,6 @@
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
         <OutputPath>..\bin\Release\</OutputPath>
     </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="PresentationCore" />
-        <Reference Include="PresentationFramework" />
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xaml" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Net.Http" />
-        <Reference Include="System.Xml" />
-        <Reference Include="WindowsBase" />
-    </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\ConfigService\EddiConfigService.csproj" />
         <ProjectReference Include="..\DataDefinitions\EddiDataDefinitions.csproj" />

CompanionAppService/CompanionAppCredentials.cs

@@ -30,7 +30,7 @@ public class CompanionAppCredentials
         public static CompanionAppCredentials Load(string filepath = null)
         {
             CompanionAppCredentials credentials = null;
-            filepath = filepath ?? defaultPath;
+            filepath ??= defaultPath;
 
             string data = null;
             if (System.IO.File.Exists(filepath))
@@ -75,9 +75,9 @@ public void Clear()
         /// </summary>
         public void Save(string filename = null)
         {
-            filename = filename ?? dataPath ?? defaultPath;
+            filename ??= dataPath ?? defaultPath;
 
-            string json = JsonConvert.SerializeObject(this, Formatting.Indented);
+            var json = JsonConvert.SerializeObject(this, Formatting.Indented);
             Files.Write(filename, json);
         }
     }