Update dependencies (#954)

Author: AlexMacocian

Daybreak/Daybreak.csproj

@@ -62,7 +62,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.4" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.4" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3240.44" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
     <PackageReference Include="NAudio" Version="2.2.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

Daybreak/Views/MetricsView.xaml.cs

@@ -49,7 +49,7 @@ public MetricsView(
 
     private void UserControl_Loaded(object sender, RoutedEventArgs e)
     {
-        this.Metrics.AddRange(this.metricsService.GetMetrics().Select(s => new MetricSetViewModel { Instrument = s.Instrument, AggregationType = s.AggregationType, Metrics = new ObservableCollection<Metric>(s.Metrics ?? new List<Metric>()) }).ToList());
+        this.Metrics.AddRange([.. this.metricsService.GetMetrics().Select(s => new MetricSetViewModel { Instrument = s.Instrument, AggregationType = s.AggregationType, Metrics = [.. s.Metrics ?? []] })]);
         this.metricsService.SetRecorded += this.MetricsService_SetRecorded;
         this.metricsService.MetricRecorded += this.MetricsService_MetricRecorded;
     }
@@ -71,7 +71,7 @@ private void MetricsService_SetRecorded(object? sender, MetricSet e)
     {
         this.Dispatcher.Invoke(() =>
         {
-            this.Metrics.Add(new MetricSetViewModel { AggregationType = e.AggregationType, Instrument = e.Instrument, Metrics = new ObservableCollection<Metric>(e.Metrics ?? new List<Metric>()) });
+            this.Metrics.Add(new MetricSetViewModel { AggregationType = e.AggregationType, Instrument = e.Instrument, Metrics = [.. e.Metrics ?? []] });
         });
     }
 
@@ -114,8 +114,8 @@ metricSet.Metrics is null ||
         }
 
         cartesianChart.DrawMargin = new LiveChartsCore.Measure.Margin(30);
-        cartesianChart.XAxes = new Axis[]
-        {
+        cartesianChart.XAxes =
+        [
             new Axis
             {
                 Name = "Time",
@@ -133,10 +133,10 @@ metricSet.Metrics is null ||
                 TicksPaint = this.transparentPaint,
                 ZeroPaint = this.transparentPaint,
             }
-        };
+        ];
 
-        cartesianChart.YAxes = new Axis[]
-        {
+        cartesianChart.YAxes =
+        [
             new Axis
             {
                 Name = metricSet.Instrument.Unit,
@@ -150,18 +150,18 @@ metricSet.Metrics is null ||
                 TicksPaint = this.transparentPaint,
                 ZeroPaint = this.transparentPaint,
             }
-        };
+        ];
 
-        cartesianChart.Series = new ISeries[]
-        {
+        cartesianChart.Series =
+        [
             new LineSeries<Metric>
             {
                 Values = metricSet.AggregationType switch
                 {
-                    AggregationTypes.NoAggregate => this.PlotNoAggregation(metricSet.Metrics),
-                    AggregationTypes.P95 => this.PlotPercentageAggregation(metricSet.Metrics, 0.95),
-                    AggregationTypes.P98 => this.PlotPercentageAggregation(metricSet.Metrics, 0.98),
-                    AggregationTypes.P99 => this.PlotPercentageAggregation(metricSet.Metrics, 0.99),
+                    AggregationTypes.NoAggregate => PlotNoAggregation(metricSet.Metrics),
+                    AggregationTypes.P95 => PlotPercentageAggregation(metricSet.Metrics, 0.95),
+                    AggregationTypes.P98 => PlotPercentageAggregation(metricSet.Metrics, 0.98),
+                    AggregationTypes.P99 => PlotPercentageAggregation(metricSet.Metrics, 0.99),
                     _ => throw new InvalidOperationException("Unable to plot metrics. Unknown aggregation")
                 },
                 Fill = default,
@@ -173,7 +173,7 @@ metricSet.Metrics is null ||
                 GeometrySize = default,
                 Name = string.Empty
             }
-        };
+        ];
 
         cartesianChart.Title = new LabelVisual
         {
@@ -183,23 +183,23 @@ metricSet.Metrics is null ||
         };
     }
 
-    private IEnumerable<Metric> PlotNoAggregation(IEnumerable<Metric> dataSet)
+    private void InterceptScroll(object sender, System.Windows.Input.MouseWheelEventArgs e)
+    {
+        e.Handled = true;
+    }
+
+    private static ObservableCollection<Metric> PlotNoAggregation(ObservableCollection<Metric> dataSet)
     {
         return dataSet;
     }
 
-    private IEnumerable<Metric> PlotPercentageAggregation(IEnumerable<Metric> dataSet, double percentage)
+    private static IReadOnlyCollection<Metric> PlotPercentageAggregation(ObservableCollection<Metric> dataSet, double percentage)
     {
         var dataSetArray = dataSet.ToArray();
         var valuesToTake = Math.Round(dataSetArray.Length * percentage).ToInt();
         var orderedByValueDataSet = dataSetArray.OrderBy(s => s.Measurement);
         var finalDataSet = orderedByValueDataSet.Take(valuesToTake).OrderBy(s => s.Timestamp);
 
-        return finalDataSet;
-    }
-
-    private void InterceptScroll(object sender, System.Windows.Input.MouseWheelEventArgs e)
-    {
-        e.Handled = true;
+        return [.. finalDataSet];
     }
 }