copygirl
/
ImGui.NET
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assembly version, update cimgui.dll location.

Browse Source 
* 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.
internals
Eric Mellino 7 years ago
parent bd1e12c39f
commit 09fd7c2076
3 changed files with 5 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Directory.Build.props
  2. 0
      deps/cimgui/win-x64/cimgui.dll
  3. 8
      src/ImGui.NET/ImGui.NET.csproj

1
Directory.Build.props
Unescape View File

@ -1,5 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir">
<PropertyGroup> <PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory> <RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
<BinDir>$(RepositoryRootDirectory)bin</BinDir> <BinDir>$(RepositoryRootDirectory)bin</BinDir>
<OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\$(MSBuildProjectName)</OutputPath> <OutputPath>$([System.IO.Path]::GetFullPath('$(RepositoryRootDirectory)bin\$(Configuration)'))\$(MSBuildProjectName)</OutputPath>

0
deps/cimgui/win7-x64/cimgui.dll → deps/cimgui/win-x64/cimgui.dll vendored
Unescape View File

8
src/ImGui.NET/ImGui.NET.csproj
Unescape View File

@ -1,18 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<Description>A .NET wrapper for the dear ImGui library.</Description> <Description>A .NET wrapper for the dear ImGui library.</Description>
<VersionPrefix>0.3.0</VersionPrefix> <AssemblyVersion>0.3.0</AssemblyVersion>
<Authors>Eric Mellino</Authors> <Authors>Eric Mellino</Authors>
<TargetFramework>netstandard1.1</TargetFramework> <TargetFramework>netstandard1.1</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<DebugType>portable</DebugType> <DebugType>portable</DebugType>
<AssemblyName>ImGui.NET</AssemblyName> <AssemblyName>ImGui.NET</AssemblyName>
<PackageId>ImGui.NET</PackageId> <PackageId>ImGui.NET</PackageId>
<PackageVersion>$(AssemblyVersion)</PackageVersion>
<PackageTags>ImGui ImGui.NET Immediate Mode GUI</PackageTags> <PackageTags>ImGui ImGui.NET Immediate Mode GUI</PackageTags>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl> <PackageProjectUrl>https://github.com/mellinoe/imgui.net</PackageProjectUrl>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences> <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile> <DocumentationFile Condition="'$(Configuration)' == 'Release'">$(OutputPath)\ImGui.NET.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -24,8 +24,8 @@
<PackageReference Include="System.Buffers" Version="4.3.0" /> <PackageReference Include="System.Buffers" Version="4.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="..\..\deps\cimgui\win7-x64\cimgui.dll"> <Content Include="..\..\deps\cimgui\win-x64\cimgui.dll">
<PackagePath>runtimes/win7-x64/native</PackagePath> <PackagePath>runtimes/win-x64/native</PackagePath>
<Pack>true</Pack> <Pack>true</Pack>
</Content> </Content>
<Content Include="..\..\deps\cimgui\ubuntu.14.04-x64\cimgui.so"> <Content Include="..\..\deps\cimgui\ubuntu.14.04-x64\cimgui.so">

Write Preview
Loading…
Cancel
Save