Skip to content

Commit 134f414

Browse files
eXpl0it3reXpl0it3r
committed
Switch examples to .NET 8
SFML is primarily focussing on .NET Standard 2.0 and/or "mondern" .NET as such it makes sense to have all examples on .NET 8 and one example demonstrating .NET Framework support
1 parent d3cb025 commit 134f414

File tree

21 files changed

+745
-761
lines changed

21 files changed

+745
-761
lines changed

‎examples/Examples.sln‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.9.34902.65
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.2.11408.102
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SFML", "SFML", "{620580C3-9270-42C9-A2BF-4DA85B522831}"
77
EndProject
@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFML.System", "..\src\SFML.
2727
EndProject
2828
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SFML.Window", "..\src\SFML.Window\SFML.Window.csproj", "{698CC2F9-93C8-4119-997B-B622193FA827}"
2929
EndProject
30-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netcore", "netcore\netcore.csproj", "{93B8425A-AC40-4486-96AF-20027B738C09}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "netfx", "netfx\netfx.csproj", "{93B8425A-AC40-4486-96AF-20027B738C09}"
3131
EndProject
3232
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A64BFAB3-DD36-4ABE-AABB-8A594327CCDD}"
3333
ProjectSection(SolutionItems) = preProject
@@ -45,61 +45,73 @@ Global
4545
EndGlobalSection
4646
GlobalSection(ProjectConfigurationPlatforms) = postSolution
4747
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48+
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
4849
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|x64.ActiveCfg = Debug|x64
4950
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|x64.Build.0 = Debug|x64
5051
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|x86.ActiveCfg = Debug|x86
5152
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Debug|x86.Build.0 = Debug|x86
5253
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
54+
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|Any CPU.Build.0 = Release|Any CPU
5355
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|x64.ActiveCfg = Release|x64
5456
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|x64.Build.0 = Release|x64
5557
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|x86.ActiveCfg = Release|x86
5658
{2FC1071D-4470-4704-B28E-29FF4DD432A0}.Release|x86.Build.0 = Release|x86
5759
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
60+
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|Any CPU.Build.0 = Debug|Any CPU
5861
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|x64.ActiveCfg = Debug|x64
5962
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|x64.Build.0 = Debug|x64
6063
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|x86.ActiveCfg = Debug|x86
6164
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Debug|x86.Build.0 = Debug|x86
6265
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|Any CPU.ActiveCfg = Release|Any CPU
66+
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|Any CPU.Build.0 = Release|Any CPU
6367
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|x64.ActiveCfg = Release|x64
6468
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|x64.Build.0 = Release|x64
6569
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|x86.ActiveCfg = Release|x86
6670
{EBF44846-C2C9-4595-881F-FD3489C0828F}.Release|x86.Build.0 = Release|x86
6771
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
72+
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|Any CPU.Build.0 = Debug|Any CPU
6873
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|x64.ActiveCfg = Debug|x64
6974
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|x64.Build.0 = Debug|x64
7075
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|x86.ActiveCfg = Debug|x86
7176
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Debug|x86.Build.0 = Debug|x86
7277
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|Any CPU.ActiveCfg = Release|Any CPU
78+
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|Any CPU.Build.0 = Release|Any CPU
7379
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|x64.ActiveCfg = Release|x64
7480
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|x64.Build.0 = Release|x64
7581
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|x86.ActiveCfg = Release|x86
7682
{16B5B101-D5CC-449D-B6C5-E93048B01108}.Release|x86.Build.0 = Release|x86
7783
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
84+
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
7885
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|x64.ActiveCfg = Debug|x64
7986
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|x64.Build.0 = Debug|x64
8087
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|x86.ActiveCfg = Debug|x86
8188
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Debug|x86.Build.0 = Debug|x86
8289
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
90+
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|Any CPU.Build.0 = Release|Any CPU
8391
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|x64.ActiveCfg = Release|x64
8492
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|x64.Build.0 = Release|x64
8593
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|x86.ActiveCfg = Release|x86
8694
{FBA62527-7197-4EEE-B96A-7E3FEC313BCE}.Release|x86.Build.0 = Release|x86
8795
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
96+
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
8897
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|x64.ActiveCfg = Debug|x64
8998
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|x64.Build.0 = Debug|x64
9099
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|x86.ActiveCfg = Debug|x86
91100
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Debug|x86.Build.0 = Debug|x86
92101
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
102+
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|Any CPU.Build.0 = Release|Any CPU
93103
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|x64.ActiveCfg = Release|x64
94104
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|x64.Build.0 = Release|x64
95105
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|x86.ActiveCfg = Release|x86
96106
{98552080-F688-46B4-A2FF-1AC7C50ECBE8}.Release|x86.Build.0 = Release|x86
97107
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108+
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
98109
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|x64.ActiveCfg = Debug|x64
99110
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|x64.Build.0 = Debug|x64
100111
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|x86.ActiveCfg = Debug|x86
101112
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Debug|x86.Build.0 = Debug|x86
102113
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
114+
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Release|Any CPU.Build.0 = Release|Any CPU
103115
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Release|x64.ActiveCfg = Release|x64
104116
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Release|x64.Build.0 = Release|x64
105117
{7696A8C5-CB82-4B53-8E55-BF4C7B20E8E2}.Release|x86.ActiveCfg = Release|x86
@@ -164,14 +176,14 @@ Global
164176
{698CC2F9-93C8-4119-997B-B622193FA827}.Release|x64.Build.0 = Release|x64
165177
{698CC2F9-93C8-4119-997B-B622193FA827}.Release|x86.ActiveCfg = Release|x86
166178
{698CC2F9-93C8-4119-997B-B622193FA827}.Release|x86.Build.0 = Release|x86
167-
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
168-
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|Any CPU.Build.0 = Debug|Any CPU
179+
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|Any CPU.ActiveCfg = Debug|x64
180+
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|Any CPU.Build.0 = Debug|x64
169181
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|x64.ActiveCfg = Debug|x64
170182
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|x64.Build.0 = Debug|x64
171183
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|x86.ActiveCfg = Debug|x86
172184
{93B8425A-AC40-4486-96AF-20027B738C09}.Debug|x86.Build.0 = Debug|x86
173-
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|Any CPU.ActiveCfg = Release|Any CPU
174-
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|Any CPU.Build.0 = Release|Any CPU
185+
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|Any CPU.ActiveCfg = Release|x64
186+
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|Any CPU.Build.0 = Release|x64
175187
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x64.ActiveCfg = Release|x64
176188
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x64.Build.0 = Release|x64
177189
{93B8425A-AC40-4486-96AF-20027B738C09}.Release|x86.ActiveCfg = Release|x86

‎examples/netcore/Properties/launchSettings.json‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/netcore/Program.cs renamed to examples/netfx/Program.cs

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,30 @@
44
using SFML.System;
55
using SFML.Window;
66

7-
namespace netcore;
7+
namespace netfx;
88

9-
internal class Program
9+
public static class Program
1010
{
1111
private static void Main()
1212
{
13-
var shape = new RectangleShape(new Vector2f(100, 100))
13+
var window = new RenderWindow(new VideoMode((800, 600)), "SFML running with .NET Framework");
14+
window.Closed += (_, _) => window.Close();
15+
16+
var shape = new CircleShape(100f, 50)
1417
{
15-
FillColor = Color.Black
18+
FillColor = Color.Green,
19+
Origin = new Vector2f(100f, 100f),
20+
Position = new Vector2f(400f, 300f)
1621
};
1722

1823
var sound = new Sound(GenerateSineWave(frequency: 440.0, volume: .25, seconds: 1));
1924

20-
var window = new RenderWindow(new VideoMode((800, 600)), "SFML running in .NET Core");
21-
window.Closed += (_, _) => window.Close();
22-
2325
sound.Play();
2426

2527
while (window.IsOpen)
2628
{
2729
window.DispatchEvents();
28-
window.Clear(Color.White);
30+
window.Clear();
2931
window.Draw(shape);
3032
window.Display();
3133
}
@@ -41,6 +43,6 @@ private static SoundBuffer GenerateSineWave(double frequency, double volume, int
4143
samples[i] = (short)(Math.Sin(frequency * (2 * Math.PI) * i / sampleRate) * volume * short.MaxValue);
4244
}
4345

44-
return new SoundBuffer(samples, 1, sampleRate, new SoundChannel[] { SoundChannel.Mono });
46+
return new SoundBuffer(samples, 1, sampleRate, [SoundChannel.Mono]);
4547
}
4648
}

examples/netcore/netcore.csproj renamed to examples/netfx/netfx.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net6.0</TargetFramework>
7+
<TargetFramework>net48</TargetFramework>
8+
<LangVersion>12</LangVersion>
9+
<Platforms>x86;x64</Platforms>
810
<Version>3.0.0</Version>
9-
<Platforms>AnyCPU;x64;x86</Platforms>
1011
</PropertyGroup>
1112

1213
<ItemGroup>
1314
<ProjectReference Include="..\..\src\SFML.Net\SFML.Net.csproj" />
1415
</ItemGroup>
1516

17+
<ItemGroup>
18+
<Folder Include="Properties\" />
19+
</ItemGroup>
20+
1621
</Project>

examples/netcore/readme.md renamed to examples/netfx/readme.md

File renamed without changes.

0 commit comments

Comments
 (0)