From 026ac1eb89ba4d202deeaae71bcff3671cba8e2b Mon Sep 17 00:00:00 2001
From: Eric Mellino <erme@microsoft.com>
Date: Fri, 24 Jun 2016 14:42:02 -0700
Subject: [PATCH] Update corebuild submodule

---
 corebuild                                              |  2 +-
 .../ImGui.NET.SampleProgram.csproj                     | 10 +++++++---
 src/ImGui.NET.SampleProgram/SampleWindow.cs            |  1 +
 src/ImGui.NET.SampleProgram/project.json               |  6 ++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/corebuild b/corebuild
index ac59741..8d6d63f 160000
--- a/corebuild
+++ b/corebuild
@@ -1 +1 @@
-Subproject commit ac59741e0732b5387c06a348e804938f234c72e0
+Subproject commit 8d6d63f9fa00ee984edb64907bb41bce78a7d970
diff --git a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
index 108056b..d21c348 100644
--- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
+++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
@@ -34,10 +34,14 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll">
+    <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll" Condition="'$(OSTarget)' == 'Windows'">
       <Link>cimgui.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-  </ItemGroup>
+    <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>
\ No newline at end of file
+</Project>
diff --git a/src/ImGui.NET.SampleProgram/SampleWindow.cs b/src/ImGui.NET.SampleProgram/SampleWindow.cs
index 2991c42..a968fa6 100644
--- a/src/ImGui.NET.SampleProgram/SampleWindow.cs
+++ b/src/ImGui.NET.SampleProgram/SampleWindow.cs
@@ -41,6 +41,7 @@ namespace ImGuiNET
             ((IGraphicsContextInternal)_graphicsContext).LoadAll(); // wtf is this?
             GL.ClearColor(Color.Black);
             _nativeWindow.Visible = true;
+            _nativeWindow.X = _nativeWindow.X; // Work around OpenTK bug (?) on Ubuntu.
 
             _nativeWindow.KeyDown += OnKeyDown;
             _nativeWindow.KeyUp += OnKeyUp;
diff --git a/src/ImGui.NET.SampleProgram/project.json b/src/ImGui.NET.SampleProgram/project.json
index 949ad29..59ac5f3 100644
--- a/src/ImGui.NET.SampleProgram/project.json
+++ b/src/ImGui.NET.SampleProgram/project.json
@@ -6,12 +6,10 @@
   },
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "type": "platform",
       "version": "1.0.0"
     },
     "ImGui.NET": { "target": "project" },
-    "OpenTK.NETCore": "1.1.2364.6424",
-    "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027"
+    "OpenTK.NETCore": "1.1.2364.6424"
   },
   "frameworks": {
     "netcoreapp1.0": {}
@@ -24,4 +22,4 @@
     "cimgui.dll",
     "cimgui.so"
   ]
-}
\ No newline at end of file
+}