Skip to content

Commit d9d9c0a

Browse files
NogginBopsNogginBops
authored
Merge pull request opentk#1771 from NogginBops/fix-glfw-callingconv
Fix glfw calling convention on 32-bit Windows.
2 parents 05a8796 + ef3ba50 commit d9d9c0a

File tree

21 files changed

+238
-269
lines changed

21 files changed

+238
-269
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.2.0",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
]

‎build/build.fs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,13 @@ open Fake.Core.TargetOperators
333333
==> "CreateMetaPackage"
334334
==> "ReleaseOnNuGet"
335335
==> "ReleaseOnGithub"
336-
==> "ReleaseOnAll"
336+
==> "ReleaseOnAll"
337+
|> ignore
337338

338339
// We build the nuget package so that appvayor can get the artifacts
339340
"CreateMetaPackage"
340341
==> "RunCITests"
342+
|> ignore
341343

342344
//"Build"
343345

‎build/build.fsproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Fake.Api.GitHub" Version="6.0.0" />
14-
<PackageReference Include="Fake.Core.Environment" Version="6.0.0" />
15-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
16-
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
17-
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" Version="6.0.0" />
18-
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
19-
<PackageReference Include="Fake.DotNet.NuGet" Version="6.0.0" />
20-
<PackageReference Include="Fake.DotNet.Paket" Version="6.0.0" />
21-
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
22-
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
13+
<PackageReference Include="Fake.Api.GitHub" Version="6.1.3" />
14+
<PackageReference Include="Fake.Core.Environment" Version="6.1.3" />
15+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.1.3" />
16+
<PackageReference Include="Fake.Core.Target" Version="6.1.3" />
17+
<PackageReference Include="Fake.DotNet.AssemblyInfoFile" Version="6.1.3" />
18+
<PackageReference Include="Fake.DotNet.Cli" Version="6.1.3" />
19+
<PackageReference Include="Fake.DotNet.NuGet" Version="6.1.3" />
20+
<PackageReference Include="Fake.DotNet.Paket" Version="6.1.3" />
21+
<PackageReference Include="Fake.IO.FileSystem" Version="6.1.3" />
22+
<PackageReference Include="Fake.Tools.Git" Version="6.1.3" />
2323

2424
<!-- So that Fake.DotNet.Nuget.Nuget command can find nuget.exe, but because the nuget dependencies are -->
2525
<!-- downloaded into a shared cache of nuget packages we actually don't get a nuget.exe in our project -->
2626
<!-- so we must later copy the nuget.exe out from this package into our own. -->
2727
<!-- This was not needed when we ran our build using an .fsx file using paket to download dependencies as -->
2828
<!-- paket downloaded these dependencies into a project local folder. -->
29-
<PackageReference Include="NuGet.CommandLine" Version="6.7.1" GeneratePathProperty="true">
29+
<PackageReference Include="NuGet.CommandLine" Version="6.12.1" GeneratePathProperty="true">
3030
<PrivateAssets>all</PrivateAssets>
3131
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3232
</PackageReference>
3333

3434
<!-- See https://github.com/fsprojects/FAKE/issues/2748 -->
35-
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.858" />
35+
<PackageReference Include="MSBuild.StructuredLogger" Version="2.2.386" />
3636
<!-- See https://github.com/fsprojects/FAKE/issues/2722 -->
3737
<!-- 17.3.2 is the last .net6.0 version of the package -->
3838
<PackageReference Include="Microsoft.Build" Version="17.3.2" />

‎src/Generator.Bind/Generator.Bind.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
11+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.2" />
1212
</ItemGroup>
1313

1414
<Import Project="..\..\props\common.props" />

‎src/Generator.Converter/Generator.Convert.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="CommandLineParser" Version="2.7.82" />
11+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
1212
</ItemGroup>
1313

1414
<Import Project="..\..\props\common.props" />

‎src/Generator.Rewrite/Generator.Rewrite.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="CommandLineParser" Version="2.9.1" />
12-
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
12+
<PackageReference Include="Mono.Cecil" Version="0.11.6" />
1313
</ItemGroup>
1414

1515
<Import Project="..\..\props\common.props" />

‎src/OpenAL/OpenTK.Audio.OpenAL/OpenTK.Audio.OpenAL.csproj‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,12 @@
1414
<StartupObject />
1515
</PropertyGroup>
1616

17-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
18-
<DocumentationFile>obj\Release\netstandard2.0\OpenTK.Audio.OpenAL.xml</DocumentationFile>
19-
</PropertyGroup>
20-
2117
<ItemGroup>
2218
<ProjectReference Include="$(OpenTKSolutionRoot)\src\OpenTK.Core\OpenTK.Core.csproj" />
2319
<ProjectReference Include="$(OpenTKSolutionRoot)\src\OpenTK.Mathematics\OpenTK.Mathematics.csproj" />
2420
</ItemGroup>
2521

26-
<ItemGroup>
27-
<PackageReference Include="System.Buffers" Version="4.5.1" />
28-
</ItemGroup>
29-
30-
<ItemGroup>
31-
<Folder Include="Extensions\EXT.Double\Enums\" />
32-
</ItemGroup>
33-
3422
<Import Project="..\..\..\props\common.props" />
3523
<Import Project="$(OpenTKSolutionRoot)\props\nuget-common.props" />
3624
<Import Project="$(OpenTKSolutionRoot)\props\stylecop.props" />
37-
<ItemGroup>
38-
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
39-
</ItemGroup>
4025
</Project>

‎src/OpenAL/OpenTK.OpenAL.Extensions/OpenTK.OpenAL.Extensions.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@
99
<ProjectReference Include="$(OpenTKSolutionRoot)\src\OpenAL\OpenTK.Audio.OpenAL\OpenTK.Audio.OpenAL.csproj" />
1010
</ItemGroup>
1111

12-
<ItemGroup>
13-
<PackageReference Include="System.Buffers" Version="4.5.1" />
14-
</ItemGroup>
15-
1612
<Import Project="..\..\..\props\common.props" />
1713
<Import Project="$(OpenTKSolutionRoot)\props\nuget-common.props" />
1814
<Import Project="$(OpenTKSolutionRoot)\props\stylecop.props" />
19-
<ItemGroup>
20-
<PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
21-
</ItemGroup>
22-
2315
</Project>

‎src/OpenTK.Compute/OpenTK.Compute.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>netcoreapp3.1</TargetFramework>
54
<RootNamespace>OpenTK.Compute</RootNamespace>
65
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
7-
<LangVersion>8</LangVersion>
86
</PropertyGroup>
97

108
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

‎src/OpenTK.Mathematics/OpenTK.Mathematics.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="5.0.0" />
14+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
1515
</ItemGroup>
16+
1617
<Import Project="..\..\props\common.props" />
1718
<Import Project="..\..\props\nuget-common.props" />
1819
<Import Project="..\..\props\stylecop.props" />

0 commit comments

Comments
 (0)