Move Out property to auto-import file

devlooped · Jul 24, 2018 · 0aad7e9 · 0aad7e9
1 parent ae36b44
commit 0aad7e9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <RootDirectory>$(MSBuildThisFileDirectory)</RootDirectory>
     <BuildDirectory>$(RootDirectory)build\</BuildDirectory>
+    <OutputDirectory>$(RootDirectory)out\</OutputDirectory>
   </PropertyGroup>
 
 </Project>
diff --git a/build.proj b/build.proj
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build;Test;Pack" InitialTargets="Configure" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+	<!-- Because this project does not reference any SDK,
+	     the following .props file is not auto-imported: -->
+	<Import Project="Directory.Build.Props" />
+
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
-		<Out Condition=" '$(Out)' == '' ">$(MSBuildThisFileDirectory)out\</Out>
 		<CommonBuildProperties>WarningLevel=0;NoWarn=1591;RunCodeAnalysis=false;Configuration=$(Configuration)</CommonBuildProperties>
 	</PropertyGroup>
 
@@ -15,7 +18,7 @@
 
 	<Target Name="Clean">
 		<MSBuild Projects="@(Solution)" Properties="$(CommonBuildProperties)" Targets="Clean" />
-		<Exec Command="rmdir $(Out) /S /Q" ContinueOnError="true" />
+		<Exec Command="rmdir $(OutputDirectory) /S /Q" ContinueOnError="true" />
 	</Target>
 
 	<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
@@ -25,14 +28,14 @@
 	</Target>
 
 	<Target Name="Test" DependsOnTargets="Build">
-		<MSBuild Projects="@(TestProjects)" Targets="Test" Properties="Out=$(Out);$(CommonBuildProperties)" BuildInParallel="False" />
+		<MSBuild Projects="@(TestProjects)" Targets="Test" Properties="$(CommonBuildProperties)" BuildInParallel="False" />
 	</Target>
 
 	<Target Name="Pack" DependsOnTargets="Build">
-		<MSBuild Projects="@(Source)" Targets="Pack" Properties="Out=$(Out);$(CommonBuildProperties)" BuildInParallel="False" />
+		<MSBuild Projects="@(Source)" Targets="Pack" Properties="$(CommonBuildProperties)" BuildInParallel="False" />
 	</Target>
 
 	<Target Name="Configure">
-		<MakeDir Directories="$(Out)" Condition=" !Exists('$(Out)') " />
+		<MakeDir Directories="$(OutputDirectory)" Condition=" !Exists('$(OutputDirectory)') " />
 	</Target>
 </Project>
diff --git a/build/xUnit.props b/build/xUnit.props
@@ -25,7 +25,7 @@
     </Exec>
     <Warning Condition="'$(DotnetErrorCode)' != '0'" Text="Error in executing dotnet." />
 
-    <Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html &quot;$(Out)$(TestReportFileName).html&quot; -xml &quot;$(Out)$(TestReportFileName).xml&quot;"
+    <Exec Command="dotnet xunit -nobuild -configuration $(Configuration) -noshadow -appveyor -html &quot;$(OutputDirectory)$(TestReportFileName).html&quot; -xml &quot;$(OutputDirectory)$(TestReportFileName).xml&quot;"
           ContinueOnError="false" />
   </Target>
 

diff --git a/src/Moq/Moq.csproj b/src/Moq/Moq.csproj
@@ -25,7 +25,7 @@
 		<NoPackageAnalysis>True</NoPackageAnalysis>
 		<NuspecFile>Moq.nuspec</NuspecFile>
 		<NuspecBasePath>$(MSBuildThisFileDirectory)</NuspecBasePath>
-		<PackageOutputPath>$(Out)</PackageOutputPath>
+		<PackageOutputPath>$(OutputDirectory)</PackageOutputPath>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">