Skip to content

Commit

Permalink
Apparently the issue is fixed on .NET 8?
Browse files Browse the repository at this point in the history
  • Loading branch information
Perksey committed Jul 24, 2023
1 parent d062ce3 commit 9d7724f
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ jobs:
with:
java-version: 11
distribution: "temurin"
- name: Setup .NET 8.0
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.100
include-prerelease: true
- name: Setup .NET 7.0
uses: actions/setup-dotnet@v1
with:
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"sdk": {
"version": "7.0.102",
"version": "8.0.100",
"allowPrerelease": true,
"rollForward": "major"
}
}
4 changes: 2 additions & 2 deletions src/Lab/Experiments/Triangle/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static class Program

public static GraphicsAPI API { get; set; } = GraphicsAPI.Default;

#if !NET6_0
#if !NET8_0
// Exclude the entry point if we're running in .NET 6, as this file is
// compiled into the TriangleNET6 project too which has its own
// entrypoint.
Expand Down Expand Up @@ -103,7 +103,7 @@ private static unsafe void Load()
(GLEnum.ArrayBuffer, (nuint)( _vertices.Length * sizeof(float)), vertices, GLEnum.StaticDraw);
}

#if NET6_0
#if NET8_0
_shader = new Shader("TriangleNET6.shader.vert", "TriangleNET6.shader.frag", _gl, typeof(Program));
#else
_shader = new Shader("Triangle.shader.vert", "Triangle.shader.frag", _gl, typeof(Program));
Expand Down
8 changes: 4 additions & 4 deletions src/Lab/Experiments/TriangleNET6/TriangleNET6.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net6.0-android</TargetFrameworks>
<TargetFrameworks>net8.0;net8.0-android</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>preview</LangVersion>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net6.0'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net6.0-android'">android-arm64;android-x86;android-arm;android-x64</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net8.0'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifiers>
<RuntimeIdentifiers Condition="'$(RuntimeIdentifiers)' == '' And '$(TargetFramework)' == 'net8.0-android'">android-arm64;android-x86;android-arm;android-x64</RuntimeIdentifiers>
</PropertyGroup>

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

<!-- Android -->
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0-android'">
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0-android'">
<Compile Remove="\MainActivity.cs" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Maths/Silk.NET.Maths/Scalar.As.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static TTo As<TFrom, TTo>(TFrom val) where TFrom : notnull where TTo : no
// exceed RyuJIT's inlining/codegen budgets. In doing this, Mono apparently started producing invalid
// arm assembly, so we now maintain two paths: one for Mono, and one for CoreCLR. The CoreCLR one should
// really be preferred.
#if ANDROID || IOS
#if (ANDROID || IOS) && !NET8_0

return FromHalfToHalf(val);

Expand Down
2 changes: 1 addition & 1 deletion src/Maths/Silk.NET.Maths/Silk.NET.Maths.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0-android;net6.0-ios</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0-android;net6.0-ios;net8.0-android;net8.0-ios</TargetFrameworks>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
Expand Down

0 comments on commit 9d7724f

Please sign in to comment.