From 4fcca221137e7bf273e8bae344c515f8c9743e54 Mon Sep 17 00:00:00 2001
From: Eric Mellino <erme@microsoft.com>
Date: Mon, 23 Jan 2017 14:48:40 -0800
Subject: [PATCH] Convert this to use the new-new dotnet build stuff

---
 global.json                                   |   3 -
 src/ImGui.NET.SampleProgram.Net46/App.config  |   6 -
 .../ImGui.NET.SampleProgram.Net46.csproj      |  52 -----
 .../packages.config                           |   4 -
 .../ImGui.NET.SampleProgram.csproj            |  51 ++---
 src/ImGui.NET.SampleProgram/project.json      |  25 ---
 src/ImGui.NET.sln                             | 178 +++---------------
 src/ImGui.NET/ImGui.NET.Net46.csproj          |  53 ------
 src/ImGui.NET/ImGui.NET.csproj                |  62 ++----
 src/ImGui.NET/project.json                    |  33 ----
 src/imgui.net.dotnet.sln                      |  28 ---
 11 files changed, 59 insertions(+), 436 deletions(-)
 delete mode 100644 global.json
 delete mode 100644 src/ImGui.NET.SampleProgram.Net46/App.config
 delete mode 100644 src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
 delete mode 100644 src/ImGui.NET.SampleProgram.Net46/packages.config
 delete mode 100644 src/ImGui.NET.SampleProgram/project.json
 delete mode 100644 src/ImGui.NET/ImGui.NET.Net46.csproj
 delete mode 100644 src/ImGui.NET/project.json
 delete mode 100644 src/imgui.net.dotnet.sln

diff --git a/global.json b/global.json
deleted file mode 100644
index b0323e4..0000000
--- a/global.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "projects": [ "src" ]
-}
\ No newline at end of file
diff --git a/src/ImGui.NET.SampleProgram.Net46/App.config b/src/ImGui.NET.SampleProgram.Net46/App.config
deleted file mode 100644
index 8324aa6..0000000
--- a/src/ImGui.NET.SampleProgram.Net46/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-    </startup>
-</configuration>
\ No newline at end of file
diff --git a/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj b/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
deleted file mode 100644
index 7b86864..0000000
--- a/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{47EF850E-D555-49E7-814B-68372123CB25}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ImGuiNET</RootNamespace>
-    <AssemblyName>SampleGUIProgram</AssemblyName>
-    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
-    <PlatformTarget>x64</PlatformTarget>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="..\ImGui.NET.SampleProgram\Program.cs" />
-    <Compile Include="..\ImGui.NET.SampleProgram\SampleWindow.cs" />
-    <Compile Include="..\ImGui.NET.SampleProgram\MemoryEditor.cs" />    
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' " />
-  <ItemGroup>
-    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenTK.1.1.1589.5942\lib\NET40\OpenTK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="../ImGui.NET/ImGui.NET.Net46.csproj">
-      <Name>ImGUI.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll">
-      <Link>cimgui.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/ImGui.NET.SampleProgram.Net46/packages.config b/src/ImGui.NET.SampleProgram.Net46/packages.config
deleted file mode 100644
index aa4b6bb..0000000
--- a/src/ImGui.NET.SampleProgram.Net46/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="OpenTK" version="1.1.1589.5942" targetFramework="net46" />
-</packages>
\ No newline at end of file
diff --git a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
index 6aab350..f712f53 100644
--- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
+++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
@@ -1,48 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition="'$(Configuration)' == '' And '$(OS)' != 'Windows_NT'">Ubuntu_Debug</Configuration>
-    <Configuration Condition="'$(Configuration)' == ''">Windows_Debug</Configuration>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <ProjectGuid>{AE9BC745-284F-42F3-8236-C43F00000000}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>ImGuiNET</RootNamespace>
-    <AssemblyName>SampleGUIProgram</AssemblyName>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetTargetMoniker>.NETCoreApp,Version=v1.0</NuGetTargetMoniker>
-    <BaseNuGetRuntimeIdentifier Condition="'$(OSTarget)' == 'Windows_NT'">win7</BaseNuGetRuntimeIdentifier>
+    <DebugType>portable</DebugType>
+    <AssemblyName>ImGui.NET.SampleProgram</AssemblyName>
+    <OutputType>Exe</OutputType>
+    <RuntimeIdentifiers>win7-x64;ubuntu.14.04-x64</RuntimeIdentifiers>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="MemoryEditor.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="SampleWindow.cs" />
+    <None Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Link="cimgui.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Debug|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Windows_Release|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ubuntu_Debug|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Ubuntu_Release|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Debug|x64' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'OSX_Release|x64' " />
   <ItemGroup>
-    <None Include="project.json" />
+    <ProjectReference Include="..\ImGui.NET\ImGui.NET.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="../ImGui.NET/ImGui.NET.csproj">
-      <Name>ImGUI.NET</Name>
-    </ProjectReference>
+    <PackageReference Include="OpenTK.NETCore" Version="1.1.2364.6424" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Condition="'$(OSTarget)' == 'Windows_NT'">
-      <Link>cimgui.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="..\..\deps\cimgui\ubuntu14.04-x64\cimgui.so" Condition="'$(OSTarget)' == 'Ubuntu'">
-      <Link>cimgui.so</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/ImGui.NET.SampleProgram/project.json b/src/ImGui.NET.SampleProgram/project.json
deleted file mode 100644
index 59ac5f3..0000000
--- a/src/ImGui.NET.SampleProgram/project.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "buildOptions": {
-    "allowUnsafe": true,
-    "emitEntryPoint": true,
-    "debugType": "portable"
-  },
-  "dependencies": {
-    "Microsoft.NETCore.App": {
-      "version": "1.0.0"
-    },
-    "ImGui.NET": { "target": "project" },
-    "OpenTK.NETCore": "1.1.2364.6424"
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  },
-  "runtimes": {
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {}
-  },
-  "content": [
-    "cimgui.dll",
-    "cimgui.so"
-  ]
-}
diff --git a/src/ImGui.NET.sln b/src/ImGui.NET.sln
index 95ad04f..c5fa0bd 100644
--- a/src/ImGui.NET.sln
+++ b/src/ImGui.NET.sln
@@ -1,164 +1,46 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26120.4
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET.SampleProgram", "ImGui.NET.SampleProgram\ImGui.NET.SampleProgram.csproj", "{AE9BC745-284F-42F3-8236-C43F00000000}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET", "ImGui.NET\ImGui.NET.csproj", "{BD7ACEC1-4B57-491F-833A-8542FB824F84}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET", "ImGui.NET\ImGui.NET.csproj", "{2665014F-0FEC-4268-8F77-7B029921AB09}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET.Net46", "ImGui.NET\ImGui.NET.Net46.csproj", "{576DC8D0-57D6-499B-A8B1-3B43808B63A6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImGui.NET.SampleProgram.Net46", "ImGui.NET.SampleProgram.Net46\ImGui.NET.SampleProgram.Net46.csproj", "{47EF850E-D555-49E7-814B-68372123CB25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImGui.NET.SampleProgram", "ImGui.NET.SampleProgram\ImGui.NET.SampleProgram.csproj", "{79FCECB1-6190-41CF-BAF5-2D0906A59F02}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|x64 = Debug|x64
-		OSX_Debug|Any CPU = OSX_Debug|Any CPU
-		OSX_Debug|x64 = OSX_Debug|x64
-		OSX_Release|Any CPU = OSX_Release|Any CPU
-		OSX_Release|x64 = OSX_Release|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
 		Release|x64 = Release|x64
-		Ubuntu_Debug|Any CPU = Ubuntu_Debug|Any CPU
-		Ubuntu_Debug|x64 = Ubuntu_Debug|x64
-		Ubuntu_Release|Any CPU = Ubuntu_Release|Any CPU
-		Ubuntu_Release|x64 = Ubuntu_Release|x64
-		Windows_Debug|Any CPU = Windows_Debug|Any CPU
-		Windows_Debug|x64 = Windows_Debug|x64
-		Windows_Release|Any CPU = Windows_Release|Any CPU
-		Windows_Release|x64 = Windows_Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Debug|Any CPU.ActiveCfg = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Debug|Any CPU.Build.0 = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Debug|x64.ActiveCfg = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Debug|x64.Build.0 = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Debug|Any CPU.ActiveCfg = OSX_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Debug|Any CPU.Build.0 = OSX_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Debug|x64.ActiveCfg = OSX_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Debug|x64.Build.0 = OSX_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Release|Any CPU.ActiveCfg = OSX_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Release|Any CPU.Build.0 = OSX_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Release|x64.ActiveCfg = OSX_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.OSX_Release|x64.Build.0 = OSX_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Release|Any CPU.ActiveCfg = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Release|Any CPU.Build.0 = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Release|x64.ActiveCfg = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Release|x64.Build.0 = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Debug|Any CPU.ActiveCfg = Ubuntu_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Debug|Any CPU.Build.0 = Ubuntu_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Debug|x64.ActiveCfg = Ubuntu_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Debug|x64.Build.0 = Ubuntu_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Release|Any CPU.ActiveCfg = Ubuntu_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Release|Any CPU.Build.0 = Ubuntu_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Release|x64.ActiveCfg = Ubuntu_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Ubuntu_Release|x64.Build.0 = Ubuntu_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Debug|Any CPU.ActiveCfg = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Debug|Any CPU.Build.0 = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Debug|x64.ActiveCfg = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Debug|x64.Build.0 = Windows_Debug|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Release|Any CPU.ActiveCfg = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Release|Any CPU.Build.0 = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Release|x64.ActiveCfg = Windows_Release|x64
-		{AE9BC745-284F-42F3-8236-C43F00000000}.Windows_Release|x64.Build.0 = Windows_Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Debug|x64.ActiveCfg = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Debug|x64.Build.0 = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Debug|x64.ActiveCfg = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Debug|x64.Build.0 = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Release|x64.ActiveCfg = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.OSX_Release|x64.Build.0 = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Release|x64.ActiveCfg = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Release|x64.Build.0 = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Debug|x64.ActiveCfg = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Debug|x64.Build.0 = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Release|x64.ActiveCfg = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Ubuntu_Release|x64.Build.0 = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Debug|x64.ActiveCfg = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Debug|x64.Build.0 = Debug|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Release|x64.ActiveCfg = Release|x64
-		{2665014F-0FEC-4268-8F77-7B029921AB09}.Windows_Release|x64.Build.0 = Release|x64
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Debug|x64.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Debug|x64.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Debug|x64.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Release|Any CPU.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Release|x64.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.OSX_Release|x64.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Release|x64.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Release|x64.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Debug|x64.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Debug|x64.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Release|Any CPU.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Release|x64.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Ubuntu_Release|x64.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Debug|Any CPU.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Debug|x64.ActiveCfg = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Debug|x64.Build.0 = Debug|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Release|Any CPU.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Release|Any CPU.Build.0 = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Release|x64.ActiveCfg = Release|Any CPU
-		{576DC8D0-57D6-499B-A8B1-3B43808B63A6}.Windows_Release|x64.Build.0 = Release|Any CPU
-		{47EF850E-D555-49E7-814B-68372123CB25}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Debug|Any CPU.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Debug|x64.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Debug|x64.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Debug|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Debug|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Debug|x64.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Debug|x64.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Release|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Release|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Release|x64.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.OSX_Release|x64.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Release|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Release|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Release|x64.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Release|x64.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Debug|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Debug|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Debug|x64.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Debug|x64.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Release|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Release|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Release|x64.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Ubuntu_Release|x64.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Debug|Any CPU.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Debug|Any CPU.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Debug|x64.ActiveCfg = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Debug|x64.Build.0 = Debug|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Release|Any CPU.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Release|Any CPU.Build.0 = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Release|x64.ActiveCfg = Release|x64
-		{47EF850E-D555-49E7-814B-68372123CB25}.Windows_Release|x64.Build.0 = Release|x64
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x64.ActiveCfg = Debug|x64
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x64.Build.0 = Debug|x64
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x86.ActiveCfg = Debug|x86
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Debug|x86.Build.0 = Debug|x86
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x64.ActiveCfg = Release|x64
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x64.Build.0 = Release|x64
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x86.ActiveCfg = Release|x86
+		{BD7ACEC1-4B57-491F-833A-8542FB824F84}.Release|x86.Build.0 = Release|x86
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x64.ActiveCfg = Debug|x64
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x64.Build.0 = Debug|x64
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x86.ActiveCfg = Debug|x86
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Debug|x86.Build.0 = Debug|x86
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x64.ActiveCfg = Release|x64
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x64.Build.0 = Release|x64
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x86.ActiveCfg = Release|x86
+		{79FCECB1-6190-41CF-BAF5-2D0906A59F02}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/ImGui.NET/ImGui.NET.Net46.csproj b/src/ImGui.NET/ImGui.NET.Net46.csproj
deleted file mode 100644
index b3d3970..0000000
--- a/src/ImGui.NET/ImGui.NET.Net46.csproj
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <ProjectGuid>{576DC8D0-57D6-499B-A8B1-3B43808B63A6}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ImGui</RootNamespace>
-    <AssemblyName>ImGui.NET</AssemblyName>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <ResolveNuGetPackages>false</ResolveNuGetPackages>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Align.cs" />
-    <Compile Include="ColorTarget.cs" />
-    <Compile Include="TreeNodeFlags.cs" />
-    <Compile Include="IntStructs.cs" />
-    <Compile Include="MouseCursorKind.cs" />
-    <Compile Include="NativeIO.cs" />
-    <Compile Include="SelectableFlags.cs" />
-    <Compile Include="StyleVar.cs" />
-    <Compile Include="Style.cs" />
-    <Compile Include="WindowFlags.cs" />
-    <Compile Include="ColorEditMode.cs" />
-    <Compile Include="GuiKey.cs" />
-    <Compile Include="DrawCmd.cs" />
-    <Compile Include="DrawData.cs" />
-    <Compile Include="DrawList.cs" />
-    <Compile Include="DrawVert.cs" />
-    <Compile Include="Font.cs" />
-    <Compile Include="FontAtlas.cs" />
-    <Compile Include="FontConfig.cs" />
-    <Compile Include="ImGui.cs" />
-    <Compile Include="IO.cs" />
-    <Compile Include="Storage.cs" />
-    <Compile Include="NativeStyle.cs" />
-    <Compile Include="ImVector.cs" />
-    <Compile Include="InputTextFlags.cs" />
-    <Compile Include="ImGuiNative.cs" />
-    <Compile Include="SetCondition.cs" />
-    <Compile Include="TextEditCallback.cs" />
-    <Compile Include="TextEditCallbackData.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Numerics" />
-  </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj
index 288d36e..c17f32c 100644
--- a/src/ImGui.NET/ImGui.NET.csproj
+++ b/src/ImGui.NET/ImGui.NET.csproj
@@ -1,51 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
-    <ProjectGuid>{2665014F-0FEC-4268-8F77-7B029921AB09}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>ImGuiNET</RootNamespace>
-    <AssemblyName>ImGui.NET</AssemblyName>
+    <Description>A .NET wrapper for the dear ImGui library.</Description>
+    <VersionPrefix>0.1.5</VersionPrefix>
+    <Authors>Eric Mellino</Authors>
+    <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <NuGetTargetMoniker>.NETStandard,Version=v1.1</NuGetTargetMoniker>
+    <DebugType>portable</DebugType>
+    <AssemblyName>ImGui.NET</AssemblyName>
+    <PackageId>ImGui.NET</PackageId>
+    <PackageTags>ImGui ImGui.NET Immediate Mode GUI</PackageTags>
+    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+    <PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl>
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Align.cs" />
-    <Compile Include="ColorTarget.cs" />
-    <Compile Include="TreeNodeFlags.cs" />
-    <Compile Include="IntStructs.cs" />
-    <Compile Include="MouseCursorKind.cs" />
-    <Compile Include="NativeIO.cs" />
-    <Compile Include="SelectableFlags.cs" />
-    <Compile Include="StyleVar.cs" />
-    <Compile Include="Style.cs" />
-    <Compile Include="TextInputBuffer.cs" />
-    <Compile Include="WindowFlags.cs" />
-    <Compile Include="ColorEditMode.cs" />
-    <Compile Include="GuiKey.cs" />
-    <Compile Include="DrawCmd.cs" />
-    <Compile Include="DrawData.cs" />
-    <Compile Include="DrawList.cs" />
-    <Compile Include="DrawVert.cs" />
-    <Compile Include="Font.cs" />
-    <Compile Include="FontAtlas.cs" />
-    <Compile Include="FontConfig.cs" />
-    <Compile Include="ImGui.cs" />
-    <Compile Include="IO.cs" />
-    <Compile Include="Storage.cs" />
-    <Compile Include="NativeStyle.cs" />
-    <Compile Include="ImVector.cs" />
-    <Compile Include="InputTextFlags.cs" />
-    <Compile Include="ImGuiNative.cs" />
-    <Compile Include="SetCondition.cs" />
-    <Compile Include="TextEditCallback.cs" />
-    <Compile Include="TextEditCallbackData.cs" />
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
-  <ItemGroup>
-    <None Include="project.json" />
+    <PackageReference Include="System.Diagnostics.Debug" Version="4.0.11" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.1.1" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.0.0" />
+    <PackageReference Include="System.Runtime.Extensions" Version="4.1.0" />
+    <PackageReference Include="System.Runtime.InteropServices" Version="4.1.0" />
   </ItemGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/ImGui.NET/project.json b/src/ImGui.NET/project.json
deleted file mode 100644
index 6528cd7..0000000
--- a/src/ImGui.NET/project.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "version": "0.1.5-*",
-  "description": "A .NET wrapper for the dear ImGui library.",
-  "projectUrl": "https://github.com/mellinoe/imgui.net",
-  "authors": [
-    "Eric Mellino"
-  ],
-  "packOptions": {
-    "tags": [
-      "ImGui ImGui.NET Immediate Mode GUI"
-    ]
-  },
-  "buildOptions": {
-    "allowUnsafe": true,
-    "debugType": "portable"
-  },
-  "dependencies": {
-    "System.Diagnostics.Debug": "4.0.11",
-    "System.Numerics.Vectors": "4.1.1",
-    "System.Runtime.CompilerServices.Unsafe": "4.0.0",
-    "System.Runtime.Extensions": "4.1.0",
-    "System.Runtime.InteropServices": "4.1.0"
-  },
-  "frameworks": {
-    "netstandard1.1": {}
-  },
-  "packInclude": {
-    "runtimes/osx.10.10-x64/native/": "../../deps/cimgui/osx.10.10-x64/cimgui.dylib",
-    "runtimes/win7-x64/native/": "../../deps/cimgui/win7-x64/cimgui.dll",
-    "runtimes/ubuntu.14.04-x64/native/": "../../deps/cimgui/ubuntu.14.04-x64/cimgui.so",
-    "runtimes/ubuntu.15.04-x64/native/": "../../deps/cimgui/ubuntu.14.04-x64/cimgui.so"
-  }
-}
diff --git a/src/imgui.net.dotnet.sln b/src/imgui.net.dotnet.sln
deleted file mode 100644
index c1d49ef..0000000
--- a/src/imgui.net.dotnet.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImGui.NET", "D:\OSS\imgui.net\src\ImGui.NET\ImGui.NET.xproj", "{96D9B05A-94DA-426D-AE09-DC5346F834CB}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ImGui.NET.SampleProgram", "D:\OSS\imgui.net\src\ImGui.NET.SampleProgram\ImGui.NET.SampleProgram.xproj", "{8C3965D6-CC79-450B-BA6F-7B5F57B90AA7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{96D9B05A-94DA-426D-AE09-DC5346F834CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{96D9B05A-94DA-426D-AE09-DC5346F834CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{96D9B05A-94DA-426D-AE09-DC5346F834CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{96D9B05A-94DA-426D-AE09-DC5346F834CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8C3965D6-CC79-450B-BA6F-7B5F57B90AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8C3965D6-CC79-450B-BA6F-7B5F57B90AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8C3965D6-CC79-450B-BA6F-7B5F57B90AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8C3965D6-CC79-450B-BA6F-7B5F57B90AA7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal