From 7b3c1bbb23c396e617eec77006a00d8fc3d010c9 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Tue, 5 Sep 2017 14:44:25 -0700
Subject: [PATCH 1/3] Adding consistent "Project" headers to inported props and
 target files.

(cherry picked from commit 74ad01b576f04bc8dd17ce5876a865ee44f73800)
---
 Directory.Build.props                      | 2 +-
 build/AzureInfo.props                      | 2 +-
 build/BackwardsCompatibilityRuntimes.props | 2 +-
 build/BranchInfo.props                     | 2 +-
 build/Branding.props                       | 2 +-
 build/BuildDefaults.props                  | 2 +-
 build/BuildInfo.targets                    | 2 +-
 build/BundledRuntimes.props                | 2 +-
 build/BundledSdks.props                    | 2 +-
 build/BundledTemplates.props               | 2 +-
 build/BundledTools.props                   | 2 +-
 build/CrossGen.props                       | 2 +-
 build/DependencyVersions.props             | 2 +-
 build/DerivedHostMachineInfo.props         | 2 +-
 build/FileExtensions.props                 | 2 +-
 build/GenerateResxSource.targets           | 2 +-
 build/GitCommitInfo.targets                | 2 +-
 build/HostInfo.targets                     | 2 +-
 build/InputDirectories.props               | 2 +-
 build/InstallerInfo.props                  | 2 +-
 build/MSBuildExtensions.props              | 2 +-
 build/OutputDirectories.props              | 2 +-
 build/SetupPreviousStage.props             | 2 +-
 build/Version.props                        | 2 +-
 build/VersionBadge.props                   | 2 +-
 dir.props                                  | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 6a533eab3..990034d5f 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
 <!--
 Projects which don't import dir.props:
diff --git a/build/AzureInfo.props b/build/AzureInfo.props
index 0e8cf5104..f5ce4ab98 100644
--- a/build/AzureInfo.props
+++ b/build/AzureInfo.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Product>Sdk</Product>
     <ArtifactContainerName>$(ARTIFACT_STORAGE_CONTAINER)</ArtifactContainerName>
diff --git a/build/BackwardsCompatibilityRuntimes.props b/build/BackwardsCompatibilityRuntimes.props
index 9664fdadf..d9b7ddc24 100644
--- a/build/BackwardsCompatibilityRuntimes.props
+++ b/build/BackwardsCompatibilityRuntimes.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(IncludeSharedFrameworksForBackwardsCompatibilityTests)' == 'true' ">
     <BackwardsCompatibility110CoreSetupChannel>release/1.1.0</BackwardsCompatibility110CoreSetupChannel>
     <BackwardsCompatibility110SharedFrameworkVersion>1.1.2</BackwardsCompatibility110SharedFrameworkVersion>
diff --git a/build/BranchInfo.props b/build/BranchInfo.props
index 0d146ab2a..622960a55 100644
--- a/build/BranchInfo.props
+++ b/build/BranchInfo.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Channel>release/2.0.0</Channel>
     <BranchName>release/2.0.0</BranchName>
diff --git a/build/Branding.props b/build/Branding.props
index 9a66fdc2d..d79177a50 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="14.0">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SdkBrandName>Microsoft .NET Core SDK - 2.0.3</SdkBrandName>
     <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
diff --git a/build/BuildDefaults.props b/build/BuildDefaults.props
index 1e985282c..8561a45b0 100644
--- a/build/BuildDefaults.props
+++ b/build/BuildDefaults.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/build/BuildInfo.targets b/build/BuildInfo.targets
index df28e1980..6abd51fa9 100644
--- a/build/BuildInfo.targets
+++ b/build/BuildInfo.targets
@@ -21,7 +21,7 @@
       <OSPlatform Condition=" '$(OSPlatform)' == '' AND '$(IsLinux)' == 'True' ">linux</OSPlatform>
 
       <BuildInfoPropsContent>
-&lt;Project ToolsVersion=&quot;14.0&quot; xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;
+&lt;Project ToolsVersion=&quot;15.0&quot; xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;
     &lt;PropertyGroup&gt;
         &lt;Rid&gt;$(Rid)&lt;/Rid&gt;
         &lt;Architecture&gt;$(Architecture)&lt;/Architecture&gt;
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index a3c20a3e9..5828d0c23 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CoreSetupRid>$(HostRid)</CoreSetupRid>
     <CoreSetupRid Condition=" '$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' ">$(HostMonikerRid)</CoreSetupRid>
diff --git a/build/BundledSdks.props b/build/BundledSdks.props
index b259c4a2a..77a089668 100644
--- a/build/BundledSdks.props
+++ b/build/BundledSdks.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(CLI_NuGet_Version)" />
     <BundledSdk Include="Microsoft.NET.Sdk" Version="$(CLI_NETSDK_Version)" />
diff --git a/build/BundledTemplates.props b/build/BundledTemplates.props
index 549508206..d45b4a6ed 100644
--- a/build/BundledTemplates.props
+++ b/build/BundledTemplates.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <BundledTemplate Include="Microsoft.DotNet.Common.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
     <BundledTemplate Include="Microsoft.DotNet.Web.ItemTemplates" Version="$(TemplateEngineTemplateVersion)" />
diff --git a/build/BundledTools.props b/build/BundledTools.props
index b57577824..947148dd5 100644
--- a/build/BundledTools.props
+++ b/build/BundledTools.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <BundledTools Include="MSBuild;
                            NuGet.CommandLine.XPlat;
diff --git a/build/CrossGen.props b/build/CrossGen.props
index 8d5dd78ec..511abcbfb 100644
--- a/build/CrossGen.props
+++ b/build/CrossGen.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <RuntimeNETCoreAppPackageName>runtime.$(SharedFrameworkRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
     <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index 3c43151c8..7dec2bd7e 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <CLI_SharedFrameworkVersion>2.0.1</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.4.7</CLI_MSBuild_Version>
diff --git a/build/DerivedHostMachineInfo.props b/build/DerivedHostMachineInfo.props
index d9dc94444..3e77dad8c 100644
--- a/build/DerivedHostMachineInfo.props
+++ b/build/DerivedHostMachineInfo.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
       <IsDebianBaseDistro Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' ">true</IsDebianBaseDistro>
       <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) ">true</IsRPMBasedDistro>
diff --git a/build/FileExtensions.props b/build/FileExtensions.props
index 21f8a68d2..c9f943b13 100644
--- a/build/FileExtensions.props
+++ b/build/FileExtensions.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
       <ArchiveExtension Condition=" '$(HostOSName)' == 'win' ">.zip</ArchiveExtension>
       <ArchiveExtension Condition=" '$(HostOSName)' != 'win' ">.tar.gz</ArchiveExtension>
diff --git a/build/GenerateResxSource.targets b/build/GenerateResxSource.targets
index b25582ee2..1eb51907e 100644
--- a/build/GenerateResxSource.targets
+++ b/build/GenerateResxSource.targets
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <UsingTask TaskName="GenerateResxSource" AssemblyFile="$(CLIBuildDll)" />
 
diff --git a/build/GitCommitInfo.targets b/build/GitCommitInfo.targets
index 4addb6c8a..6ac729e50 100644
--- a/build/GitCommitInfo.targets
+++ b/build/GitCommitInfo.targets
@@ -23,7 +23,7 @@
       <GitInfoCommitHash>%(GitInfoCommitHashLines.Identity)</GitInfoCommitHash>
 
       <GitCommitInfoPropsContent>
-&lt;Project ToolsVersion=&quot;15.0&quot;&gt;
+&lt;Project ToolsVersion=&quot;15.0&quot; xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;
     &lt;PropertyGroup&gt;
         &lt;CommitCount&gt;$(GitInfoCommitCount)&lt;/CommitCount&gt;
         &lt;CommitHash&gt;$(GitInfoCommitHash)&lt;/CommitHash&gt;
diff --git a/build/HostInfo.targets b/build/HostInfo.targets
index 50331f196..ed1046cc0 100644
--- a/build/HostInfo.targets
+++ b/build/HostInfo.targets
@@ -10,7 +10,7 @@
 
     <PropertyGroup>
       <HostInfoPropsContent>
-&lt;Project ToolsVersion=&quot;15.0&quot;&gt;
+&lt;Project ToolsVersion=&quot;15.0&quot; xmlns=&quot;http://schemas.microsoft.com/developer/msbuild/2003&quot;&gt;
     &lt;PropertyGroup&gt;
         &lt;HostRid&gt;$(HostRid)&lt;/HostRid&gt;
         &lt;HostOSName&gt;$(HostOSName)&lt;/HostOSName&gt;
diff --git a/build/InputDirectories.props b/build/InputDirectories.props
index 0fc1b7a74..7564abe34 100644
--- a/build/InputDirectories.props
+++ b/build/InputDirectories.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
     <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
diff --git a/build/InstallerInfo.props b/build/InstallerInfo.props
index 036369fab..31fadd75e 100644
--- a/build/InstallerInfo.props
+++ b/build/InstallerInfo.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
     <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
diff --git a/build/MSBuildExtensions.props b/build/MSBuildExtensions.props
index c36782efe..26f27e8c4 100644
--- a/build/MSBuildExtensions.props
+++ b/build/MSBuildExtensions.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
   </PropertyGroup>
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index 52e072221..3f2121980 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
       <CliBuildStage Condition="'$(CliBuildStage)' == '' And '$(CliOuterBuildStage)' != ''">$([MSBuild]::Add($(CliOuterBuildStage), '1'))</CliBuildStage>
       <CliBuildStage Condition="'$(CliBuildStage)' == ''">2</CliBuildStage>
diff --git a/build/SetupPreviousStage.props b/build/SetupPreviousStage.props
index 4798cf582..7545eddc7 100644
--- a/build/SetupPreviousStage.props
+++ b/build/SetupPreviousStage.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup Condition="'$(PreviousStageProps)' == ''">
       <PreviousStageDirectory>$(RepoRoot)/.dotnet_stage0/$(Architecture)</PreviousStageDirectory>
       <PreviousStageDotnet>$(PreviousStageDirectory)/dotnet$(ExeExtension)</PreviousStageDotnet>
diff --git a/build/Version.props b/build/Version.props
index 2f7ba1395..61b953372 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionMajor>2</VersionMajor>
     <VersionMinor>0</VersionMinor>
diff --git a/build/VersionBadge.props b/build/VersionBadge.props
index 0dab52fb8..d38b1b359 100644
--- a/build/VersionBadge.props
+++ b/build/VersionBadge.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <VersionBadgeMoniker>$(OSName)_$(Architecture)</VersionBadgeMoniker>
     <VersionBadgeMoniker Condition=" '$(HostRid)' == 'debian.8-x64' ">debian_8_x64</VersionBadgeMoniker>
diff --git a/dir.props b/dir.props
index 995f5e985..875fe07ca 100644
--- a/dir.props
+++ b/dir.props
@@ -1,4 +1,4 @@
-<Project>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Projects which don't import the common targets can import this dir.props file in order to get the common repo build logic -->
   <Import Project="Directory.Build.props" />
 </Project>

From faca86fe6267e5f5b3e4234da6ed722e0f302ca8 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Tue, 5 Sep 2017 15:08:42 -0700
Subject: [PATCH 2/3] Adding required environmental variables.

(cherry picked from commit 5000ba5f102ee0f750575f3cc7a022986e88881a)
---
 build/package/Installer.RPM.targets | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/package/Installer.RPM.targets b/build/package/Installer.RPM.targets
index 1781d689b..bd5d468f4 100644
--- a/build/package/Installer.RPM.targets
+++ b/build/package/Installer.RPM.targets
@@ -140,6 +140,11 @@
 
     <ItemGroup>
       <TestSdkRpmTaskEnvironmentVariables Include="PATH=$(RpmInstalledDirectory)$(PathListSeparator)$(PATH)" />
+      <TestSdkRpmTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
+      <TestSdkRpmTaskEnvironmentVariables Include="TEST_PACKAGES=$(TestPackagesDir)" />
+      <TestSdkRpmTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" />
+
+      <!-- Consumed By Publish -->
       <GeneratedInstallers Include="$(SdkInstallerFile)" />
     </ItemGroup>
 

From 0586375cf82fd50de99e268e5685b1f72d3b8989 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 5 Sep 2017 15:10:15 -0700
Subject: [PATCH 3/3] Avoid importing incompatible .props files for signing
 build

(cherry picked from commit c2ca5121890d417db343abf568a1f5d99cae6444)
---
 Directory.Build.props | 29 ++++++++++++++++++-----------
 build/Signing.proj    |  7 +++++++
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 990034d5f..f0719c9ce 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -36,9 +36,6 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
 
   <Import Project="build/BranchInfo.props" />
 
-  <Import Project="build/BundledTools.props" />
-  <Import Project="build/BundledSdks.props" />
-  <Import Project="build/BundledTemplates.props" />
   <Import Project="build/DependencyVersions.props" />
   <Import Project="build/Version.props" />
   <Import Project="build/Branding.props" />
@@ -49,13 +46,23 @@ tools\TestAssetsDependencies\TestAssetsDependencies.csproj
   <Import Project="build/MSBuildExtensions.props" />
   <Import Project="build/SetupPreviousStage.props" />
   <Import Project="build/OutputDirectories.props" />
-  <Import Project="build/BuildDefaults.props" />
-  <Import Project="build/VersionBadge.props" />
-  <Import Project="build/BundledRuntimes.props" />
-  <Import Project="build/CrossGen.props" />
-  <Import Project="build/BackwardsCompatibilityRuntimes.props" />
 
-  <Import Project="build/AzureInfo.props" />
-  <Import Project="build/InstallerInfo.props" />
-  <Import Project="build/GenerateResxSource.targets" />
+  <ImportGroup Condition=" '$(BuildingSigningProject)' != 'true' ">
+    <!-- These imports aren't required for signing, and some of them have syntax which isn't supported in MSBuild 14,
+         which is what the signing build uses -->
+    <Import Project="build/BundledTools.props" />
+    <Import Project="build/BundledSdks.props" />
+    <Import Project="build/BundledTemplates.props" />
+
+    <Import Project="build/BuildDefaults.props" />
+    <Import Project="build/VersionBadge.props" />
+    <Import Project="build/BundledRuntimes.props" />
+    <Import Project="build/CrossGen.props" />
+    <Import Project="build/BackwardsCompatibilityRuntimes.props" />
+
+    <Import Project="build/AzureInfo.props" />
+    <Import Project="build/InstallerInfo.props" />
+    <Import Project="build/GenerateResxSource.targets" />
+  </ImportGroup>
+  
 </Project>
diff --git a/build/Signing.proj b/build/Signing.proj
index c403c324c..da686886a 100644
--- a/build/Signing.proj
+++ b/build/Signing.proj
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <!-- The signing infrastructure runs using MSBuild 14, which doesn't support some of the new syntax we're using.  So set the BuildingSingingProject
+         property here to avoid importing files we don't need for signing which would cause errors if imported when using MSBuild 14. -->
+    <BuildingSigningProject>true</BuildingSigningProject>
+  </PropertyGroup>
+  
   <Import Project="..\dir.props" />
   <Import Project="MicroBuild.props" />
   <Import Project="$(MicroBuildPropsAndTargetsPath)MicroBuild.Core.props" />