#449 Correct output paths for all projects

Caliburn-Micro · Jun 8, 2017 · e7595d7 · e7595d7
1 parent 3f57ce1
commit e7595d7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj b/src/Caliburn.Micro.Core/Caliburn.Micro.Core.csproj
@@ -5,14 +5,8 @@
     <AssemblyName>Caliburn.Micro</AssemblyName>
     <RootNamespace>Caliburn.Micro</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\bin\netstandard\Release\</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\bin\netstandard\Debug\</OutputPath>
+    <OutputPath>..\..\bin\core\$(Configuration.ToLower())\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Caliburn.Micro.Platform.Core/Caliburn.Micro.Platform.Core.csproj b/src/Caliburn.Micro.Platform.Core/Caliburn.Micro.Platform.Core.csproj
@@ -5,16 +5,10 @@
     <AssemblyName>Caliburn.Micro.Platform.Core</AssemblyName>
     <RootNamespace>Caliburn.Micro</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>..\..\bin\platform-core\$(Configuration.ToLower())\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\bin\netstandard\Debug</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\bin\netstandard\Release</OutputPath>
-  </PropertyGroup>
-
+
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
   </ItemGroup>

diff --git a/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj b/src/Caliburn.Micro.Platform/Caliburn.Micro.Platform.csproj
@@ -5,6 +5,8 @@
     <AssemblyName>Caliburn.Micro.Platform</AssemblyName>
     <RootNamespace>Caliburn.Micro</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <OutputPath>..\..\bin\$(TargetFramework.ToLower())\$(Configuration.ToLower())\</OutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net45'">
@@ -37,6 +39,8 @@
     <DefineConstants>XFORMS</DefineConstants>
     <PackageTargetFallback>portable-net45+win8+wpa81+wp8</PackageTargetFallback>
     <DebugType>full</DebugType>
+    <OutputPath>..\..\bin\xamarin-forms\$(Configuration.ToLower())\</OutputPath>
+    <AssemblyName>Caliburn.Micro.Xamarin.Forms</AssemblyName>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj b/src/Caliburn.Micro.Tests.NET45/Caliburn.Micro.Tests.NET45.csproj
@@ -19,7 +19,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\..\bin\Tests\net45\Debug\</OutputPath>
+    <OutputPath>..\..\bin\tests\net45\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -28,7 +28,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\Tests\net45\Release\</OutputPath>
+    <OutputPath>..\..\bin\tests\net45\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>