Merge branch 'onovotny-output-paths' into netstandard

pada57 · Apr 17, 2016 · c1ef42d · c1ef42d
2 parents 99e3287 + dfff5f3
commit c1ef42d
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 16 deletions.
diff --git a/Dapper.Contrib/Dapper.Contrib.xproj b/Dapper.Contrib/Dapper.Contrib.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>4e409f8f-cfbb-4332-8b0a-fd5a283051fd</ProjectGuid>
     <RootNamespace>Dapper.Contrib</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.EntityFramework.StrongName/Dapper.EntityFramework.StrongName.xproj b/Dapper.EntityFramework.StrongName/Dapper.EntityFramework.StrongName.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>1a70b6d7-244e-41ed-8ff5-6f0e8e26a764</ProjectGuid>
     <RootNamespace>Dapper.EntityFramework.StrongName</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.EntityFramework/Dapper.EntityFramework.xproj b/Dapper.EntityFramework/Dapper.EntityFramework.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>be401f7b-8611-4a1e-aeaa-5cb700128c16</ProjectGuid>
     <RootNamespace>Dapper.EntityFramework</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.Rainbow/Dapper.Rainbow.xproj b/Dapper.Rainbow/Dapper.Rainbow.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>8a74f0b6-188f-45d2-8a4b-51e4f211805a</ProjectGuid>
     <RootNamespace>Dapper.Rainbow</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.SqlBuilder/Dapper.SqlBuilder.xproj b/Dapper.SqlBuilder/Dapper.SqlBuilder.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>196928f0-7052-4585-90e8-817bd720f5e3</ProjectGuid>
     <RootNamespace>Dapper.SqlBuilder</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.StrongName/Dapper.StrongName.xproj b/Dapper.StrongName/Dapper.StrongName.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>549c51a1-222b-4e12-96f1-3aeff45a7709</ProjectGuid>
     <RootNamespace>Dapper.StrongName</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>

diff --git a/Dapper.Tests.Contrib/Dapper.Tests.Contrib.xproj b/Dapper.Tests.Contrib/Dapper.Tests.Contrib.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>dab3c5b7-bcd1-4a5f-bb6b-50d2bb63db4a</ProjectGuid>
     <RootNamespace>Dapper.Tests.Contrib</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/Dapper.Tests/Dapper.Tests.xproj b/Dapper.Tests/Dapper.Tests.xproj
@@ -9,7 +9,7 @@
     <ProjectGuid>052c0817-db26-4925-8929-8c5e42d148d5</ProjectGuid>
     <RootNamespace>Dapper.Tests</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>

diff --git a/Dapper/Dapper.xproj b/Dapper/Dapper.xproj
@@ -9,9 +9,8 @@
     <ProjectGuid>fac24c3f-68f9-4247-a4b9-21d487e99275</ProjectGuid>
     <RootNamespace>Dapper</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\</OutputPath>
   </PropertyGroup>
-
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>