SFML.Net 3 (#277)

* Update SFML.Net to CSFML/SFML 3

- Update all SFML modules to use the latest CSFML methods
- Switch to NET Analyzer from StyleCop

* Add tests for SFML.System

---------

Co-authored-by: Lukas Dürrenberger <[email protected]>

Author: Marioalexsan

.editorconfig

@@ -17,6 +17,22 @@ indent_style = space
 indent_size = 4
 insert_final_newline = false
 trim_trailing_whitespace = true
+csharp_using_directive_placement = outside_namespace:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_prefer_braces = true:warning
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = false:warning
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_expression_bodied_methods = true:warning
+csharp_style_expression_bodied_constructors = true:warning
+csharp_style_expression_bodied_operators = true:warning
+csharp_style_expression_bodied_properties = true:warning
+csharp_style_expression_bodied_indexers = true:warning
+csharp_style_expression_bodied_accessors = true:warning
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_indent_labels = no_change
 
 #########################
 # File Extension Settings
@@ -350,4 +366,7 @@ dotnet_diagnostic.IDE0130.severity = suggestion
 dotnet_diagnostic.IDE0060.severity = suggestion
 
 # CA1805: Do not initialize unnecessarily
-dotnet_diagnostic.CA1805.severity = warning
+dotnet_diagnostic.CA1805.severity = warning
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4

.github/workflows/ci.yml

@@ -41,11 +41,15 @@ jobs:
         run: dotnet new globaljson --sdk-version ${{ steps.setup-dotnet.outputs.dotnet-version }} --force
       - name: Verify SDK Installation
         run: dotnet --info
+        continue-on-error: true
 
       - name: Install SFML.Net Dependencies
         run: dotnet restore
       - name: Build SFML.Net
         run: dotnet build --configuration Release --no-restore
+      - name: Test SFML.Net
+        if: matrix.dotnet.name == '.NET 6'
+        run: dotnet test --configuration Release --no-restore
       - name: Pack SFML.Net
         run: dotnet pack --configuration Release -o Publish
 
@@ -58,4 +62,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: SFML.Net (${{ matrix.platform.name }} ${{ matrix.dotnet.name }})
-          path: Publish/SFML.*.*.nupkg
+          path: Publish/SFML.*.*.nupkg

SFML.CodeStyle.props

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- This file contains code style configurations for projects. -->
-
+  
   <PropertyGroup>
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

SFML.Module.props

@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CSFML" Version="[2.6.1, 2.7)" />
+    <PackageReference Include="CSFML" Version="[3.0.0-rc.1, 3.1)" />
   </ItemGroup>
 
 </Project>

SFML.NuGet.props

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 
-    <Version>2.6.0</Version>
+    <Version>3.0.0-rc.1</Version>
     <Authors>Laurent Gomila</Authors>
     <PackageTags>sfml sfml.net</PackageTags>
     <Copyright>Copyright © Laurent Gomila</Copyright>

SFML.sln

@@ -16,8 +16,15 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4BBA7B74-E003-4D9B-826A-43BD6BA48111}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		SFML.Module.props = SFML.Module.props
+		SFML.NuGet.props = SFML.NuGet.props
+		SFML.CodeStyle.props = SFML.CodeStyle.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SFML.System.Test", "test\SFML.System.Test\SFML.System.Test.csproj", "{958AC8B0-2D99-4C65-97C1-2979A090C82D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D98B564D-6F79-4429-87C3-ECDDC54F731B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -88,11 +95,26 @@ Global
 		{88DD6B5D-3013-4737-A77C-EC2563FCED38}.Release|x64.Build.0 = Release|x64
 		{88DD6B5D-3013-4737-A77C-EC2563FCED38}.Release|x86.ActiveCfg = Release|x86
 		{88DD6B5D-3013-4737-A77C-EC2563FCED38}.Release|x86.Build.0 = Release|x86
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|x64.ActiveCfg = Debug|x64
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|x64.Build.0 = Debug|x64
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|x86.ActiveCfg = Debug|x86
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Debug|x86.Build.0 = Debug|x86
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|x64.ActiveCfg = Release|x64
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|x64.Build.0 = Release|x64
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|x86.ActiveCfg = Release|x86
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {384AFDD8-7EEF-462A-B496-B5F71D0EEF1D}
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{958AC8B0-2D99-4C65-97C1-2979A090C82D} = {D98B564D-6F79-4429-87C3-ECDDC54F731B}
+	EndGlobalSection
 EndGlobal

examples/netcore/Program.cs

@@ -4,44 +4,43 @@
 using SFML.System;
 using SFML.Window;
 
-namespace netcore
+namespace netcore;
+
+internal class Program
 {
-    internal class Program
+    private static void Main()
     {
-        private static void Main()
+        var shape = new RectangleShape(new Vector2f(100, 100))
         {
-            var shape = new RectangleShape(new Vector2f(100, 100))
-            {
-                FillColor = Color.Black
-            };
-
-            var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
+            FillColor = Color.Black
+        };
 
-            var window = new RenderWindow(new VideoMode(800, 600), "SFML running in .NET Core");
-            window.Closed += (_, _) => window.Close();
+        var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
 
-            sound.Play();
+        var window = new RenderWindow(new VideoMode((800, 600)), "SFML running in .NET Core");
+        window.Closed += (_, _) => window.Close();
 
-            while (window.IsOpen)
-            {
-                window.DispatchEvents();
-                window.Clear(Color.White);
-                window.Draw(shape);
-                window.Display();
-            }
-        }
+        sound.Play();
 
-        private static SoundBuffer GenerateSineWave(double frequency, double volume, int seconds)
+        while (window.IsOpen)
         {
-            uint sampleRate = 44100;
-            var samples = new short[seconds * sampleRate];
+            window.DispatchEvents();
+            window.Clear(Color.White);
+            window.Draw(shape);
+            window.Display();
+        }
+    }
 
-            for (var i = 0; i < samples.Length; i++)
-            {
-                samples[i] = (short)(Math.Sin(frequency * (2 * Math.PI) * i / sampleRate) * volume * short.MaxValue);
-            }
+    private static SoundBuffer GenerateSineWave(double frequency, double volume, int seconds)
+    {
+        uint sampleRate = 44100;
+        var samples = new short[seconds * sampleRate];
 
-            return new SoundBuffer(samples, 1, sampleRate);
+        for (var i = 0; i < samples.Length; i++)
+        {
+            samples[i] = (short)(Math.Sin(frequency * (2 * Math.PI) * i / sampleRate) * volume * short.MaxValue);
         }
+
+        return new SoundBuffer(samples, 1, sampleRate, new SoundChannel[] { SoundChannel.Mono });
     }
 }

examples/netcore/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "netcore": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}

examples/opengl/OpenGL.cs

@@ -24,7 +24,7 @@ private static void Main()
             };
 
             // Create the main window
-            var window = new RenderWindow(new VideoMode(800, 600), "SFML graphics with OpenGL", Styles.Default, contextSettings);
+            var window = new RenderWindow(new VideoMode((800, 600)), "SFML graphics with OpenGL", Styles.Default, State.Windowed, contextSettings);
             window.SetVerticalSyncEnabled(true);
 
             // Initialize OpenTK
@@ -41,7 +41,7 @@ private static void Main()
             var background = new Sprite(new Texture("resources/background.jpg"));
 
             // Create a text to display on top of the OpenGL object
-            var text = new Text("SFML / OpenGL demo", new Font("resources/sansation.ttf"))
+            var text = new Text(new Font("resources/sansation.ttf"), "SFML / OpenGL demo")
             {
                 Position = new Vector2f(250, 450),
                 FillColor = new SFML.Graphics.Color(255, 255, 255, 170)
@@ -212,6 +212,6 @@ private static void OnKeyPressed(object sender, KeyEventArgs e)
         /// <summary>
         /// Function called when the window is resized
         /// </summary>
-        private static void OnResized(object sender, SizeEventArgs e) => GL.Viewport(0, 0, (int)e.Width, (int)e.Height);
+        private static void OnResized(object sender, SizeEventArgs e) => GL.Viewport(0, 0, (int)e.Size.X, (int)e.Size.Y);
     }
 }

examples/opengl/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "opengl": {
+      "commandName": "Project",
+      "nativeDebugging": true
+    }
+  }
+}