Skip to content

Commit

Permalink
Merge pull request #87 from johanlindfors/master
Browse files Browse the repository at this point in the history 
Minor upgrades to 4.8.2 and .NET 8.0
  • Loading branch information
@NogginBops
NogginBops authored Dec 5, 2023
2 parents e4f2617 + 0b92b95 commit 6825eba
Show file tree
Hide file tree
Showing 39 changed files with 59 additions and 59 deletions.
4 changes: 2 additions & 2 deletions Chapter1/1-CreatingAWindow/1-CreatingAWindow.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Chapter1/1-CreatingAWindow/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Creating a Window",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/2-HelloTriangle/2-HelloTriangle.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/2-HelloTriangle/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Creating a Window",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/3-ElementBufferObjects/3-ElementBufferObjects.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/3-ElementBufferObjects/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Element Buffer Objects",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/4-Shaders-InsAndOuts/4-Shaders-InsAndOuts.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/4-Shaders-InsAndOuts/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Shaders In and Outs!",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/4-Shaders-MoreAttributes/4-Shaders-MoreAttributes.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/4-Shaders-MoreAttributes/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Shaders More Attributes!",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/4-Shaders-Uniforms/4-Shaders-Uniforms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/4-Shaders-Uniforms/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Shaders Uniforms!",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/5-Textures/5-Textures.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/5-Textures/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Textures",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/6-MultipleTextures/6-MultipleTextures.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/6-MultipleTextures/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Multiple Textures",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/7-Transformations/7-Transformations.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/7-Transformations/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Transformations",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/8-CoordinatesSystems/8-CoordinatesSystems.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/8-CoordinatesSystems/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Coordinates Systems",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter1/9-Camera/9-Camera.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter1/9-Camera/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Camera",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter2/1-Colors/1-Colors.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter2/1-Colors/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Colors",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter2/2-BasicLighting/2-BasicLighting.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter2/2-BasicLighting/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Basic lighting",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter2/3-Materials/3-Materials.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="Shaders/**" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter2/3-Materials/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Materials",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
4 changes: 2 additions & 2 deletions Chapter2/4-LightingMaps/4-LightingMaps.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<OutputType>WinExe</OutputType>
<RootNamespace>LearnOpenTK</RootNamespace>
<AssemblyName>LearnOpenTK</AssemblyName>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand All @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="OpenTK" Version="4.7.4" />
<PackageReference Include="OpenTK" Version="4.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Chapter2/4-LightingMaps/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private static void Main()
{
var nativeWindowSettings = new NativeWindowSettings()
{
Size = new Vector2i(800, 600),
ClientSize = new Vector2i(800, 600),
Title = "LearnOpenTK - Lighting maps",
// This is needed to run on macos
Flags = ContextFlags.ForwardCompatible,
Expand Down
Loading

0 comments on commit 6825eba

Please sign in to comment.