Simplify OS target handling

mellinoe · Feb 8, 2016 · 6d52a02 · 6d52a02
1 parent ca4073e
commit 6d52a02
Showing 1 changed file with 8 additions and 13 deletions.
diff --git a/corebuild.props b/corebuild.props
@@ -14,22 +14,17 @@
 
     <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>
+    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <OptimizationGroup Condition="$(Configuration.EndsWith('Debug'))">Debug</OptimizationGroup>
     <OptimizationGroup Condition="$(Configuration.EndsWith('Release'))">Release</OptimizationGroup>
     <OptimizationGroup Condition="'$(OptimizationGroup)'==''">Debug</OptimizationGroup>
 
     <!-- Platform Helper Properties -->
-    <TargetsWindows Condition="$(Configuration.StartsWith('Windows'))">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>
+    <OSTarget Condition="'$(OSTarget)' == '' And $(Configuration.StartsWith('Windows'))">Windows_NT</OSTarget>
+    <OSTarget Condition="'$(OSTarget)' == '' And $(Configuration.StartsWith('Ubuntu'))">Ubuntu</OSTarget>
+    <OSTarget Condition="'$(OSTarget)' == '' And $(Configuration.StartsWith('OSX'))">OSX</OSTarget>
     <OSTarget Condition="'$(OSTarget)' == ''">AnyOS</OSTarget>
-  </PropertyGroup>
+</PropertyGroup>
 
   <!-- Default OptimizationGroup Properties -->
   <PropertyGroup Condition="'$(OptimizationGroup)' == 'Debug'">
@@ -50,9 +45,9 @@
   </PropertyGroup>
 
   <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="'$(OSTarget)' == 'Windows_NT'">win10</BaseNuGetRuntimeIdentifier>
+    <BaseNuGetRuntimeIdentifier Condition="'$(OSTarget)' == 'Ubuntu'">ubuntu.14.04</BaseNuGetRuntimeIdentifier>
+    <BaseNuGetRuntimeIdentifier Condition="'$(OSTarget)' == 'OSX'">osx.10.10</BaseNuGetRuntimeIdentifier>
     <BaseNuGetRuntimeIdentifier Condition="'$(BaseNuGetRuntimeIdentifier)' == ''">$(DefaultNuGetRuntimeIdentifier)</BaseNuGetRuntimeIdentifier>
   </PropertyGroup>