Reviewed Tests project

- Removed example browsing test. Focusing on examples being built on their own instead. - Removed old .projitems/.shproj from bindings and examples. - Simplified NetCore, NetCoreRT, NetFX tests into one that uses multitarget instead.
2025-04-05 11:19:39 -04:00 · 2019-07-31 17:51:20 +01:00 · 2019-07-31 17:51:20 +01:00 · 0911c3ab88
commit 0911c3ab88
parent 1bb0a35c54
19 changed files with 76 additions and 495 deletions
--- a/Bindings/Raylib.projitems
+++ b/Bindings/Raylib.projitems
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>f660ff67-d70e-4ae0-9080-d922243e9b6e</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Raylib</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Easings.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Physac.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Raygui.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Raylib.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Raymath.cs" />
-  </ItemGroup>
-</Project>
--- a/Bindings/Raylib.shproj
+++ b/Bindings/Raylib.shproj
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>f660ff67-d70e-4ae0-9080-d922243e9b6e</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Raylib.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
--- a/Examples/Examples.projitems
+++ b/Examples/Examples.projitems
@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>36e54e2a-5899-4d4d-9d78-120db1b4c7b2</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Examples</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)audio\audio_module_playing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)audio\audio_music_stream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)audio\audio_raw_stream.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)audio\audio_sound_loading.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_2d_camera.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_3d_camera_first_person.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_3d_camera_free.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_3d_mode.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_3d_picking.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_basic_window.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_color_select.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_drop_files.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_gestures_detection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_input_gamepad.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_input_keys.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_input_mouse.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_mouse_wheel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_random_values.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_storage_values.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_vr_simulator.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)core\core_world_screen.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_billboard.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_box_collisions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_cubicmap.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_geometric_shapes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_heightmap.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_material_pbr.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_mesh_generation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_mesh_picking.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_obj_loading.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_orthographic_projection.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_skybox.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)models\models_yaw_pitch_roll.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)others\bunnymark.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)physac\physics_demo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)physac\physics_friction.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)physac\physics_movement.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)physac\physics_restitution.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)physac\physics_shatter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shaders\shaders_custom_uniform.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shaders\shaders_model_shader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shaders\shaders_postprocessing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shaders\shaders_shapes_textures.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shapes\shapes_basic_shapes.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shapes\shapes_colors_palette.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shapes\shapes_lines_bezier.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shapes\shapes_logo_raylib.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)shapes\shapes_logo_raylib_anim.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Test.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_image_drawing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_image_generation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_image_loading.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_image_processing.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_image_text.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_logo_raylib.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_particles_blending.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_raw_data.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_rectangle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_srcrec_dstrec.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)textures\textures_to_image.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_bmfont_ttf.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_bmfont_unordered.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_font_sdf.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_format_text.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_input_box.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_raylib_fonts.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_sprite_fonts.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_ttf_loading.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)text\text_writing_anim.cs" />
-  </ItemGroup>
-</Project>
--- a/Examples/Examples.shproj
+++ b/Examples/Examples.shproj
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>36e54e2a-5899-4d4d-9d78-120db1b4c7b2</ProjectGuid>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Examples.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>
--- a/Tests/Program.cs
+++ b/Tests/Program.cs
@ -0,0 +1,48 @@
+using Raylib;
+using static Raylib.Raylib;
+
+namespace Tests
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            // Initialization
+            //--------------------------------------------------------------------------------------
+            const int screenWidth = 800;
+            const int screenHeight = 450;
+        
+            InitWindow(screenWidth, screenHeight, "raylib [core] example - basic window");
+        
+            SetTargetFPS(60);               // Set our game to run at 60 frames-per-second
+            //--------------------------------------------------------------------------------------
+        
+            // Main game loop
+            while (!WindowShouldClose())    // Detect window close button or ESC key
+            {
+                // Update
+                //----------------------------------------------------------------------------------
+                // TODO: Update your variables here
+                //----------------------------------------------------------------------------------
+        
+                // Draw
+                //----------------------------------------------------------------------------------
+                BeginDrawing();
+        
+                    ClearBackground(Color.RAYWHITE);
+        
+                    DrawText("Congrats! You created your first window!", 190, 200, 20, Color.LIGHTGRAY);
+        
+                EndDrawing();
+                //----------------------------------------------------------------------------------
+            }
+        
+            // De-Initialization
+            //--------------------------------------------------------------------------------------
+            CloseWindow();        // Close window and OpenGL context
+            //--------------------------------------------------------------------------------------
+        
+            return;
+        }
+    }
+}
--- a/Tests/Test.NetCore/Program.cs
+++ b/Tests/Test.NetCore/Program.cs
@ -1,11 +0,0 @@
-
-namespace Test.NetCore
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Examples.Test.Run(args);
-        }
-    }
-}
--- a/Tests/Test.NetCore/Test.NetCore.csproj
+++ b/Tests/Test.NetCore/Test.NetCore.csproj
@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
-    <Platforms>x64</Platforms>
-    <!-- <StartupObject>Test.NetCore.Program</StartupObject> -->
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <Optimize>false</Optimize>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Prefer32Bit>true</Prefer32Bit>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
-  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
-  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
-  <Target Name="TestTarget" AfterTargets="Build">
-    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
-  </Target>
-</Project>
--- a/Tests/Test.NetCoreRT/Program.cs
+++ b/Tests/Test.NetCoreRT/Program.cs
@ -1,11 +0,0 @@
-
-namespace Test.NetCoreRT
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Examples.Test.Run(args);
-        }
-    }
-}
--- a/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj
+++ b/Tests/Test.NetCoreRT/Test.NetCoreRT.csproj
@ -1,34 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
-    <Platforms>AnyCPU;x64;x86</Platforms>
-    <StartupObject>core_basic_window</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.ILCompiler" Version="1.0.0-alpha-27217-01" />
-  </ItemGroup>
-  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
-  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
-  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
-  <Target Name="TestTarget" AfterTargets="Build">
-    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
-  </Target>
-</Project>
--- a/Tests/Test.NetCoreRT/raylib-cs.ico
+++ b/Tests/Test.NetCoreRT/raylib-cs.ico
--- a/Tests/Test.NetFX/App.config
+++ b/Tests/Test.NetFX/App.config
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>
--- a/Tests/Test.NetFX/Program.cs
+++ b/Tests/Test.NetFX/Program.cs
@ -1,11 +0,0 @@
-
-namespace Test.NetFX
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Examples.Test.Run(args);
-        }
-    }
-}
--- a/Tests/Test.NetFX/Properties/AssemblyInfo.cs
+++ b/Tests/Test.NetFX/Properties/AssemblyInfo.cs
@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Test.NetFX")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Test.NetFX")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("55d7bb37-3dc7-4a33-b21e-4f549ec988b5")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/Tests/Test.NetFX/RayForm.cs
+++ b/Tests/Test.NetFX/RayForm.cs
@ -1,99 +0,0 @@
-using System;
-using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Windows.Forms;
-using Raylib;
-using rl = Raylib.Raylib;
-using Color = Raylib.Color;
-
-namespace Test.NetFX
-{
-    public partial class RayForms : Form
-    {
-        private Panel gamePanel;
-        private bool windowAttached = false;
-
-        #region WinAPI Entry Points
-
-        [DllImport("user32.dll")]
-        private static extern IntPtr SetWindowPos(IntPtr handle, IntPtr handleAfter, int x, int y, int cx, int cy, uint flags);
-        [DllImport("user32.dll")]
-        private static extern IntPtr SetParent(IntPtr child, IntPtr newParent);
-        [DllImport("user32.dll")]
-        private static extern IntPtr ShowWindow(IntPtr handle, int command);
-
-        #endregion
-
-        public RayForms()
-        {
-            Size = new Size(1024, 700);
-            Text = "Rayforms";
-
-            gamePanel = new Panel();
-            gamePanel.Size = new Size(800, 500);
-            gamePanel.Location = new Point(50, 50);
-
-            Button button = new Button();
-            button.Text = "Attach window";
-            button.Size = new Size(150, 20);
-            button.Location = new Point(
-                (Size.Width / 2) - (button.Size.Width / 2),
-                gamePanel.Location.Y + gamePanel.Size.Height + 10
-            );
-            button.Click += new EventHandler(ClickedButton);
-            Controls.Add(button);
-            Controls.Add(gamePanel);
-        }
-
-        private void ClickedButton(object sender, EventArgs e)
-        {
-            if (!windowAttached)
-            {
-                // new Thread(Test).Start();
-                Test();
-            }
-        }
-
-        private void Test()
-        {
-            rl.SetConfigFlags(ConfigFlag.FLAG_WINDOW_UNDECORATED);
-            rl.InitWindow(800, 480, "Rayforms test");
-            rl.SetTargetFPS(60);
-
-            IntPtr winHandle = rl.GetWindowHandle();
-            Invoke(new Action(() =>
-            {
-                SetWindowPos(winHandle, Handle, 0, 0, 0, 0, 0x0401 /*NOSIZE | SHOWWINDOW */);
-                SetParent(winHandle, gamePanel.Handle);
-                ShowWindow(winHandle, 1);
-                windowAttached = true;
-            }));
-
-            while (!rl.WindowShouldClose())    // Detect window close button or ESC key
-            {
-                // Update
-                //----------------------------------------------------------------------------------
-                // TODO: Update your variables here
-                //----------------------------------------------------------------------------------
-
-                // Draw
-                //----------------------------------------------------------------------------------
-                rl.BeginDrawing();
-                rl.ClearBackground(Color.RAYWHITE);
-
-                rl.DrawText("Congrats! You created your first window!", 190, 200, 20, Color.MAROON);
-                rl.DrawText(rl.GetFrameTime().ToString(), 100, 10, 15, Color.MAROON);
-                rl.DrawFPS(10, 10);
-
-                rl.EndDrawing();
-                //----------------------------------------------------------------------------------
-            }
-            rl.CloseWindow();
-        }
-
-        public static void Run()
-        {
-            Application.Run(new RayForms());
-        }
-    }
-}
--- a/Tests/Test.NetFX/Test.NetFX.csproj
+++ b/Tests/Test.NetFX/Test.NetFX.csproj
@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{55D7BB37-3DC7-4A33-B21E-4F549EC988B5}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>Test.NetFX</RootNamespace>
-    <AssemblyName>Test.NetFX</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>raylib-cs.ico</ApplicationIcon>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>Test.NetFX.Program</StartupObject>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="RayForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Memory">
-      <Version>4.5.1</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="raylib-cs.ico" />
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="..\..\Examples\Examples.projitems" Label="Shared" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="AfterBuild">
-    <Copy Condition=" '$(Platform)' == 'x86' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'AnyCPU' " SourceFiles="..\..\Bindings\native\x86\raylib.dll" DestinationFolder="$(TargetDir)" />
-    <Copy Condition=" '$(Platform)' == 'x64' " SourceFiles="..\..\Bindings\native\x64\raylib.dll" DestinationFolder="$(TargetDir)" />
-  </Target>
-  <Import Project="..\..\Bindings\Raylib.projitems" Label="Shared" />
-</Project>
--- a/Tests/Test.NetFX/raylib-cs.ico
+++ b/Tests/Test.NetFX/raylib-cs.ico
--- a/Tests/Tests.MultiTarget.csproj
+++ b/Tests/Tests.MultiTarget.csproj
@ -0,0 +1,28 @@
+<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>
+    <Platforms>AnyCPU;x64;x86</Platforms>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <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)" />
+  </Target>-->
+</Project>
--- a/Tests/Test.NetCoreRT/nuget.config
+++ b/Tests/Test.NetCoreRT/nuget.config
--- a/Tests/Test.NetCore/raylib-cs.ico
+++ b/Tests/Test.NetCore/raylib-cs.ico