C#12 & .NET 8 updates

Samples/Media SDK/FileCryptingManagerSample/FileCryptingManagerExtensions.cs

@@ -12,7 +12,9 @@
 using System.Threading.Tasks;
 using Genetec.Sdk.Media.Export;
 
-public static class FileCryptingManagerExtensions
+namespace Genetec.Dap.CodeSamples;
+
+static class FileCryptingManagerExtensions
 {
     /// <summary>
     /// Encrypts a file asynchronously using the specified password.

Samples/Media SDK/FileCryptingManagerSample/Program.cs

@@ -1,4 +1,11 @@
-using System;
+// Copyright 2024 Genetec Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+using System;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;

Samples/Media SDK/MediaFileSample/Program.cs

@@ -1,4 +1,11 @@
-using System;
+// Copyright 2024 Genetec Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+using System;
 using System.IO;
 using Genetec.Dap.CodeSamples;
 using Genetec.Sdk.Media;
@@ -17,7 +24,7 @@ void RunSample()
         Console.WriteLine($"\nMedia file path: {mediaFile}");
 
         Console.WriteLine("\nUnique Sources:");
-        foreach (var source in mediaFile.UniqueSources)
+        foreach (UniqueSource source in mediaFile.UniqueSources)
         {
             Console.WriteLine($"Collection: {source.Collection} ({source.CollectionName})");
             Console.WriteLine($"Encoder: {source.Encoder} ({source.EncoderName})");
@@ -29,7 +36,7 @@ void RunSample()
         }
 
         Console.WriteLine("Contained Files:");
-        foreach (var file in mediaFile.ContainedFiles)
+        foreach (MediaFile.ContainedFile file in mediaFile.ContainedFiles)
         {
             Console.WriteLine($"Filename: {file.Filename}");
             Console.WriteLine($"Start Time: {file.StartTime}");

Samples/Media SDK/MediaFileSample/StreamMediaType.cs

@@ -7,7 +7,9 @@
 
 using System;
 
-public static class StreamMediaType
+namespace Genetec.Dap.CodeSamples;
+
+static class StreamMediaType
 {
     public static readonly Guid Legacy = new("E5FDCEF3-0A63-4615-A2A2-BB34C892FB97");
     public static readonly Guid Video = new("4A0425E9-5F15-4675-83EB-2777CE199CB3");

Samples/Media SDK/MediaFileSample/StreamUsageType.cs

@@ -7,7 +7,9 @@
 
 using System;
 
-public static class StreamUsageType
+namespace Genetec.Dap.CodeSamples;
+
+static class StreamUsageType
 {
     public static readonly Guid Live = new("e30e6525-2202-4502-8101-5a75ee15f04b");
     public static readonly Guid Archiving = new("bac8d8bf-ee2a-41ac-b62c-3c2dd00020a5");

Samples/Media SDK/OverlaySample/BouncingBall.cs

@@ -1,82 +1,85 @@
-// Copyright (C) 2023 by Genetec, Inc. All rights reserved.
-// May be used only in accordance with a valid Source Code License Agreement.
+// Copyright 2024 Genetec Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-namespace Genetec.Dap.CodeSamples
+namespace Genetec.Dap.CodeSamples;
+
+using System.Windows;
+using System.Windows.Media;
+using Sdk.Media.Overlay;
+
+class BouncingBall
 {
-    using System.Windows;
-    using System.Windows.Media;
-    using Sdk.Media.Overlay;
+    public double CanvasWidth = 1290;
 
-    public class BouncingBall
-    {
-        public double CanvasWidth = 1290;
+    public double CanvasHeight = 100;
 
-        public double CanvasHeight = 100;
+    private double m_x;
 
-        private double m_x;
+    private double m_y;
 
-        private double m_y;
+    private readonly double m_radius;
 
-        private readonly double m_radius;
+    private double m_horizontalVelocity;
 
-        private double m_horizontalVelocity;
+    private double m_verticalVelocity;
 
-        private double m_verticalVelocity;
+    private readonly SolidColorBrush m_brush;
 
-        private readonly SolidColorBrush m_brush;
+    private readonly Pen m_pen;
 
-        private readonly Pen m_pen;
+    public BouncingBall(double x, double y, double horizontalVelocity, double verticalVelocity, double radius)
+    {
+        m_x = x;
+        m_y = y;
+        m_horizontalVelocity = horizontalVelocity;
+        m_verticalVelocity = verticalVelocity;
+        m_radius = radius;
 
-        public BouncingBall(double x, double y, double horizontalVelocity, double verticalVelocity, double radius)
-        {
-            m_x = x;
-            m_y = y;
-            m_horizontalVelocity = horizontalVelocity;
-            m_verticalVelocity = verticalVelocity;
-            m_radius = radius;
+        m_brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("Red"));
+        m_brush.Freeze();
 
-            m_brush = new SolidColorBrush((Color)ColorConverter.ConvertFromString("Red"));
-            m_brush.Freeze();
+        m_pen = new Pen(m_brush, 1.0);
+        m_pen.Freeze();
+    }
 
-            m_pen = new Pen(m_brush, 1.0);
-            m_pen.Freeze();
-        }
+    public void Draw(Layer layer)
+    {
+        Update();
+        layer.DrawEllipse(m_brush, m_pen, new Point(m_x, m_y), m_radius, m_radius);
+    }
+
+    private void Update()
+    {
+        // Update position using basic physics equations
+        m_x += m_horizontalVelocity * 0.5f;
+        m_y += m_verticalVelocity * 0.5f;
 
-        public void Draw(Layer layer)
+        // Check if ball has collided with the left or right boundary
+        if (m_x - m_radius < 0)
         {
-            Update();
-            layer.DrawEllipse(m_brush, m_pen, new Point(m_x, m_y), m_radius, m_radius);
+            m_x = m_radius;
+            m_horizontalVelocity = -m_horizontalVelocity;
+        }
+        else if (m_x + m_radius > CanvasWidth)
+        {
+            m_x = CanvasWidth - m_radius;
+            m_horizontalVelocity = -m_horizontalVelocity;
         }
 
-        private void Update()
+        // Check if ball has collided with the top or bottom boundary
+        if (m_y - m_radius < 0)
+        {
+            m_y = m_radius;
+            m_verticalVelocity = -m_verticalVelocity;
+        }
+        else if (m_y + m_radius > CanvasHeight)
         {
-            // Update position using basic physics equations
-            m_x += m_horizontalVelocity * 0.5f;
-            m_y += m_verticalVelocity * 0.5f;
-
-            // Check if ball has collided with the left or right boundary
-            if (m_x - m_radius < 0)
-            {
-                m_x = m_radius;
-                m_horizontalVelocity = -m_horizontalVelocity;
-            }
-            else if (m_x + m_radius > CanvasWidth)
-            {
-                m_x = CanvasWidth - m_radius;
-                m_horizontalVelocity = -m_horizontalVelocity;
-            }
-
-            // Check if ball has collided with the top or bottom boundary
-            if (m_y - m_radius < 0)
-            {
-                m_y = m_radius;
-                m_verticalVelocity = -m_verticalVelocity;
-            }
-            else if (m_y + m_radius > CanvasHeight)
-            {
-                m_y = CanvasHeight - m_radius;
-                m_verticalVelocity = -m_verticalVelocity;
-            }
+            m_y = CanvasHeight - m_radius;
+            m_verticalVelocity = -m_verticalVelocity;
         }
     }
-}
+}

Samples/Media SDK/OverlaySample/BouncingBallOverlay.cs

@@ -1,72 +1,69 @@
-// Copyright (C) 2023 by Genetec, Inc. All rights reserved.
-// May be used only in accordance with a valid Source Code License Agreement.
+// Copyright 2024 Genetec Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
-namespace Genetec.Dap.CodeSamples
+namespace Genetec.Dap.CodeSamples;
+
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using Sdk.Media.Overlay;
+
+class BouncingBallOverlay(Guid cameraId)
 {
-    using System;
-    using System.Threading;
-    using System.Threading.Tasks;
-    using Sdk.Media.Overlay;
+    private readonly Guid m_layerId = new("69A64ACE-6DDC-4142-AD04-06690D8591B3");
+    private Task m_task;
+    private CancellationTokenSource m_cancellationTokenSource;
 
-    public class BouncingBallOverlay
+    public void Stop()
     {
-        private readonly Guid m_cameraId;
-        private readonly Guid m_layerId = new Guid("69A64ACE-6DDC-4142-AD04-06690D8591B3");
-        private Task m_task;
-        private CancellationTokenSource m_cancellationTokenSource;
+        m_cancellationTokenSource?.Cancel();
+        m_cancellationTokenSource?.Dispose();
+    }
 
-        public BouncingBallOverlay(Guid cameraId)
-        {
-            m_cameraId = cameraId;
-        }
+    public void Start()
+    {
+        if (m_task is { IsCompleted: false })
+            return;
 
-        public void Stop()
-        {
-            m_cancellationTokenSource?.Cancel();
-            m_cancellationTokenSource?.Dispose();
-        }
+        m_cancellationTokenSource?.Dispose();
+        m_cancellationTokenSource = new CancellationTokenSource();
 
-        public void Start()
-        {
-            if (m_task is { IsCompleted: false })
-                return;
+        CancellationToken token = m_cancellationTokenSource.Token;
 
-            m_cancellationTokenSource?.Dispose();
-            m_cancellationTokenSource = new CancellationTokenSource();
+        m_task = Task.Run(async () =>
+        {
+            var ball = new BouncingBall(50, 50, 50, 50, 25)
+            {
+                CanvasHeight = 960,
+                CanvasWidth = 1280
+            };
 
-            CancellationToken token = m_cancellationTokenSource.Token;
+            Overlay overlay = OverlayFactory.Get(cameraId, "Bouncing ball");
 
-            m_task = Task.Run(async () =>
+            if (overlay.DrawingSurfaceWidth == 0 || overlay.DrawingSurfaceHeight == 0)
             {
-                var ball = new BouncingBall(50, 50, 50, 50, 25)
-                {
-                    CanvasHeight = 960,
-                    CanvasWidth = 1280
-                };
-
-                Overlay overlay = OverlayFactory.Get(m_cameraId, "Bouncing ball");
+                overlay.Initialize(1280, 960);
+            }
 
-                if (overlay.DrawingSurfaceWidth == 0 || overlay.DrawingSurfaceHeight == 0)
-                {
-                    overlay.Initialize(1280, 960);
-                }
+            await overlay.WaitUntilReadyForUpdate();
 
-                await overlay.WaitUntilReadyForUpdate();
+            Layer layer = overlay.CreateLayer(m_layerId, "Bouncing ball");
 
-                Layer layer = overlay.CreateLayer(m_layerId, "Bouncing ball");
+            while (!token.IsCancellationRequested)
+            {
+                ball.Draw(layer);
 
-                while (!token.IsCancellationRequested)
+                if (!layer.Update())
                 {
-                    ball.Draw(layer);
-
-                    if (!layer.Update())
-                    {
-                        Console.WriteLine("Update failed");
-                    }
-
-                    await Task.Delay(10, token);
+                    Console.WriteLine("Update failed");
                 }
-            }, token);
-        }
+
+                await Task.Delay(10, token);
+            }
+        }, token);
     }
-}
+}