From 09fd7c207629ea499ca4eabc1f690849c6d736fb Mon Sep 17 00:00:00 2001
From: Eric Mellino <erme@microsoft.com>
Date: Wed, 6 Sep 2017 19:38:30 -0700
Subject: [PATCH] Fix assembly version, update cimgui.dll location.

* cimgui.dll is now under win-x64, instead of win7-x64. This just makes
  the package more flexible, but should behave the same as before.
---
 Directory.Build.props                        |   1 +
 deps/cimgui/{win7-x64 => win-x64}/cimgui.dll | Bin
 src/ImGui.NET/ImGui.NET.csproj               |   8 ++++----
 3 files changed, 5 insertions(+), 4 deletions(-)
 rename deps/cimgui/{win7-x64 => win-x64}/cimgui.dll (100%)

diff --git a/Directory.Build.props b/Directory.Build.props
index cc50eb2..89dfeb2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,5 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir">
   <PropertyGroup>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
     <BinDir>$(RepositoryRootDirectory)bin</BinDir>
     <OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\$(MSBuildProjectName)</OutputPath>
diff --git a/deps/cimgui/win7-x64/cimgui.dll b/deps/cimgui/win-x64/cimgui.dll
similarity index 100%
rename from deps/cimgui/win7-x64/cimgui.dll
rename to deps/cimgui/win-x64/cimgui.dll
diff --git a/src/ImGui.NET/ImGui.NET.csproj b/src/ImGui.NET/ImGui.NET.csproj
index 0b93aba..223a3eb 100644
--- a/src/ImGui.NET/ImGui.NET.csproj
+++ b/src/ImGui.NET/ImGui.NET.csproj
@@ -1,18 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>A .NET wrapper for the dear ImGui library.</Description>
-    <VersionPrefix>0.3.0</VersionPrefix>
+    <AssemblyVersion>0.3.0</AssemblyVersion>
     <Authors>Eric Mellino</Authors>
     <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>portable</DebugType>
     <AssemblyName>ImGui.NET</AssemblyName>
     <PackageId>ImGui.NET</PackageId>
+    <PackageVersion>$(AssemblyVersion)</PackageVersion>
     <PackageTags>ImGui ImGui.NET Immediate Mode GUI</PackageTags>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
@@ -24,8 +24,8 @@
     <PackageReference Include="System.Buffers" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll">
-      <PackagePath>runtimes/win7-x64/native</PackagePath>
+    <Content Include="..\..\deps\cimgui\win-x64\cimgui.dll">
+      <PackagePath>runtimes/win-x64/native</PackagePath>
       <Pack>true</Pack>
     </Content>
     <Content Include="..\..\deps\cimgui\ubuntu.14.04-x64\cimgui.so">