diff --git a/LICENSE b/LICENSE.md
similarity index 100%
rename from LICENSE
rename to LICENSE.md
diff --git a/Raylib-cs.sln b/Raylib-cs.sln
index 6af0abd..fa4ba62 100644
--- a/Raylib-cs.sln
+++ b/Raylib-cs.sln
@@ -3,25 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27703.2035
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Examples", "Examples\Examples.shproj", "{36E54E2A-5899-4D4D-9D78-120DB1B4C7B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generator\Generator.csproj", "{5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Generator", "Generator\Generator.csproj", "{5B690E7B-6D8C-4AA8-92AE-A3BF0750B573}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.NetCore", "Tests\Test.NetCore\Test.NetCore.csproj", "{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.NetCoreRT", "Tests\Test.NetCoreRT\Test.NetCoreRT.csproj", "{B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.NetFX", "Tests\Test.NetFX\Test.NetFX.csproj", "{55D7BB37-3DC7-4A33-B21E-4F549EC988B5}"
-EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Raylib", "Bindings\Raylib.shproj", "{F660FF67-D70E-4AE0-9080-D922243E9B6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.MultiTarget.csproj", "{523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}"
EndProject
Global
- GlobalSection(SharedMSBuildProjectFiles) = preSolution
- Examples\Examples.projitems*{36e54e2a-5899-4d4d-9d78-120db1b4c7b2}*SharedItemsImports = 13
- Bindings\Raylib.projitems*{55d7bb37-3dc7-4a33-b21e-4f549ec988b5}*SharedItemsImports = 4
- Examples\Examples.projitems*{55d7bb37-3dc7-4a33-b21e-4f549ec988b5}*SharedItemsImports = 4
- Bindings\Raylib.projitems*{f660ff67-d70e-4ae0-9080-d922243e9b6e}*SharedItemsImports = 13
- EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
@@ -43,38 +29,18 @@ Global
{5B690E7B-6D8C-4AA8-92AE-A3BF0750B573}.Release|x64.Build.0 = Release|Any CPU
{5B690E7B-6D8C-4AA8-92AE-A3BF0750B573}.Release|x86.ActiveCfg = Release|Any CPU
{5B690E7B-6D8C-4AA8-92AE-A3BF0750B573}.Release|x86.Build.0 = Release|Any CPU
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|Any CPU.ActiveCfg = Debug|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|x64.ActiveCfg = Debug|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|x64.Build.0 = Debug|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Debug|x86.ActiveCfg = Debug|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|Any CPU.ActiveCfg = Release|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|x64.ActiveCfg = Release|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|x64.Build.0 = Release|x64
- {523DEE6A-20CD-47AB-94A6-8D3C3CF9ADAD}.Release|x86.ActiveCfg = Release|x64
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|x64.ActiveCfg = Debug|x64
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|x64.Build.0 = Debug|x64
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|x86.ActiveCfg = Debug|x86
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Debug|x86.Build.0 = Debug|x86
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|Any CPU.Build.0 = Release|Any CPU
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|x64.ActiveCfg = Release|x64
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|x64.Build.0 = Release|x64
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|x86.ActiveCfg = Release|x86
- {B0CA8E8E-499A-4BF2-9A2E-4A8BCED92101}.Release|x86.Build.0 = Release|x86
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|x64.ActiveCfg = Debug|x64
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|x64.Build.0 = Debug|x64
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|x86.ActiveCfg = Debug|x86
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Debug|x86.Build.0 = Debug|x86
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|Any CPU.Build.0 = Release|Any CPU
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|x64.ActiveCfg = Release|x64
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|x64.Build.0 = Release|x64
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|x86.ActiveCfg = Release|x86
- {55D7BB37-3DC7-4A33-B21E-4F549EC988B5}.Release|x86.Build.0 = Release|x86
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|Any CPU.ActiveCfg = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|Any CPU.Build.0 = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|x64.ActiveCfg = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|x64.Build.0 = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|x86.ActiveCfg = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Debug|x86.Build.0 = Debug|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|Any CPU.ActiveCfg = Release|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|Any CPU.Build.0 = Release|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|x64.ActiveCfg = Release|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|x64.Build.0 = Release|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|x86.ActiveCfg = Release|x64
+ {5A7FD12F-FCF7-4F2B-8D44-3888BF4C4166}.Release|x86.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Tests/Tests.MultiTarget.csproj b/Tests/Tests.MultiTarget.csproj
index 9988494..6e1bbae 100644
--- a/Tests/Tests.MultiTarget.csproj
+++ b/Tests/Tests.MultiTarget.csproj
@@ -1,12 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFrameworks>net40;net45;net46;net461;net462;netcoreapp2.1</TargetFrameworks>
- </PropertyGroup>
-
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp2.1</TargetFramework>
- <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
+ <TargetFrameworks>net40;net45;net46;net461;net462;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+ <ApplicationIcon>../Logo/raylib-cs.ico</ApplicationIcon>
<Platforms>AnyCPU;x64;x86</Platforms>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>
@@ -14,15 +10,11 @@
<ItemGroup>
<Compile Include="../Bindings/*.cs" />
</ItemGroup>
-
- <ItemGroup>
- <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-27217-01" />
- </ItemGroup>
-
+
<!-- Option to copy native lib to output folder -->
<!--<Target Name="TestTarget" AfterTargets="Build">
- <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
- <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
- <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
+ <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="../../libs\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+ <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="../../libs\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
+ <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="../../libs\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
</Target>-->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Tests/raylib-cs.ico b/Tests/raylib-cs.ico
deleted file mode 100644
index 296d5dd..0000000
Binary files a/Tests/raylib-cs.ico and /dev/null differ