dotnet · Perksey · Oct 27, 2020 · Aug 25, 2020 · Sep 2, 2020 · Oct 4, 2020
diff --git a/.gitignore b/.gitignore
@@ -329,3 +329,144 @@ ASALocalRun/
 
 # MFractors (Xamarin productivity tool) working folder 
 .mfractor/
+
+
+# Created by https://www.toptal.com/developers/gitignore/api/android,java,gradle
+# Edit at https://www.toptal.com/developers/gitignore?templates=android,java,gradle
+
+### Android ###
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+#  Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+
+### Android Patch ###
+gen-external-apklibs
+output.json
+
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+
+### Java ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+### Gradle ###
+.gradle
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.toptal.com/developers/gitignore/api/android,java,gradle
diff --git a/Silk.NET.sln b/Silk.NET.sln
diff --git a/examples/CSharp/Tutorial 1.4 - Textures/Tutorial 1.4 - Textures.csproj b/examples/CSharp/Tutorial 1.4 - Textures/Tutorial 1.4 - Textures.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 1.5 - Transformations/Tutorial 1.5 - Transformations.csproj b/examples/CSharp/Tutorial 1.5 - Transformations/Tutorial 1.5 - Transformations.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 2.1 - Co-ordinate Systems/Tutorial 2.1 - Co-ordinate Systems.csproj b/examples/CSharp/Tutorial 2.1 - Co-ordinate Systems/Tutorial 2.1 - Co-ordinate Systems.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 2.2 - Camera/Tutorial 2.2 - Camera.csproj b/examples/CSharp/Tutorial 2.2 - Camera/Tutorial 2.2 - Camera.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 3.1 - Ambient Lighting/Tutorial 3.1 - Ambient Lighting.csproj b/examples/CSharp/Tutorial 3.1 - Ambient Lighting/Tutorial 3.1 - Ambient Lighting.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 3.2 - Diffuse Lighting/Tutorial 3.2 - Diffuse Lighting.csproj b/examples/CSharp/Tutorial 3.2 - Diffuse Lighting/Tutorial 3.2 - Diffuse Lighting.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 3.3 - Specular Lighting/Tutorial 3.3 - Specular Lighting.csproj b/examples/CSharp/Tutorial 3.3 - Specular Lighting/Tutorial 3.3 - Specular Lighting.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 3.4 - Materials/Tutorial 3.4 - Materials.csproj b/examples/CSharp/Tutorial 3.4 - Materials/Tutorial 3.4 - Materials.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/examples/CSharp/Tutorial 3.5 - Lighting Maps/Tutorial 3.5 - Lighting Maps.csproj b/examples/CSharp/Tutorial 3.5 - Lighting Maps/Tutorial 3.5 - Lighting Maps.csproj
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0003" />
+      <PackageReference Include="SixLabors.ImageSharp" Version="1.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj b/src/Core/Silk.NET.BuildTools/Silk.NET.BuildTools.csproj
@@ -13,12 +13,12 @@
 
     <ItemGroup>
       <PackageReference Include="ClangSharp" Version="10.0.0-beta" />
-      <PackageReference Include="CommandLineParser" Version="2.7.82" />
-      <PackageReference Include="HtmlAgilityPack" Version="1.11.18" />
-      <PackageReference Include="Humanizer.Core" Version="2.7.9" />
-      <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
-      <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.6" />
+      <PackageReference Include="CommandLineParser" Version="2.8.0" />
+      <PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
+      <PackageReference Include="Humanizer.Core" Version="2.8.26" />
+      <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0-3.final" />
+      <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="3.1.8" />
       <PackageReference Include="morelinq" Version="3.3.2" />
       <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>

diff --git a/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs b/src/Core/Silk.NET.Core/Loader/LibraryLoader.cs
@@ -10,6 +10,7 @@
 using System.Runtime.InteropServices;
 #endif
 using System;
+using System.Diagnostics;
 using System.IO;
 
 namespace Silk.NET.Core.Loader
@@ -250,6 +251,8 @@ public IntPtr LoadFunctionPointer(IntPtr handle, string functionName)
                 ThrowSymbolLoading(functionName);
                 return default;
             }
+
+            Debug.WriteLine("Silk.NET loaded: " + functionName);
 
             return ret;
         }

diff --git a/src/Core/Silk.NET.Core/Native/FuncPtr.cs b/src/Core/Silk.NET.Core/Native/FuncPtr.cs
@@ -82,7 +82,7 @@ public FuncPtr(Delegate @delegate)
         {
             var handle = GCHandle.Alloc(@delegate);
             Value = Marshal.GetFunctionPointerForDelegate(@delegate);
-            FuncPtrInternal.Storage.Add(Value, new FuncPtrInternal {Delegate = @delegate, Handle = handle});
+            FuncPtrInternal.Storage[Value] = new FuncPtrInternal {Delegate = @delegate, Handle = handle};
         }
 
         /// <summary>