Small changes to the build process, no functional diff

10 years ago · 8a14ca6bb3
parent 14a6fc2172
commit 8a14ca6bb3
11 changed files with 80 additions and 68 deletions
--- a/build/corebuild.props
+++ b/build/corebuild.props
@ -1,63 +1,59 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- Import Microsoft.Common.Props -->
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-
-  <!-- Project targeting defaults -->
-  <PropertyGroup>
-    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">v5.0</TargetFrameworkVersion>
-  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)/Microsoft.Common.props')" />

  <!-- Common repo directories -->
  <PropertyGroup>
-    <ProjectDir>$(MSBuildThisFileDirectory)..\</ProjectDir>
+    <ProjectDir>$(MSBuildThisFileDirectory)../</ProjectDir>
    <SourceDir>$(ProjectDir)src/</SourceDir>
-    <DepsDir>$(ProjectDir)deps\</DepsDir>
  </PropertyGroup>

-    <!-- Set default Configuration and Platform -->
+  <!-- Set Configuration and Platform Defaults -->
  <PropertyGroup>
+    <DefaultNuGetRuntimeIdentifier>win10</DefaultNuGetRuntimeIdentifier>
+
    <Platform Condition="'$(Platform)'=='' and '$(OutputType)' == 'Exe'">x64</Platform>
    <Platform Condition="'$(Platform)'==''">AnyCPU</Platform>
-
    <Configuration Condition="'$(Configuration)'=='' and '$(OutputType)' == 'Exe'">Windows_Debug</Configuration>
    <Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
-    <ConfigurationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</ConfigurationGroup>
-    <ConfigurationGroup Condition="$(Configuration.EndsWith('Release'))">Release</ConfigurationGroup>
-    <ConfigurationGroup Condition="'$(ConfigurationGroup)'==''">$(Configuration)</ConfigurationGroup>
+    <OptimizationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</OptimizationGroup>
+    <OptimizationGroup Condition="$(Configuration.EndsWith('Release'))">Release</OptimizationGroup>
+    <OptimizationGroup Condition="'$(OptimizationGroup)'==''">Debug</OptimizationGroup>

-    <TargetsWindows Condition="$(Configuration.StartsWith('Windows'))">true</TargetsWindows>
+    <!-- Platform Helper Properties -->
+    <TargetsWindows>true</TargetsWindows>
    <TargetsUbuntu Condition="$(Configuration.StartsWith('Ubuntu'))">true</TargetsUbuntu>
    <TargetsOSX Condition="$(Configuration.StartsWith('OSX'))">true</TargetsOSX>
+
+    <OSTarget Condition="'$(TargetsWindows)' == 'true'">Windows</OSTarget>
+    <OSTarget Condition="'$(TargetsUbuntu)' == 'true'">Ubuntu</OSTarget>
+    <OSTarget Condition="'$(TargetsOSX)' == 'true'">OSX</OSTarget>
  </PropertyGroup>

-  <!-- Set up Default symbol and optimization for Configuration -->
-  <PropertyGroup Condition="'$(ConfigurationGroup)' == 'Debug'">
+  <!-- Default OptimizationGroup Properties -->
+  <PropertyGroup Condition="'$(OptimizationGroup)' == 'Debug'">
    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
    <Optimize Condition="'$(Optimize)' == ''">false</Optimize>
    <DebugType Condition="'$(DebugType)' == ''">full</DebugType>
    <DefineConstants>$(DefineConstants);DEBUG;TRACE</DefineConstants>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(ConfigurationGroup)' == 'Release'">
+  <PropertyGroup Condition="'$(OptimizationGroup)' == 'Release'">
    <DebugSymbols Condition="'$(DebugSymbols)' == ''">true</DebugSymbols>
    <Optimize Condition="'$(Optimize)' == ''">true</Optimize>
    <DebugType Condition="'$(DebugType)' == ''">pdbonly</DebugType>
    <DefineConstants>$(DefineConstants);TRACE</DefineConstants>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetsWindows)' == 'true'">
-    <BaseNuGetRuntimeIdentifier>win10</BaseNuGetRuntimeIdentifier>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetsUbuntu)' == 'true'">
-    <BaseNuGetRuntimeIdentifier>ubuntu.14.04</BaseNuGetRuntimeIdentifier>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetsOSX)' == 'true'">
-    <BaseNuGetRuntimeIdentifier>osx.10.10</BaseNuGetRuntimeIdentifier>
+  <PropertyGroup >
+    <BaseNuGetRuntimeIdentifier Condition="'$(TargetsWindows)' == 'true'">win10</BaseNuGetRuntimeIdentifier>
+    <BaseNuGetRuntimeIdentifier Condition="'$(TargetsUbuntu)' == 'true'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
+    <BaseNuGetRuntimeIdentifier Condition="'$(TargetsOSX)' == 'true'">osx.10.10</BaseNuGetRuntimeIdentifier>
+    <BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == ''">$(DefaultNuGetRuntimeIdentifier)</BaseNuGetRuntimeIdentifier>
  </PropertyGroup>

-  <PropertyGroup Condition="'$(Platform)' == 'x64'">
-    <PlatformTarget>x64</PlatformTarget>
+  <PropertyGroup>
+    <PlatformTarget Condition="'$(Platform)' == 'x64'">x64</PlatformTarget>
+    <PlatformTarget Condition="'$(PlatformTarget)' == ''">x64</PlatformTarget>
  </PropertyGroup>

  <PropertyGroup>
@ -65,8 +61,8 @@
    <BinDir Condition="'$(BinDir)'==''">$(ProjectDir)bin/</BinDir>
    <ObjDir Condition="'$(ObjDir)'==''">$(BinDir)obj/</ObjDir>

-    <OutputPath>$(BinDir)$(Platform)/$(Configuration)/$(MSBuildProjectName)</OutputPath>
-    <IntermediateOutputPath>$(ObjDir)$(Platform)/$(Configuration)/$(MSBuildProjectName)</IntermediateOutputPath>
+    <OutputPath>$(BinDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</OutputPath>
+    <IntermediateOutputPath>$(ObjDir)$(OSTarget).$(Platform).$(OptimizationGroup)/$(MSBuildProjectName)</IntermediateOutputPath>
  </PropertyGroup>

 </Project>
--- a/build/corebuild.targets
+++ b/build/corebuild.targets
@ -1,10 +1,22 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!-- Import portable targets -->
-    <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
-    <Import Project="$(MSBuildThisFileDirectory)\coreconsole.targets" />
-    <Import Project="$(MSBuildThisFileDirectory)\vsdebug.targets" />
-    <!-- Override this. -->
+  <!-- Project targeting defaults -->
  <PropertyGroup>
+    <TargetFrameworkIdentifier Condition="'$(TargetFrameworkIdentifier)' == ''">None</TargetFrameworkIdentifier>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'">
    <NuGetTargetMoniker>DNXCore,Version=v5.0</NuGetTargetMoniker>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+    <NoStdLib>true</NoStdLib>
+    <!-- We don't use any of MSBuild's resolution logic for resolving the framework, so just set these two
+         properties to any folder that exists to skip the GetReferenceAssemblyPaths task (not target) and
+         to prevent it from outputting a warning (MSB3644).
+    -->
+    <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)</_TargetFrameworkDirectories>
+    <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)</_FullFrameworkReferenceAssemblyPaths>
+    <AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
  </PropertyGroup>
+    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\coreconsole.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)\vsdebug.targets" />
+
 </Project>
--- a/build/vsdebug.targets
+++ b/build/vsdebug.targets
@ -1,7 +1,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <!-- Set up the debug target for portable executables -->
-  <PropertyGroup Condition="'$(OutputType)'=='Exe'">
+  <!-- Set up the debug target for CoreCLR executables -->
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == 'None'
+                            And '$(OutputType)'=='Exe'">
    <StartWorkingDirectory Condition="'$(StartWorkingDirectory)' == ''">$(OutDir)</StartWorkingDirectory>
    <StartAction Condition="'$(StartAction)' == ''">Program</StartAction>
    <StartProgram Condition="'$(StartProgram)' == ''">$(TargetPath)</StartProgram>
--- a/dir.props
+++ b/dir.props
@ -1,3 +1,6 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <Import Project="$(MSBuildThisFileDirectory)\build\corebuild.props" />
+  <PropertyGroup>
+    <DepsDir>$(ProjectDir)deps\</DepsDir>
+  </PropertyGroup>
 </Project>
--- a/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
+++ b/src/ImGui.NET.SampleProgram.Net46/ImGui.NET.SampleProgram.Net46.csproj
@ -6,8 +6,9 @@
    <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
    <ProjectGuid>{47EF850E-D555-49E7-814B-68372123CB25}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <RootNamespace>ImGui.NET.SampleProgram.Net46</RootNamespace>
-    <AssemblyName>ImGui.NET.SampleProgram.Net46</AssemblyName>
+    <RootNamespace>ImGuiNET</RootNamespace>
+    <AssemblyName>SampleGUIProgram</AssemblyName>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -50,5 +51,5 @@
    <None Include="App.config" />
    <None Include="packages.config" />
  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
--- a/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
+++ b/src/ImGui.NET.SampleProgram/ImGui.NET.SampleProgram.csproj
@ -5,10 +5,9 @@
    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
    <ProjectGuid>{AE9BC745-284F-42F3-8236-C43F00000000}</ProjectGuid>
    <OutputType>Exe</OutputType>
-    <RootNamespace>ImGui</RootNamespace>
+    <RootNamespace>ImGuiNET</RootNamespace>
    <AssemblyName>SampleGUIProgram</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <!-- To shut VS up -->
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  </PropertyGroup>
  <ItemGroup>
@ -25,7 +24,9 @@
    <None Include="project.json" />
  </ItemGroup>
  <ItemGroup>
-    <Reference Include="$(DepsDir)OpenTK\OpenTK.dll" />
+    <Reference Include="$(DepsDir)OpenTK\OpenTK.dll">
+      <Private>True</Private>
+    </Reference>
    <ProjectReference Include="../ImGui.NET/ImGui.NET.csproj">
      <Name>ImGUI.NET</Name>
    </ProjectReference>
--- a/src/ImGui.NET.SampleProgram/Program.cs
+++ b/src/ImGui.NET.SampleProgram/Program.cs
@ -1,4 +1,4 @@
-namespace ImGui
+namespace ImGuiNET
 {
    public class Program
    {
--- a/src/ImGui.NET.SampleProgram/SampleWindow.cs
+++ b/src/ImGui.NET.SampleProgram/SampleWindow.cs
@ -10,7 +10,7 @@ using System.Threading;
 using System.Drawing;
 #endif

-namespace ImGui
+namespace ImGuiNET
 {
    public class SampleWindow
    {
--- a/src/ImGui.NET.SampleProgram/project.json
+++ b/src/ImGui.NET.SampleProgram/project.json
@ -1,13 +1,14 @@
 {
    "dependencies": {
-    "Microsoft.NETCore.Console": "1.0.0-beta-23430",
-    "System.Console": "4.0.0-beta-23430",
-    "System.Reflection.Metadata": "1.1.1-beta-23430",
-    "System.Threading.Thread": "4.0.0-beta-23430"
+        "Microsoft.NETCore.Console": "1.0.0-beta-23504",
+        "System.Console": "4.0.0-beta-23504",
+        "System.Reflection.Metadata": "1.1.1-beta-23504",
+        "System.Threading.Thread": "4.0.0-beta-23504"
    },
    "runtimes": {
        "win10-x64": { },
-    "ubuntu.14.04-x64": {}
+        "ubuntu.14.04-x64": { },
+        "osx.10.10-x64": { }
    },
    "frameworks": {
        "dnxcore50": { }
--- a/src/ImGui.NET/ImGui.NET.Net46.csproj
+++ b/src/ImGui.NET/ImGui.NET.Net46.csproj
@ -8,6 +8,7 @@
    <RootNamespace>ImGui</RootNamespace>
    <AssemblyName>ImGui.NET</AssemblyName>
    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <TargetFrameworkIdentifier>.NETFramework</TargetFrameworkIdentifier>
    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
    <ResolveNuGetPackages>false</ResolveNuGetPackages>
  </PropertyGroup>
@ -44,5 +45,5 @@
    <Reference Include="System" />
    <Reference Include="System.Numerics" />
  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 </Project>
--- a/src/ImGui.NET/project.json
+++ b/src/ImGui.NET/project.json
@ -2,10 +2,6 @@
  "dependencies": {
    "Microsoft.NETCore.Console": "1.0.0-beta-23504"
  },
-  "runtimes": {
-    "win10-x64": { },
-    "ubuntu.14.04-x64": { }
-  },
  "frameworks": {
    "dnxcore50": { }
  }