Skip to content

Commit 9b3dd1d

Browse files
committed
Fix build?
1 parent b941217 commit 9b3dd1d

File tree

72 files changed

+283
-562111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+283
-562111
lines changed

build/cache/openxr.json.gz

0 Bytes
Binary file not shown.

build/cache/pre-specialised.json

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

build/cache/pre-unspecialised.json

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

build/csharp_typemap.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,6 @@
162162
"cl_properties": "ulong",
163163
"IStream": "Silk.NET.Core.Win32Extras.IStream",
164164
"FILETIME": "Silk.NET.Core.Win32Extras.Filetime",
165-
"SC_HANDLE__*": "Silk.NET.Core.Native.ScHandle"
165+
"SC_HANDLE__*": "Silk.NET.Core.Native.ScHandle",
166+
"AIBinder": "void"
166167
}

src/Core/Silk.NET.BuildTools/Bind/ProjectWriter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public static void WriteProjectFile(this Project project, string folder, Profile
131131
csproj.WriteLine
132132
(" <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>");
133133
csproj.WriteLine(" <AllowUnsafeBlocks>true</AllowUnsafeBlocks>");
134-
csproj.WriteLine(" <LangVersion>10</LangVersion>");
134+
csproj.WriteLine(" <LangVersion>preview</LangVersion>");
135135
csproj.WriteLine(" </PropertyGroup>");
136136
csproj.WriteLine();
137137
csproj.WriteLine(" <ItemGroup>");

src/Core/Silk.NET.BuildTools/Converters/Readers/VulkanReader.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@ public object Load(Stream stream)
2828
{
2929
Console.WriteLine("Loading raw Vulkan/OpenXR specification...");
3030
var spec = VulkanSpecification.LoadFromXmlStream(stream);
31-
File.WriteAllText("build/cache/pre-unspecialised.json", JsonConvert.SerializeObject(spec, Formatting.Indented));
3231
Console.WriteLine("Specialising specification...");
3332
spec.Specialise();
34-
File.WriteAllText("build/cache/pre-specialised.json", JsonConvert.SerializeObject(spec, Formatting.Indented));
3533
return spec;
3634
}
3735

src/Input/Silk.NET.Input.Glfw/Silk.NET.Input.Glfw.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
6-
<LangVersion>8.0</LangVersion>
6+
<LangVersion>preview</LangVersion>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

src/Input/Silk.NET.Input/Silk.NET.Input.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
55
<SilkMetapackage>true</SilkMetapackage>
66
</PropertyGroup>
77

88
<ItemGroup>
99
<ProjectReference Include="..\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj" />
1010
</ItemGroup>
1111

12-
<ItemGroup Condition="'$(TargetFramework)' != 'net8.0-android' And '$(TargetFramework)' != 'net8.0-ios' And '$(TargetFramework)' != 'net8.0-maccatalyst' And '$(TargetFramework)' != 'net6.0'">
12+
<ItemGroup Condition="'$(TargetFramework)' != 'net7.0-android' And '$(TargetFramework)' != 'net7.0-ios' And '$(TargetFramework)' != 'net7.0-maccatalyst' And '$(TargetFramework)' != 'net6.0'">
1313
<ProjectReference Include="..\Silk.NET.Input.Glfw\Silk.NET.Input.Glfw.csproj" />
1414
<ProjectReference Include="..\Silk.NET.Input.Sdl\Silk.NET.Input.Sdl.csproj" />
1515
</ItemGroup>
1616

17-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android' Or '$(TargetFramework)' == 'net8.0-ios' Or '$(TargetFramework)' == 'net8.0-maccatalyst'">
17+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android' Or '$(TargetFramework)' == 'net7.0-ios' Or '$(TargetFramework)' == 'net7.0-maccatalyst'">
1818
<ProjectReference Include="..\Silk.NET.Input.Sdl\Silk.NET.Input.Sdl.csproj" />
1919
</ItemGroup>
2020

src/Lab/Benchmarks/InvokeBenchmarks/InvokeBenchmarks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net5.0</TargetFramework>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<LangVersion>9</LangVersion>
7+
<LangVersion>preview</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

src/Lab/Experiments/CLMultiplication/CLMultiplication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<LangVersion>9</LangVersion>
7+
<LangVersion>preview</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

0 commit comments

Comments
 (0)