Merge pull request dotnet#1534 from dotnet/stabilize

Merge stabilize into master
GangWang01 · May 11, 2018 · 266be42 · 266be42
2 parents d1600f3 + 27efcc9
commit 266be42
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/build.csproj b/template_feed/Microsoft.DotNet.Common.ItemTemplates/build.csproj
@@ -10,12 +10,12 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
     <None Remove="**/*.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.1.x/build.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.1.x/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.2.0/build.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.2.0/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Common.ProjectTemplates.2.1/build.csproj b/template_feed/Microsoft.DotNet.Common.ProjectTemplates.2.1/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.1.x/build.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.1.x/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.0/build.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.0/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/build.csproj b/template_feed/Microsoft.DotNet.Test.ProjectTemplates.2.1/build.csproj
@@ -10,11 +10,11 @@
     <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
     <OutputPath>$(TemplatesFolder)</OutputPath>
     <EnableDefaultItems>False</EnableDefaultItems>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
+    <BaseIntermediateOutputPath Condition="'$(DotNetBuildFromSource)' != 'true'">$(MSBuildThisFileDirectory)..\..\artifacts\scratch</BaseIntermediateOutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Remove="Microsoft.NETCore.App" />
     <Compile Remove="$(GitInfoFile)" />
     <Compile Remove="$(MSBuildThisFileDirectory)../../src/GitInfo.cs" />
   </ItemGroup>
-</Project>
+</Project>