A couple of better defaults for library projects and platform targets.

Library projects will now always output to the AnyCPU bin directory. Tests will still output to an arch-specific directory.
mellinoe · Sep 24, 2016 · c50a9fe · c50a9fe
1 parent 8d6d63f
commit c50a9fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/corebuild.props b/corebuild.props
@@ -52,7 +52,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PlatformTarget Condition="'$(Platform)' == 'x64'">x64</PlatformTarget>
+    <PlatformTarget Condition="'$(OutputType)' == 'Library'">AnyCPU</PlatformTarget>
+    <PlatformTarget Condition="'$(PlatformTarget)' == ''">$(Platform)</PlatformTarget>
     <PlatformTarget Condition="'$(PlatformTarget)' == ''">x64</PlatformTarget>
   </PropertyGroup>
 

diff --git a/test.targets b/test.targets
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <PropertyGroup Condition="$(AssemblyName.Contains('Test'))">
+    <TestPlatform Condition="'$(TestPlatform)' == ''">x64</TestPlatform>
+    <NuGetRuntimeIdentifier>$(BaseNugetRuntimeIdentifier)-$(TestPlatform)</NuGetRuntimeIdentifier>
+  </PropertyGroup>
+
   <PropertyGroup>
     <AdditionalXunitArgs Condition="'$(OS)' != 'Windows_NT'">$(AdditionalXunitArgs) -notrait category=nonlinuxtests</AdditionalXunitArgs>
   </PropertyGroup>