From 39321c933e0312c5077178cbce1549285ba2bab4 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Wed, 13 Nov 2019 10:10:41 -0600
Subject: [PATCH 01/10] Parameterize targetFramework in deploy script

---
 scripts/Deploy-MSBuild.ps1 | 64 +++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1
index 0939abb2d56..b39e3bc5935 100644
--- a/scripts/Deploy-MSBuild.ps1
+++ b/scripts/Deploy-MSBuild.ps1
@@ -28,39 +28,45 @@ $BackupFolder = New-Item (Join-Path $destination -ChildPath "Backup-$(Get-Date -
 Write-Verbose "Copying $configuration MSBuild to $destination"
 Write-Host "Existing MSBuild assemblies backed up to $BackupFolder"
 
+if ($runtime -eq "Desktop") {
+    $targetFramework = "net472"
+} else {
+    $targetFramework = "netcoreapp2.1"
+}
+
 $filesToCopyToBin = @(
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\MSBuild.exe"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.dll"
-    "artifacts\bin\Microsoft.Build.Conversion\$configuration\net472\Microsoft.Build.Conversion.Core.dll"
-    "artifacts\bin\Microsoft.Build.Engine\$configuration\net472\Microsoft.Build.Engine.dll"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.Framework.dll"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.Tasks.Core.dll"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.Utilities.Core.dll"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\MSBuild.exe"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.dll"
+    "artifacts\bin\Microsoft.Build.Conversion\$configuration\$targetFramework\Microsoft.Build.Conversion.Core.dll"
+    "artifacts\bin\Microsoft.Build.Engine\$configuration\$targetFramework\Microsoft.Build.Engine.dll"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Framework.dll"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Tasks.Core.dll"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Utilities.Core.dll"
     "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.exe"
     "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.pdb"
 
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Common.CrossTargeting.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Common.CurrentVersion.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Common.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.CSharp.CrossTargeting.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.CSharp.CurrentVersion.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.CSharp.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Data.Entity.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Managed.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Net.props"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.NetFramework.CurrentVersion.props"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.NetFramework.CurrentVersion.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.NetFramework.props"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.NetFramework.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.ServiceModel.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.VisualBasic.CrossTargeting.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.VisualBasic.CurrentVersion.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.VisualBasic.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.WinFx.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.WorkflowBuildExtensions.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Xaml.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Workflow.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Workflow.VisualBasic.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Common.CrossTargeting.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Common.CurrentVersion.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Common.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.CrossTargeting.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.CurrentVersion.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Data.Entity.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Managed.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Net.props"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.CurrentVersion.props"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.CurrentVersion.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.props"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.ServiceModel.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.CrossTargeting.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.CurrentVersion.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WinFx.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WorkflowBuildExtensions.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Xaml.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.targets"
+    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.VisualBasic.targets"
 )
 
 foreach ($file in $filesToCopyToBin) {

From 0070f0791f042800ed6dabab20ff06554589e606 Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Wed, 13 Nov 2019 10:36:40 -0600
Subject: [PATCH 02/10] Copy files according to runtime

---
 scripts/Deploy-MSBuild.ps1 | 41 ++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1
index b39e3bc5935..9da67ecc15a 100644
--- a/scripts/Deploy-MSBuild.ps1
+++ b/scripts/Deploy-MSBuild.ps1
@@ -3,7 +3,9 @@ Param(
   [Parameter(Mandatory = $true)]
   [string] $destination,
   [ValidateSet('Debug','Release')]
-  [string] $configuration = "Debug"
+  [string] $configuration = "Debug",
+  [ValidateSet('Core','Desktop')]
+  [string] $runtime = "Desktop"
 )
 
 function Copy-WithBackup ($origin) {
@@ -35,15 +37,10 @@ if ($runtime -eq "Desktop") {
 }
 
 $filesToCopyToBin = @(
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\MSBuild.exe"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.dll"
-    "artifacts\bin\Microsoft.Build.Conversion\$configuration\$targetFramework\Microsoft.Build.Conversion.Core.dll"
-    "artifacts\bin\Microsoft.Build.Engine\$configuration\$targetFramework\Microsoft.Build.Engine.dll"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Framework.dll"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Tasks.Core.dll"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Build.Utilities.Core.dll"
-    "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.exe"
-    "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.pdb"
 
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Common.CrossTargeting.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Common.CurrentVersion.targets"
@@ -51,24 +48,42 @@ $filesToCopyToBin = @(
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.CrossTargeting.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.CurrentVersion.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.CSharp.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Data.Entity.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Managed.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Net.props"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.CurrentVersion.props"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.CurrentVersion.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.props"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.NetFramework.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.ServiceModel.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.CrossTargeting.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.CurrentVersion.targets"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.VisualBasic.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WinFx.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WorkflowBuildExtensions.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Xaml.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.targets"
-    "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.VisualBasic.targets"
 )
 
+if ($runtime -eq "Desktop") {
+    $runtimeSpecificFiles = @(
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\MSBuild.exe"
+        "artifacts\bin\Microsoft.Build.Conversion\$configuration\$targetFramework\Microsoft.Build.Conversion.Core.dll"
+        "artifacts\bin\Microsoft.Build.Engine\$configuration\$targetFramework\Microsoft.Build.Engine.dll"
+
+        "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.exe"
+        "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.pdb"
+
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Data.Entity.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.ServiceModel.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WinFx.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.WorkflowBuildExtensions.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Microsoft.Xaml.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.targets"
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\Workflow.VisualBasic.targets"
+    )
+} else {
+    $runtimeSpecificFiles = @(
+        "artifacts\bin\MSBuild.Bootstrap\$configuration\$targetFramework\MSBuild.dll"
+    )
+}
+
+$filesToCopyToBin += $runtimeSpecificFiles
+
 foreach ($file in $filesToCopyToBin) {
     Copy-WithBackup $([IO.Path]::Combine($PSScriptRoot, "..", $file))
 }

From e5f47a3f072025e4ac487bce03f64892e5d9c21b Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 14 Nov 2019 09:23:29 -0800
Subject: [PATCH 03/10] Add simple replacement for System.Version

Will be used to implement version comparison intrinic property functions.

Allows major version only (e.g. "3" is 3.0.0.0), ignores leading 'v'
(e.g. "v3.0" is 3.0.0.0).

Ignores semver prerelease and metadata portions (e.g. "1.0.0-preview+info"
is 1.0.0.0).

Treats unspecified components as 0 (e.g. x == x.0 == x.0.0 == x.0.0.0).

Unlike System.Version, does not tolerate whitespace, and '+' is ignored as
semver metadata as described above, not tolerated as positive sign of integer
component.

Tolerating leading 'v' allows using $(TargetFrameworkVersion) directly.

Ignoring semver portions allows, for example, checking >= major.minor
while still in development of that release.

Implemented as a struct to avoid heap allocation. Parsing is done
without heap allocation at all on .NET Core. However, on .NET Framework,
the integer component substrings are allocated as there is no int.Parse
on span there.
---
 .../Evaluation/SimpleVersion_Tests.cs         | 309 ++++++++++++++++++
 src/Build/Microsoft.Build.csproj              |   1 +
 src/Build/Resources/Strings.resx              |   3 +
 src/Build/Utilities/SimpleVersion.cs          | 188 +++++++++++
 4 files changed, 501 insertions(+)
 create mode 100644 src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs
 create mode 100644 src/Build/Utilities/SimpleVersion.cs

diff --git a/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs b/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs
new file mode 100644
index 00000000000..7c08340bcf3
--- /dev/null
+++ b/src/Build.UnitTests/Evaluation/SimpleVersion_Tests.cs
@@ -0,0 +1,309 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using Microsoft.Build.Utilities;
+using System;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Microsoft.Build.UnitTests.Evaluation
+{
+    public class SimpleVersion_Tests
+    {
+        [Fact]
+        public void Ctor_Default()
+        {
+            VerifyVersion(new SimpleVersion(), 0, 0, 0, 0);
+        }
+
+        [Theory]
+        [InlineData(0)]
+        [InlineData(2)]
+        [InlineData(int.MaxValue)]
+        public static void Ctor_Int(int major)
+        {
+            VerifyVersion(new SimpleVersion(major), major, 0, 0, 0);
+        }
+
+        [Theory]
+        [InlineData(0, 0)]
+        [InlineData(2, 3)]
+        [InlineData(int.MaxValue, int.MaxValue)]
+        public static void Ctor_Int_Int(int major, int minor)
+        {
+            VerifyVersion(new SimpleVersion(major, minor), major, minor, 0, 0);
+        }
+
+        [Theory]
+        [InlineData(0, 0, 0)]
+        [InlineData(2, 3, 4)]
+        [InlineData(int.MaxValue, int.MaxValue, int.MaxValue)]
+        public static void Ctor_Int_Int_Int(int major, int minor, int build)
+        {
+            VerifyVersion(new SimpleVersion(major, minor, build), major, minor, build, 0);
+        }
+
+        [Theory]
+        [InlineData(0, 0, 0, 0)]
+        [InlineData(2, 3, 4, 7)]
+        [InlineData(2, 3, 4, 32767)]
+        [InlineData(2, 3, 4, 32768)]
+        [InlineData(2, 3, 4, 65535)]
+        [InlineData(2, 3, 4, 65536)]
+        [InlineData(2, 3, 4, 2147483647)]
+        [InlineData(2, 3, 4, 2147450879)]
+        [InlineData(2, 3, 4, 2147418112)]
+        [InlineData(int.MaxValue, int.MaxValue, int.MaxValue, int.MaxValue)]
+        public static void Ctor_Int_Int_Int_Int(int major, int minor, int build, int revision)
+        {
+            VerifyVersion(new SimpleVersion(major, minor, build, revision), major, minor, build, revision);
+        }
+
+        [Fact]
+        public void Ctor_NegativeMajor_ThrowsArgumentOutOfRangeException()
+        {
+            Assert.Throws<ArgumentOutOfRangeException>("major", () => new SimpleVersion(-1, 0));
+            Assert.Throws<ArgumentOutOfRangeException>("major", () => new SimpleVersion(-1, 0, 0));
+            Assert.Throws<ArgumentOutOfRangeException>("major", () => new SimpleVersion(-1, 0, 0, 0));
+        }
+
+        [Fact]
+        public void Ctor_NegativeMinor_ThrowsArgumentOutOfRangeException()
+        {
+            Assert.Throws<ArgumentOutOfRangeException>("minor", () => new SimpleVersion(0, -1));
+            Assert.Throws<ArgumentOutOfRangeException>("minor", () => new SimpleVersion(0, -1, 0));
+            Assert.Throws<ArgumentOutOfRangeException>("minor", () => new SimpleVersion(0, -1, 0, 0));
+        }
+
+        [Fact]
+        public void Ctor_NegativeBuild_ThrowsArgumentOutOfRangeException()
+        {
+            Assert.Throws<ArgumentOutOfRangeException>("build", () => new SimpleVersion(0, 0, -1));
+            Assert.Throws<ArgumentOutOfRangeException>("build", () => new SimpleVersion(0, 0, -1, 0));
+        }
+
+        [Fact]
+        public void Ctor_NegativeRevision_ThrowsArgumentOutOfRangeException()
+        {
+            Assert.Throws<ArgumentOutOfRangeException>("revision", () => new SimpleVersion(0, 0, 0, -1));
+        }
+
+        public static IEnumerable<object[]> Comparison_TestData()
+        {
+            foreach (var input in new (SimpleVersion v1, SimpleVersion v2, int expectedSign)[]
+            {
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 2), 0),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 3), -1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 1), 1),
+                (new SimpleVersion(1, 2), new SimpleVersion(2, 0), -1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 2, 1), -1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 2, 0, 1), -1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 0), 1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 0, 1), 1),
+                (new SimpleVersion(1, 2), new SimpleVersion(1, 0, 0, 1), 1),
+
+                (new SimpleVersion(3, 2, 1), new SimpleVersion(2, 2, 1), 1),
+                (new SimpleVersion(3, 2, 1), new SimpleVersion(3, 1, 1), 1),
+                (new SimpleVersion(3, 2, 1), new SimpleVersion(3, 2, 0), 1),
+
+                (new SimpleVersion(1, 2, 3, 4), new SimpleVersion(1, 2, 3, 4), 0),
+                (new SimpleVersion(1, 2, 3, 4), new SimpleVersion(1, 2, 3, 5), -1),
+                (new SimpleVersion(1, 2, 3, 4), new SimpleVersion(1, 2, 3, 3), 1)
+            })
+            {
+                yield return new object[] { input.v1, input.v2, input.expectedSign };
+                yield return new object[] { input.v2, input.v1, input.expectedSign * -1 };
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Comparison_TestData))]
+        public void CompareTo_ReturnsExpected(object version1Object, object version2Object, int expectedSign)
+        {
+            var version1 = (SimpleVersion)version1Object;
+            var version2 = (SimpleVersion)version2Object;
+
+            Assert.Equal(expectedSign, Comparer<SimpleVersion>.Default.Compare(version1, version2));
+            Assert.Equal(expectedSign, Math.Sign(version1.CompareTo(version2)));
+        }
+
+        [Theory]
+        [MemberData(nameof(Comparison_TestData))]
+        public void ComparisonOperators_ReturnExpected(object version1Object, object version2Object, int expectedSign)
+        {
+            var version1 = (SimpleVersion)version1Object;
+            var version2 = (SimpleVersion)version2Object;
+
+            if (expectedSign < 0)
+            {
+                Assert.True(version1 < version2);
+                Assert.True(version1 <= version2);
+                Assert.False(version1 == version2);
+                Assert.False(version1 >= version2);
+                Assert.False(version1 > version2);
+                Assert.True(version1 != version2);
+            }
+            else if (expectedSign == 0)
+            {
+                Assert.False(version1 < version2);
+                Assert.True(version1 <= version2);
+                Assert.True(version1 == version2);
+                Assert.True(version1 >= version2);
+                Assert.False(version1 > version2);
+                Assert.False(version1 != version2);
+            }
+            else
+            {
+                Assert.False(version1 < version2);
+                Assert.False(version1 <= version2);
+                Assert.False(version1 == version2);
+                Assert.True(version1 >= version2);
+                Assert.True(version1 > version2);
+                Assert.True(version1 != version2);
+            }
+        }
+
+        public static IEnumerable<object[]> Equals_TestData()
+        {
+            yield return new object[] { new SimpleVersion(2, 3), new SimpleVersion(2, 3), true };
+            yield return new object[] { new SimpleVersion(2, 3), new SimpleVersion(2, 4), false };
+            yield return new object[] { new SimpleVersion(2, 3), new SimpleVersion(3, 3), false };
+
+            yield return new object[] { new SimpleVersion(2, 3, 4), new SimpleVersion(2, 3, 4), true };
+            yield return new object[] { new SimpleVersion(2, 3, 4), new SimpleVersion(2, 3, 5), false };
+            yield return new object[] { new SimpleVersion(2, 3, 4), new SimpleVersion(2, 3), false };
+
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), new SimpleVersion(2, 3, 4, 5), true };
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), new SimpleVersion(2, 3, 4, 6), false };
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), new SimpleVersion(2, 3), false };
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), new SimpleVersion(2, 3, 4), false };
+
+            yield return new object[] { new SimpleVersion(2, 3, 0), new SimpleVersion(2, 3), true };
+            yield return new object[] { new SimpleVersion(2, 3, 4, 0), new SimpleVersion(2, 3, 4), true };
+
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), new TimeSpan(), false };
+            yield return new object[] { new SimpleVersion(2, 3, 4, 5), null, false };
+        }
+
+        [Theory]
+        [MemberData(nameof(Equals_TestData))]
+        public static void Equals_Other_ReturnsExpected(object version1Object, object version2Object, bool expected)
+        {
+            var version1 = (SimpleVersion)version1Object;
+
+            if (version2Object is SimpleVersion version2)
+            {
+                Assert.Equal(expected, version1.Equals(version2));
+                Assert.Equal(expected, version1 == version2);
+                Assert.Equal(!expected, version1 != version2);
+            }
+
+            Assert.Equal(expected, version1.Equals(version2Object));
+
+            if (version2Object != null)
+            {
+                Assert.Equal(expected, version1Object.GetHashCode() == version2Object.GetHashCode());
+            }
+        }
+
+        public static IEnumerable<object[]> Parse_Valid_TestData()
+        {
+            foreach (var prefix in new[] { "", "v",  "V"})
+            {
+                foreach (var suffix in new[] { "", "-pre", "-pre+metadata", "+metadata"})
+                {
+                    yield return new object[] { $"{prefix}1{suffix}", new SimpleVersion(1) };
+                    yield return new object[] { $"{prefix}1.2{suffix}", new SimpleVersion(1, 2) };
+                    yield return new object[] { $"{prefix}1.2.3{suffix}", new SimpleVersion(1, 2, 3) };
+                    yield return new object[] { $"{prefix}1.2.3.4{suffix}", new SimpleVersion(1, 2, 3, 4) };
+                    yield return new object[] { $"{prefix}2147483647.2147483647.2147483647.2147483647{suffix}", new SimpleVersion(int.MaxValue, int.MaxValue, int.MaxValue, int.MaxValue) };
+                }
+            }
+        }
+
+        [Theory]
+        [MemberData(nameof(Parse_Valid_TestData))]
+        public static void Parse_ValidInput_ReturnsExpected(string input, object expected)
+        {
+            Assert.Equal(expected, SimpleVersion.Parse(input));
+        }
+
+        public static IEnumerable<object[]> Parse_Invalid_TestData()
+        {
+            yield return new object[] { null, typeof(ArgumentNullException) }; // Input is null
+
+            yield return new object[] { "", typeof(FormatException) }; // Input is empty
+            yield return new object[] { "1,2,3,4", typeof(FormatException) }; // Input contains invalid separator
+            yield return new object[] { "1.2.3.4.5", typeof(FormatException) }; // Input has more than 4 version components
+
+            yield return new object[] { "1." , typeof(FormatException) }; // Input contains empty component
+            yield return new object[] { "1.2,", typeof(FormatException) }; // Input contains empty component
+            yield return new object[] { "1.2.3.", typeof(FormatException) }; // Input contains empty component
+            yield return new object[] { "1.2.3.4.", typeof(FormatException) }; // Input contains empty component
+
+            yield return new object[] { "NotAVersion", typeof(FormatException) }; // Input contains non-numeric value
+            yield return new object[] { "b.2.3.4", typeof(FormatException) }; // Input contains non-numeric value
+            yield return new object[] { "1.b.3.4", typeof(FormatException) }; // Input contains non-numeric value
+            yield return new object[] { "1.2.b.4", typeof(FormatException) }; // Input contains non-numeric value
+            yield return new object[] { "1.2.3.b", typeof(FormatException) }; // Input contains non-numeric value
+
+            yield return new object[] { "2147483648.2.3.4", typeof(FormatException) }; // Input contains a value > int.MaxValue
+            yield return new object[] { "1.2147483648.3.4", typeof(FormatException) }; // Input contains a value > int.MaxValue
+            yield return new object[] { "1.2.2147483648.4", typeof(FormatException) }; // Input contains a value > int.MaxValue
+            yield return new object[] { "1.2.3.2147483648", typeof(FormatException) }; // Input contains a value > int.MaxValue
+
+            // System.Version allows whitespace around components, but we don't
+            yield return new object[] { "2  .3.    4.  \t\r\n15  ", typeof(FormatException) };
+            yield return new object[] { "   2  .3.    4.  \t\r\n15  ", typeof(FormatException) };
+
+            // System.Version rejects these because they have negative values, but SimpleVersion strips interprest as semver prerelease to strip
+            // They are still invalid because the stripping leaves a empty components behind which are also not allowed as above.
+            yield return new object[] { "-1.2.3.4", typeof(FormatException) };
+            yield return new object[] { "1.-2.3.4", typeof(FormatException) };
+            yield return new object[] { "1.2.-3.4", typeof(FormatException) };
+            yield return new object[] { "1.2.3.-4", typeof(FormatException) };
+
+            // System.Version treats this as 1.2.3.4, but SimpleVersion interprets as semver metadata to ignore yielding invalid empty string
+            // System.Version parses allowing leading sign, but we treat both sign indicators as beginning of semver part to strip.
+            yield return new object[] { "+1.+2.+3.+4", typeof(FormatException) };
+
+            // Only one 'v' allowed as prefix
+            yield return new object[] { "vv1.2.3.4", typeof(FormatException) };
+        }
+
+        [Theory]
+        [MemberData(nameof(Parse_Invalid_TestData))]
+        public static void Parse_InvalidInput_ThrowsException(string input, Type exceptionType)
+        {
+            Assert.Throws(exceptionType, () => SimpleVersion.Parse(input));
+        }
+
+        public static IEnumerable<object[]> ToString_TestData()
+        {
+            yield return new object[] { new SimpleVersion(1), "1.0.0.0"};
+            yield return new object[] { new SimpleVersion(1, 2), "1.2.0.0" };
+            yield return new object[] { new SimpleVersion(1, 2, 3), "1.2.3.0" };
+            yield return new object[] { new SimpleVersion(1, 2, 3, 4), "1.2.3.4" };
+        }
+
+        [Theory]
+        [MemberData(nameof(ToString_TestData))]
+        public static void ToString_Invoke_ReturnsExpected(object versionObject, string expected)
+        {
+            var version = (SimpleVersion)versionObject;
+
+            Assert.Equal(expected, version.ToString());
+        }
+
+        private static void VerifyVersion(SimpleVersion version, int major, int minor, int build, int revision)
+        {
+            Assert.Equal(major, version.Major);
+            Assert.Equal(minor, version.Minor);
+            Assert.Equal(build, version.Build);
+            Assert.Equal(revision, version.Revision);
+        }
+    }
+}
diff --git a/src/Build/Microsoft.Build.csproj b/src/Build/Microsoft.Build.csproj
index c8a2253f988..5b96af2673d 100644
--- a/src/Build/Microsoft.Build.csproj
+++ b/src/Build/Microsoft.Build.csproj
@@ -647,6 +647,7 @@
     <Compile Include="Utilities\Utilities.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
     </Compile>
+    <Compile Include="Utilities\SimpleVersion.cs" />
     <Compile Include="Xml\ProjectXmlUtilities.XmlElementChildIterator.cs" />
     <Compile Include="Xml\ProjectXmlUtilities.cs">
       <ExcludeFromStyleCop>true</ExcludeFromStyleCop>
diff --git a/src/Build/Resources/Strings.resx b/src/Build/Resources/Strings.resx
index c554b6dd3e8..a931f0f57a6 100644
--- a/src/Build/Resources/Strings.resx
+++ b/src/Build/Resources/Strings.resx
@@ -1801,6 +1801,9 @@ Utilization:          {0} Average Utilization: {1:###.0}</value>
       LOCALIZATION: {0} is an enum value of LoggerVerbosity.
     </comment>
   </data>
+  <data name="InvalidVersionFormat" xml:space="preserve">
+    <value>Version string was not in a correct format.</value>
+  </data>
   <!--
         The engine message bucket is: MSB4001 - MSB4999
 
diff --git a/src/Build/Utilities/SimpleVersion.cs b/src/Build/Utilities/SimpleVersion.cs
new file mode 100644
index 00000000000..c0534a9a64b
--- /dev/null
+++ b/src/Build/Utilities/SimpleVersion.cs
@@ -0,0 +1,188 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.Build.Shared;
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace Microsoft.Build.Utilities
+{
+    /// <summary>
+    /// Simple replacement for System.Version used to implement version
+    /// comparison intrinic property functions.
+    ///
+    /// Allows major version only (e.g. "3" is 3.0.0.0), ignores leading 'v'
+    /// (e.g. "v3.0" is 3.0.0.0).
+    ///
+    /// Ignores semver prerelease and metadata portions (e.g. "1.0.0-preview+info"
+    /// is 1.0.0.0).
+    ///
+    /// Treats unspecified components as 0 (e.g. x == x.0 == x.0.0 == x.0.0.0).
+    ///
+    /// Unlike System.Version, does not tolerate whitespace, and '+' is ignored as
+    /// semver metadata as described above, not tolerated as positive sign of integer
+    /// component.
+    /// <summary>
+    /// <remarks>
+    /// Tolerating leading 'v' allows using $(TargetFrameworkVersion) directly.
+    ///
+    /// Ignoring semver portions allows, for example, checking >= major.minor
+    /// while still in development of that release.
+    ///
+    /// Implemented as a struct to avoid heap allocation. Parsing is done
+    /// without heap allocation at all on .NET Core. However, on .NET Framework,
+    /// the integer component substrings are allocated as there is no int.Parse
+    /// on span there.
+    /// </remarks>
+    internal readonly struct SimpleVersion : IEquatable<SimpleVersion>, IComparable<SimpleVersion>
+    {
+        public readonly int Major;
+        public readonly int Minor;
+        public readonly int Build;
+        public readonly int Revision;
+
+        public SimpleVersion(int major, int minor = 0, int build = 0, int revision = 0)
+        {
+            if (major < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(major));
+            }
+
+            if (minor < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(minor));
+            }
+
+            if (build < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(build));
+            }
+
+            if (revision < 0)
+            {
+                throw new ArgumentOutOfRangeException(nameof(revision));
+            }
+
+            Major = major;
+            Minor = minor;
+            Build = build;
+            Revision = revision;
+        }
+
+        public bool Equals(SimpleVersion other)
+        {
+            return Major == other.Major &&
+                   Minor == other.Minor &&
+                   Build == other.Build &&
+                   Revision == other.Revision;
+        }
+
+        public int CompareTo(SimpleVersion other)
+        {
+            return Major != other.Major ? (Major > other.Major ? 1 : -1) :
+                   Minor != other.Minor ? (Minor > other.Minor ? 1 : -1) :
+                   Build != other.Build ? (Build > other.Build ? 1 : -1) :
+                   Revision != other.Revision ? (Revision > other.Revision ? 1 : -1) :
+                   0;
+        }
+
+        public override bool Equals(object obj) => obj is SimpleVersion v && Equals(v);
+        public override int GetHashCode() => (Major, Minor, Build, Revision).GetHashCode();
+        public override string ToString() => FormattableString.Invariant($"{Major}.{Minor}.{Build}.{Revision}");
+
+        public static bool operator ==(SimpleVersion a, SimpleVersion b) => a.Equals(b);
+        public static bool operator !=(SimpleVersion a, SimpleVersion b) => !a.Equals(b);
+        public static bool operator <(SimpleVersion a, SimpleVersion b) => a.CompareTo(b) < 0;
+        public static bool operator <=(SimpleVersion a, SimpleVersion b) => a.CompareTo(b) <= 0;
+        public static bool operator >(SimpleVersion a, SimpleVersion b) => a.CompareTo(b) > 0;
+        public static bool operator >=(SimpleVersion a, SimpleVersion b) => a.CompareTo(b) >= 0;
+
+        public static SimpleVersion Parse(string input)
+        {
+            if (input == null)
+            {
+                throw new ArgumentNullException(nameof(input));
+            }
+
+            var span = RemoveTrivia(input);
+
+            int minor = 0, build = 0, revision = 0;
+
+            if (ParseComponent(ref span, out int major) &&
+                ParseComponent(ref span, out minor) &&
+                ParseComponent(ref span, out build) &&
+                ParseComponent(ref span, out revision))
+            {
+                // More than 4 components (too many dots)
+                throw InvalidVersionFormat();
+            }
+
+            return new SimpleVersion(major, minor, build, revision);
+        }
+
+        private static readonly char[] s_semverSeparators = new char[] { '-', '+' };
+
+        private static ReadOnlySpan<char> RemoveTrivia(string input)
+        {
+            int startIndex = 0;
+            int endIndex = input.Length;
+
+            if (input.Length > 0 && (input[0] == 'v' || input[0] == 'V'))
+            {
+                startIndex = 1;
+            }
+
+            int separatorIndex = input.IndexOfAny(s_semverSeparators, startIndex);
+
+            if (separatorIndex >= 0)
+            {
+                endIndex = separatorIndex;
+            }
+
+            return input.AsSpan().Slice(startIndex, endIndex - startIndex);
+        }
+
+        private static bool ParseComponent(ref ReadOnlySpan<char> span, out int value)
+        {
+            int dotIndex = span.IndexOf('.');
+            if (dotIndex < 0)
+            {
+                value = ParseComponent(span);
+                return false;
+            }
+            else
+            {
+                value = ParseComponent(span.Slice(0, dotIndex));
+                span = span.Slice(dotIndex + 1);
+                return true;
+            }
+        }
+
+        private static int ParseComponent(ReadOnlySpan<char> span)
+        {
+        #if NETFRAMEWORK
+            // Cannot parse int from span on .NET Framework, so allocate the substring
+            var spanOrString = span.ToString();
+        #else
+            var spanOrString = span;
+        #endif
+
+            if (!int.TryParse(spanOrString, NumberStyles.None, CultureInfo.InvariantCulture, out int value))
+            {
+                throw InvalidVersionFormat();
+            }
+
+            // Cannot parse as negative using NumberStyles.None. Also, +/- would have
+            // been stripped as semver trivia earlier.
+            Debug.Assert(value >= 0);
+
+            return value;
+        }
+
+        private static Exception InvalidVersionFormat()
+        {
+            return new FormatException(ResourceUtilities.GetResourceString(nameof(InvalidVersionFormat)));
+        }
+    }
+}

From 8b2bf7fee1a66e57b73fbff5cb5e59961d0d4368 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 14 Nov 2019 09:27:46 -0800
Subject: [PATCH 04/10] Update xlf

---
 src/Build/Resources/xlf/Strings.cs.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.de.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.en.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.es.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.fr.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.it.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.ja.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.ko.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.pl.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.pt-BR.xlf   | 5 +++++
 src/Build/Resources/xlf/Strings.ru.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.tr.xlf      | 5 +++++
 src/Build/Resources/xlf/Strings.zh-Hans.xlf | 5 +++++
 src/Build/Resources/xlf/Strings.zh-Hant.xlf | 5 +++++
 14 files changed, 70 insertions(+)

diff --git a/src/Build/Resources/xlf/Strings.cs.xlf b/src/Build/Resources/xlf/Strings.cs.xlf
index 993f51d0a0f..575fb9d2b28 100644
--- a/src/Build/Resources/xlf/Strings.cs.xlf
+++ b/src/Build/Resources/xlf/Strings.cs.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Následující vstupní soubory mezipaměti pro výsledky neexistují: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Podrobnost protokolování je nastavená na: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.de.xlf b/src/Build/Resources/xlf/Strings.de.xlf
index df0e8e10b37..ef44d1053e4 100644
--- a/src/Build/Resources/xlf/Strings.de.xlf
+++ b/src/Build/Resources/xlf/Strings.de.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Die folgenden Cachedateien für Eingabeergebnisse sind nicht vorhanden: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Die Ausführlichkeit der Protokollierung ist auf "{0}" festgelegt.</target>
diff --git a/src/Build/Resources/xlf/Strings.en.xlf b/src/Build/Resources/xlf/Strings.en.xlf
index 329740a74dd..dbc30a8eaea 100644
--- a/src/Build/Resources/xlf/Strings.en.xlf
+++ b/src/Build/Resources/xlf/Strings.en.xlf
@@ -82,6 +82,11 @@
         <target state="new">MSB4255: The following input result cache files do not exist: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="new">Logging verbosity is set to: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.es.xlf b/src/Build/Resources/xlf/Strings.es.xlf
index 864fbe57782..00e9e290a58 100644
--- a/src/Build/Resources/xlf/Strings.es.xlf
+++ b/src/Build/Resources/xlf/Strings.es.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Los siguientes archivos de caché de resultados de entrada no existen: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">El nivel de detalle de registro está establecido en {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.fr.xlf b/src/Build/Resources/xlf/Strings.fr.xlf
index d988effbe94..1f39a65cc59 100644
--- a/src/Build/Resources/xlf/Strings.fr.xlf
+++ b/src/Build/Resources/xlf/Strings.fr.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Les fichiers cache des résultats d'entrée suivants n'existent pas : "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">La verbosité de la journalisation a la valeur {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.it.xlf b/src/Build/Resources/xlf/Strings.it.xlf
index 629a0127baf..af0a8c46a51 100644
--- a/src/Build/Resources/xlf/Strings.it.xlf
+++ b/src/Build/Resources/xlf/Strings.it.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: i file della cache dei risultati di input seguenti non esistono: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Il livello di dettaglio della registrazione è impostato su: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.ja.xlf b/src/Build/Resources/xlf/Strings.ja.xlf
index 2ab496c55ce..d90659dfc7a 100644
--- a/src/Build/Resources/xlf/Strings.ja.xlf
+++ b/src/Build/Resources/xlf/Strings.ja.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: 以下の入力結果キャッシュ ファイルが存在しません: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">ログの詳細度は次のように設定されています: {0}。</target>
diff --git a/src/Build/Resources/xlf/Strings.ko.xlf b/src/Build/Resources/xlf/Strings.ko.xlf
index 20181edb238..d3d284cfe55 100644
--- a/src/Build/Resources/xlf/Strings.ko.xlf
+++ b/src/Build/Resources/xlf/Strings.ko.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: 다음 입력 결과 캐시 파일이 존재하지 않습니다. "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">로깅의 세부 정보 표시가 {0}(으)로 설정되었습니다.</target>
diff --git a/src/Build/Resources/xlf/Strings.pl.xlf b/src/Build/Resources/xlf/Strings.pl.xlf
index ec22231b769..668f53da6f4 100644
--- a/src/Build/Resources/xlf/Strings.pl.xlf
+++ b/src/Build/Resources/xlf/Strings.pl.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Następujące pliki wejściowej pamięci podręcznej wyników nie istnieją: „{0}”</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Szczegółowość rejestrowania została ustawiona na: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.pt-BR.xlf b/src/Build/Resources/xlf/Strings.pt-BR.xlf
index 3b890f06a8b..0b18d51d7b6 100644
--- a/src/Build/Resources/xlf/Strings.pt-BR.xlf
+++ b/src/Build/Resources/xlf/Strings.pt-BR.xlf
@@ -81,6 +81,11 @@
         <target state="translated">MSB4255: os arquivos de cache do resultado de entrada a seguir não existem: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">O detalhamento do log está definido como: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.ru.xlf b/src/Build/Resources/xlf/Strings.ru.xlf
index 01404f0b650..4f5a0c8949d 100644
--- a/src/Build/Resources/xlf/Strings.ru.xlf
+++ b/src/Build/Resources/xlf/Strings.ru.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: следующие входные файлы кэша результатов не существуют: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Уровень детализации журнала: {0}.</target>
diff --git a/src/Build/Resources/xlf/Strings.tr.xlf b/src/Build/Resources/xlf/Strings.tr.xlf
index 34922a64e0a..25e2be474d5 100644
--- a/src/Build/Resources/xlf/Strings.tr.xlf
+++ b/src/Build/Resources/xlf/Strings.tr.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: Şu giriş sonucu önbellek dosyaları mevcut değil: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">Günlük kaydı ayrıntı düzeyi {0} olarak ayarlandı.</target>
diff --git a/src/Build/Resources/xlf/Strings.zh-Hans.xlf b/src/Build/Resources/xlf/Strings.zh-Hans.xlf
index 53b20f278f4..c39f1678c44 100644
--- a/src/Build/Resources/xlf/Strings.zh-Hans.xlf
+++ b/src/Build/Resources/xlf/Strings.zh-Hans.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: 以下输入结果缓存文件不存在:“{0}”</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">日志记录详细程度设置为: {0}。</target>
diff --git a/src/Build/Resources/xlf/Strings.zh-Hant.xlf b/src/Build/Resources/xlf/Strings.zh-Hant.xlf
index f32bc214aa3..0229c815bd0 100644
--- a/src/Build/Resources/xlf/Strings.zh-Hant.xlf
+++ b/src/Build/Resources/xlf/Strings.zh-Hant.xlf
@@ -82,6 +82,11 @@
         <target state="translated">MSB4255: 下列輸入結果快取檔案不存在: "{0}"</target>
         <note />
       </trans-unit>
+      <trans-unit id="InvalidVersionFormat">
+        <source>Version string was not in a correct format.</source>
+        <target state="new">Version string was not in a correct format.</target>
+        <note />
+      </trans-unit>
       <trans-unit id="LogLoggerVerbosity">
         <source>Logging verbosity is set to: {0}.</source>
         <target state="translated">記錄詳細程度設定為: {0}。</target>

From f3a09257ba4c61515b6aecff2e8876df3209cb77 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 14 Nov 2019 11:06:00 -0800
Subject: [PATCH 05/10] Add intrinsic property functions for version comparison

---
 .../Evaluation/Expander_Tests.cs              | 71 +++++++++++++++++++
 src/Build/Evaluation/IntrinsicFunctions.cs    | 31 ++++++++
 2 files changed, 102 insertions(+)

diff --git a/src/Build.UnitTests/Evaluation/Expander_Tests.cs b/src/Build.UnitTests/Evaluation/Expander_Tests.cs
index ed988519b2a..9a506e4e8c1 100644
--- a/src/Build.UnitTests/Evaluation/Expander_Tests.cs
+++ b/src/Build.UnitTests/Evaluation/Expander_Tests.cs
@@ -2790,6 +2790,77 @@ public void IsOsPlatformShouldBeCaseInsensitiveToParameter()
             Assert.Equal("True", result);
         }
 
+        [Theory]
+        [InlineData("NotAVersion")]
+        [InlineData("1.2.3.4.5")]
+        [InlineData("1,2,3,4")]
+        public void PropertyFunctionVersionComparisonsFailsWithInvalidArguments(string badVersion)
+        {
+            var pg = new PropertyDictionary<ProjectPropertyInstance>();
+            var expander = new Expander<ProjectPropertyInstance, ProjectItemInstance>(pg, FileSystems.Default);
+            string expectedMessage = ResourceUtilities.GetResourceString("InvalidVersionFormat");
+
+            AssertThrows($"$([MSBuild]::VersionGreaterThan('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionGreaterThan('1.0.0', '{badVersion}'))");
+
+            AssertThrows($"$([MSBuild]::VersionGreaterThanOrEquals('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionGreaterThanOrEquals('1.0.0', '{badVersion}'))");
+
+            AssertThrows($"$([MSBuild]::VersionLessThan('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionLessThan('1.0.0', '{badVersion}'))");
+
+            AssertThrows($"$([MSBuild]::VersionLessThanOrEquals('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionLessThanOrEquals('1.0.0', '{badVersion}'))");
+
+            AssertThrows($"$([MSBuild]::VersionEquals('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionEquals('1.0.0', '{badVersion}'))");
+
+            AssertThrows($"$([MSBuild]::VersionNotEquals('{badVersion}', '1.0.0'))");
+            AssertThrows($"$([MSBuild]::VersionNotEquals('1.0.0', '{badVersion}'))");
+
+            void AssertThrows(string expression)
+            {
+                var ex = Assert.Throws<InvalidProjectFileException>(
+                    () => expander.ExpandPropertiesLeaveTypedAndEscaped(
+                        expression,
+                        ExpanderOptions.ExpandProperties,
+                        MockElementLocation.Instance));
+
+                Assert.Contains(expectedMessage, ex.Message);
+            }
+        }
+
+        [Theory]
+        [InlineData("v1.0", "2.1", -1)]
+        [InlineData("3.2", "3.14-pre", -1)]
+        [InlineData("3+metadata", "3.0", 0)]
+        [InlineData("2.1", "2.1.0", 0)]
+        [InlineData("v1.2.3-pre+metadata", "1.2.3.0", 0)]
+        [InlineData("3.14", "3.2", 1)]
+        [InlineData("42.43.44.45", "42.43.44.5", 1)]
+        public void PropertyFunctionVersionComparisons(string a, string b, int expectedSign)
+        {
+            var pg = new PropertyDictionary<ProjectPropertyInstance>();
+            var expander = new Expander<ProjectPropertyInstance, ProjectItemInstance>(pg, FileSystems.Default);
+
+            AssertSuccess(expectedSign >  0, $"$([MSBuild]::VersionGreaterThan('{a}', '{b}'))");
+            AssertSuccess(expectedSign >= 0, $"$([MSBuild]::VersionGreaterThanOrEquals('{a}', '{b}'))");
+            AssertSuccess(expectedSign <  0, $"$([MSBuild]::VersionLessThan('{a}', '{b}'))");
+            AssertSuccess(expectedSign <= 0, $"$([MSBuild]::VersionLessThanOrEquals('{a}', '{b}'))");
+            AssertSuccess(expectedSign == 0, $"$([MSBuild]::VersionEquals('{a}', '{b}'))");
+            AssertSuccess(expectedSign != 0, $"$([MSBuild]::VersionNotEquals('{a}', '{b}'))");
+
+            void AssertSuccess(bool expected, string expression)
+            {
+                bool actual = (bool)expander.ExpandPropertiesLeaveTypedAndEscaped(
+                    expression,
+                    ExpanderOptions.ExpandProperties,
+                    MockElementLocation.Instance);
+
+                Assert.Equal(expected, actual);
+            }
+        }
+
         /// <summary>
         /// Expand property function that calls a method with an enum parameter
         /// </summary>
diff --git a/src/Build/Evaluation/IntrinsicFunctions.cs b/src/Build/Evaluation/IntrinsicFunctions.cs
index bf14d6f2eec..e532306e5c2 100644
--- a/src/Build/Evaluation/IntrinsicFunctions.cs
+++ b/src/Build/Evaluation/IntrinsicFunctions.cs
@@ -12,6 +12,7 @@
 using Microsoft.Build.Internal;
 using Microsoft.Build.Shared;
 using Microsoft.Build.Shared.FileSystem;
+using Microsoft.Build.Utilities;
 using Microsoft.Win32;
 
 // Needed for DoesTaskHostExistForParameters
@@ -449,6 +450,36 @@ internal static bool IsOsBsdLike()
             return NativeMethodsShared.IsBSD;
         }
 
+        internal static bool VersionEquals(string a, string b)
+        {
+            return SimpleVersion.Parse(a) == SimpleVersion.Parse(b);
+        }
+
+        internal static bool VersionNotEquals(string a, string b)
+        {
+            return SimpleVersion.Parse(a) != SimpleVersion.Parse(b);
+        }
+
+        internal static bool VersionGreaterThan(string a, string b)
+        {
+            return SimpleVersion.Parse(a) > SimpleVersion.Parse(b);
+        }
+
+        internal static bool VersionGreaterThanOrEquals(string a, string b)
+        {
+            return SimpleVersion.Parse(a) >= SimpleVersion.Parse(b);
+        }
+
+        internal static bool VersionLessThan(string a, string b)
+        {
+            return SimpleVersion.Parse(a) < SimpleVersion.Parse(b);
+        }
+
+        internal static bool VersionLessThanOrEquals(string a, string b)
+        {
+            return SimpleVersion.Parse(a) <= SimpleVersion.Parse(b);
+        }
+
         public static string GetCurrentToolsDirectory()
         {
             return BuildEnvironmentHelper.Instance.CurrentMSBuildToolsDirectory;

From a54c5be6b5c34e69e35a7114d44bf7288b85bf26 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 14 Nov 2019 11:14:38 -0800
Subject: [PATCH 06/10] Add fast paths for version comparison intrinsics

---
 src/Build/Evaluation/Expander.cs | 48 ++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/Build/Evaluation/Expander.cs b/src/Build/Evaluation/Expander.cs
index 093716627d5..db90237b35e 100644
--- a/src/Build/Evaluation/Expander.cs
+++ b/src/Build/Evaluation/Expander.cs
@@ -3865,6 +3865,54 @@ private bool TryExecuteWellKnownFunction(out object returnVal, object objectInst
                                 return true;
                             }
                         }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionEquals), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionEquals(arg0, arg1);
+                                return true;
+                            }
+                        }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionNotEquals), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionNotEquals(arg0, arg1);
+                                return true;
+                            }
+                        }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionGreaterThan), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionGreaterThan(arg0, arg1);
+                                return true;
+                            }
+                        }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionGreaterThanOrEquals), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionGreaterThanOrEquals(arg0, arg1);
+                                return true;
+                            }
+                        }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionLessThan), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionLessThan(arg0, arg1);
+                                return true;
+                            }
+                        }
+                        else if (string.Equals(_methodMethodName, nameof(IntrinsicFunctions.VersionLessThanOrEquals), StringComparison.OrdinalIgnoreCase))
+                        {
+                            if (TryGetArgs(args, out string arg0, out string arg1))
+                            {
+                                returnVal = IntrinsicFunctions.VersionLessThanOrEquals(arg0, arg1);
+                                return true;
+                            }
+                        }
                     }
                     else if (_receiverType == typeof(Path))
                     {

From a43c9462948238ce5be96c45d05223082eaa51af Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2019 21:01:35 +0000
Subject: [PATCH 07/10] [master] Update dependencies from dotnet/arcade (#4920)

* Update dependencies from https://github.com/dotnet/arcade build 20191111.9

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19561.9

* Add new Arcade feed to NuGet.config

Reaction to dotnet/arcade#4197.
---
 NuGet.config                                  |   2 +-
 eng/Version.Details.xml                       |   4 +-
 .../post-build/channels/general-testing.yml   | 142 ++++++++++++++++++
 ...ation.yml => netcore-3-eng-validation.yml} |   6 +-
 ...{netcore-3-tools.yml => netcore-3-eng.yml} |   6 +-
 .../channels/netcore-blazor-31-features.yml   | 142 ++++++++++++++++++
 ...ools-latest.yml => netcore-eng-latest.yml} |   6 +-
 ...idation.yml => netcore-eng-validation.yml} |   6 +-
 .../channels/netcore-internal-30.yml          |   2 +
 .../templates/post-build/common-variables.yml |   8 +
 .../templates/post-build/post-build.yml       |  23 ++-
 global.json                                   |   2 +-
 12 files changed, 328 insertions(+), 21 deletions(-)
 create mode 100644 eng/common/templates/post-build/channels/general-testing.yml
 rename eng/common/templates/post-build/channels/{netcore-3-tools-validation.yml => netcore-3-eng-validation.yml} (95%)
 rename eng/common/templates/post-build/channels/{netcore-3-tools.yml => netcore-3-eng.yml} (96%)
 create mode 100644 eng/common/templates/post-build/channels/netcore-blazor-31-features.yml
 rename eng/common/templates/post-build/channels/{netcore-tools-latest.yml => netcore-eng-latest.yml} (96%)
 rename eng/common/templates/post-build/channels/{netcore-tools-validation.yml => netcore-eng-validation.yml} (95%)

diff --git a/NuGet.config b/NuGet.config
index 520a816ab89..5e45df013f4 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -3,7 +3,7 @@
   <packageSources>
     <clear />
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
-    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
+    <add key="arcade" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
     <add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 6c52cd08809..18678ce2137 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19517.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19561.9">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a42a124635ce1a218309ecb31ec59d559cacb886</Sha>
+      <Sha>e7685a7c81f13d9c21a020e77a1ab3b121fdd874</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/post-build/channels/general-testing.yml b/eng/common/templates/post-build/channels/general-testing.yml
new file mode 100644
index 00000000000..c42cb9ae250
--- /dev/null
+++ b/eng/common/templates/post-build/channels/general-testing.yml
@@ -0,0 +1,142 @@
+parameters:
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
+  symbolPublishingAdditionalParameters: ''
+
+stages:
+- stage: General_Testing_Publish
+  dependsOn: validate
+  variables:
+    - template: ../common-variables.yml
+  displayName: General Testing Publishing
+  jobs:
+  - template: ../setup-maestro-vars.yml
+
+  - job:
+    displayName: Symbol Publishing
+    dependsOn: setupMaestroVars
+    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
+    variables:
+      - group: DotNet-Symbol-Server-Pats
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Blob Artifacts
+        inputs:
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
+
+      # This is necessary whenever we want to publish/restore to an AzDO private feed
+      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
+      # otherwise it'll complain about accessing a private feed.
+      - task: NuGetAuthenticate@0
+        displayName: 'Authenticate to AzDO Feeds'
+
+      - task: PowerShell@2
+        displayName: Enable cross-org publishing
+        inputs:
+          filePath: eng\common\enable-cross-org-publishing.ps1
+          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
+
+      - task: PowerShell@2
+        displayName: Publish
+        inputs:
+          filePath: eng\common\sdk-task.ps1
+          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
+            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
+            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
+            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
+            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+            /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
+
+  - job: publish_assets
+    displayName: Publish Assets
+    dependsOn: setupMaestroVars
+    variables:
+      - name: BARBuildId
+        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
+      - name: IsStableBuild
+        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
+    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.GeneralTesting_Channel_Id))
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Package Artifacts
+        inputs:
+          buildType: current
+          artifactName: PackageArtifacts
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Blob Artifacts
+        inputs:
+          buildType: current
+          artifactName: BlobArtifacts
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Asset Manifests
+        inputs:
+          buildType: current
+          artifactName: AssetManifests
+
+      - task: NuGetToolInstaller@1
+        displayName: 'Install NuGet.exe'
+
+      # This is necessary whenever we want to publish/restore to an AzDO private feed
+      - task: NuGetAuthenticate@0
+        displayName: 'Authenticate to AzDO Feeds'
+
+      - task: PowerShell@2
+        displayName: Enable cross-org publishing
+        inputs:
+          filePath: eng\common\enable-cross-org-publishing.ps1
+          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
+
+      - task: PowerShell@2
+        displayName: Publish Assets
+        inputs:
+          filePath: eng\common\sdk-task.ps1
+          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
+            /p:ArtifactsCategory=$(_DotNetArtifactsCategory)
+            /p:IsStableBuild=$(IsStableBuild)
+            /p:IsInternalBuild=$(IsInternalBuild)
+            /p:RepositoryName=$(Build.Repository.Name)
+            /p:CommitSha=$(Build.SourceVersion)
+            /p:NugetPath=$(NuGetExeToolPath)
+            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
+            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
+            /p:BARBuildId=$(BARBuildId)
+            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
+            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
+            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
+            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
+            /p:Configuration=Release
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            /p:PublishToAzureDevOpsNuGetFeeds=true
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/general-testing-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
+
+      - template: ../../steps/promote-build.yml
+        parameters:
+          ChannelId: ${{ variables.GeneralTesting_Channel_Id }}
diff --git a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-3-eng-validation.yml
similarity index 95%
rename from eng/common/templates/post-build/channels/netcore-3-tools-validation.yml
rename to eng/common/templates/post-build/channels/netcore-3-eng-validation.yml
index cdb74031fcf..59386fad7d6 100644
--- a/eng/common/templates/post-build/channels/netcore-3-tools-validation.yml
+++ b/eng/common/templates/post-build/channels/netcore-3-eng-validation.yml
@@ -82,11 +82,11 @@ stages:
             /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
             /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
             /p:PublishToAzureDevOpsNuGetFeeds=true
-            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
             /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
             ${{ parameters.artifactsPublishingAdditionalParameters }}
 
diff --git a/eng/common/templates/post-build/channels/netcore-3-tools.yml b/eng/common/templates/post-build/channels/netcore-3-eng.yml
similarity index 96%
rename from eng/common/templates/post-build/channels/netcore-3-tools.yml
rename to eng/common/templates/post-build/channels/netcore-3-eng.yml
index 70eec773e75..96fe4fb9712 100644
--- a/eng/common/templates/post-build/channels/netcore-3-tools.yml
+++ b/eng/common/templates/post-build/channels/netcore-3-eng.yml
@@ -117,11 +117,11 @@ stages:
             /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
             /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
             /p:PublishToAzureDevOpsNuGetFeeds=true
-            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
             /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
             ${{ parameters.artifactsPublishingAdditionalParameters }}
 
diff --git a/eng/common/templates/post-build/channels/netcore-blazor-31-features.yml b/eng/common/templates/post-build/channels/netcore-blazor-31-features.yml
new file mode 100644
index 00000000000..252ac239760
--- /dev/null
+++ b/eng/common/templates/post-build/channels/netcore-blazor-31-features.yml
@@ -0,0 +1,142 @@
+parameters:
+  artifactsPublishingAdditionalParameters: ''
+  publishInstallersAndChecksums: false
+  symbolPublishingAdditionalParameters: ''
+
+stages:
+- stage: NetCore_Blazor31_Features_Publish
+  dependsOn: validate
+  variables:
+    - template: ../common-variables.yml
+  displayName: .NET Core 3.1 Blazor Features Publishing
+  jobs:
+  - template: ../setup-maestro-vars.yml
+
+  - job:
+    displayName: Symbol Publishing
+    dependsOn: setupMaestroVars
+    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features))
+    variables:
+      - group: DotNet-Symbol-Server-Pats
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Blob Artifacts
+        inputs:
+          artifactName: 'BlobArtifacts'
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download PDB Artifacts
+        inputs:
+          artifactName: 'PDBArtifacts'
+        continueOnError: true
+
+      # This is necessary whenever we want to publish/restore to an AzDO private feed
+      # Since sdk-task.ps1 tries to restore packages we need to do this authentication here
+      # otherwise it'll complain about accessing a private feed.
+      - task: NuGetAuthenticate@0
+        displayName: 'Authenticate to AzDO Feeds'
+
+      - task: PowerShell@2
+        displayName: Enable cross-org publishing
+        inputs:
+          filePath: eng\common\enable-cross-org-publishing.ps1
+          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
+
+      - task: PowerShell@2
+        displayName: Publish
+        inputs:
+          filePath: eng\common\sdk-task.ps1
+          arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet
+            /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
+            /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
+            /p:PDBArtifactsDirectory='$(Build.ArtifactStagingDirectory)/PDBArtifacts/'
+            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:SymbolPublishingExclusionsFile='$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt'
+            /p:Configuration=Release
+            ${{ parameters.symbolPublishingAdditionalParameters }}
+
+  - job: publish_assets
+    displayName: Publish Assets
+    dependsOn: setupMaestroVars
+    variables:
+      - name: BARBuildId
+        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
+      - name: IsStableBuild
+        value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.IsStableBuild'] ]
+    condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], format('[{0}]', variables.NetCore_31_Blazor_Features))
+    pool:
+      vmImage: 'windows-2019'
+    steps:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Package Artifacts
+        inputs:
+          buildType: current
+          artifactName: PackageArtifacts
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Blob Artifacts
+        inputs:
+          buildType: current
+          artifactName: BlobArtifacts
+        continueOnError: true
+
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Asset Manifests
+        inputs:
+          buildType: current
+          artifactName: AssetManifests
+
+      - task: NuGetToolInstaller@1
+        displayName: 'Install NuGet.exe'
+
+      # This is necessary whenever we want to publish/restore to an AzDO private feed
+      - task: NuGetAuthenticate@0
+        displayName: 'Authenticate to AzDO Feeds'
+
+      - task: PowerShell@2
+        displayName: Enable cross-org publishing
+        inputs:
+          filePath: eng\common\enable-cross-org-publishing.ps1
+          arguments: -token $(dn-bot-dnceng-artifact-feeds-rw)
+
+      - task: PowerShell@2
+        displayName: Publish Assets
+        inputs:
+          filePath: eng\common\sdk-task.ps1
+          arguments: -task PublishArtifactsInManifest -restore -msbuildEngine dotnet
+            /p:ArtifactsCategory=$(_DotNetArtifactsCategory)
+            /p:IsStableBuild=$(IsStableBuild)
+            /p:IsInternalBuild=$(IsInternalBuild)
+            /p:RepositoryName=$(Build.Repository.Name)
+            /p:CommitSha=$(Build.SourceVersion)
+            /p:NugetPath=$(NuGetExeToolPath)
+            /p:AzdoTargetFeedPAT='$(dn-bot-dnceng-universal-packages-rw)'
+            /p:AzureStorageTargetFeedPAT='$(dotnetfeed-storage-access-key-1)'
+            /p:BARBuildId=$(BARBuildId)
+            /p:MaestroApiEndpoint='$(MaestroApiEndPoint)'
+            /p:BuildAssetRegistryToken='$(MaestroApiAccessToken)'
+            /p:ManifestsBasePath='$(Build.ArtifactStagingDirectory)/AssetManifests/'
+            /p:BlobBasePath='$(Build.ArtifactStagingDirectory)/BlobArtifacts/'
+            /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts/'
+            /p:Configuration=Release
+            /p:PublishInstallersAndChecksums=${{ parameters.publishInstallersAndChecksums }}
+            /p:InstallersTargetStaticFeed=$(InstallersBlobFeedUrl)
+            /p:InstallersAzureAccountKey=$(dotnetcli-storage-key)
+            /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
+            /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
+            /p:PublishToAzureDevOpsNuGetFeeds=true
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-blazor-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            ${{ parameters.artifactsPublishingAdditionalParameters }}
+
+      - template: ../../steps/promote-build.yml
+        parameters:
+          ChannelId: ${{ variables.NetCore_31_Blazor_Features }}
diff --git a/eng/common/templates/post-build/channels/netcore-tools-latest.yml b/eng/common/templates/post-build/channels/netcore-eng-latest.yml
similarity index 96%
rename from eng/common/templates/post-build/channels/netcore-tools-latest.yml
rename to eng/common/templates/post-build/channels/netcore-eng-latest.yml
index 157d2d4b977..e675dc01ceb 100644
--- a/eng/common/templates/post-build/channels/netcore-tools-latest.yml
+++ b/eng/common/templates/post-build/channels/netcore-eng-latest.yml
@@ -117,11 +117,11 @@ stages:
             /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
             /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
             /p:PublishToAzureDevOpsNuGetFeeds=true
-            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
             /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
             ${{ parameters.artifactsPublishingAdditionalParameters }}
 
diff --git a/eng/common/templates/post-build/channels/netcore-tools-validation.yml b/eng/common/templates/post-build/channels/netcore-eng-validation.yml
similarity index 95%
rename from eng/common/templates/post-build/channels/netcore-tools-validation.yml
rename to eng/common/templates/post-build/channels/netcore-eng-validation.yml
index d8447e49af6..98d287d49dc 100644
--- a/eng/common/templates/post-build/channels/netcore-tools-validation.yml
+++ b/eng/common/templates/post-build/channels/netcore-eng-validation.yml
@@ -82,11 +82,11 @@ stages:
             /p:ChecksumsTargetStaticFeed=$(ChecksumsBlobFeedUrl)
             /p:ChecksumsAzureAccountKey=$(dotnetclichecksums-storage-key)
             /p:PublishToAzureDevOpsNuGetFeeds=true
-            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
+            /p:AzureDevOpsStaticTransportFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json'
             /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
-            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
+            /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng-symbols/nuget/v3/index.json'
             /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
             ${{ parameters.artifactsPublishingAdditionalParameters }}
 
diff --git a/eng/common/templates/post-build/channels/netcore-internal-30.yml b/eng/common/templates/post-build/channels/netcore-internal-30.yml
index 177b38df357..0d382bb0aa4 100644
--- a/eng/common/templates/post-build/channels/netcore-internal-30.yml
+++ b/eng/common/templates/post-build/channels/netcore-internal-30.yml
@@ -1,4 +1,5 @@
 parameters:
+  publishInstallersAndChecksums: false
   symbolPublishingAdditionalParameters: ''
   artifactsPublishingAdditionalParameters: ''
 
@@ -121,6 +122,7 @@ stages:
             /p:AzureDevOpsStaticTransportFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
             /p:AzureDevOpsStaticSymbolsFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-symbols/nuget/v3/index.json'
             /p:AzureDevOpsStaticSymbolsFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
+            /p:PublishToMSDL=false
             ${{ parameters.artifactsPublishingAdditionalParameters }}
 
       - template: ../../steps/promote-build.yml
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index b4eed6f186c..57d430b4206 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -39,6 +39,14 @@ variables:
   - name: PublicRelease_31_Channel_Id
     value: 129
 
+  # General Testing
+  - name: GeneralTesting_Channel_Id
+    value: 529
+
+  # .NET Core 3.1 Blazor Features
+  - name: NetCore_31_Blazor_Features
+    value: 531
+
   # Whether the build is internal or not
   - name: IsInternalBuild
     value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }}
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 7ee82d9ff18..5b7f40959cc 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -97,9 +97,9 @@ stages:
 
 - template: \eng\common\templates\post-build\channels\netcore-dev-5.yml
   parameters:
-    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
 
 - template: \eng\common\templates\post-build\channels\netcore-dev-31.yml
   parameters:
@@ -107,23 +107,23 @@ stages:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
-- template: \eng\common\templates\post-build\channels\netcore-tools-latest.yml
+- template: \eng\common\templates\post-build\channels\netcore-eng-latest.yml
   parameters:
     symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
-- template: \eng\common\templates\post-build\channels\netcore-tools-validation.yml
+- template: \eng\common\templates\post-build\channels\netcore-eng-validation.yml
   parameters:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
-- template: \eng\common\templates\post-build\channels\netcore-3-tools-validation.yml
+- template: \eng\common\templates\post-build\channels\netcore-3-eng-validation.yml
   parameters:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
-- template: \eng\common\templates\post-build\channels\netcore-3-tools.yml
+- template: \eng\common\templates\post-build\channels\netcore-3-eng.yml
   parameters:
     symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
@@ -141,7 +141,20 @@ stages:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
     publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
 
+- template: \eng\common\templates\post-build\channels\netcore-blazor-31-features.yml
+  parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+
 - template: \eng\common\templates\post-build\channels\netcore-internal-30.yml
   parameters:
+    artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
     symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
+
+- template: \eng\common\templates\post-build\channels\general-testing.yml
+  parameters:
     artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
+    publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
+    symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
diff --git a/global.json b/global.json
index aa38cedadcf..8af4593ef5b 100644
--- a/global.json
+++ b/global.json
@@ -12,6 +12,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19517.3"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19561.9"
   }
 }

From 79a20b37b3fa8c7f02356e93b541f9901cc03917 Mon Sep 17 00:00:00 2001
From: Forgind <Forgind@users.noreply.github.com>
Date: Thu, 14 Nov 2019 13:45:43 -0800
Subject: [PATCH 08/10] Include path to MSBuild in node handshake salt (#4888)

* Change the salt to use ExecutingAssemblyPath

Prevent unwanted node reuse.
This is unique to each executing assembly, so it should resolve the problem.
---
 src/Shared/CommunicationsUtilities.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Shared/CommunicationsUtilities.cs b/src/Shared/CommunicationsUtilities.cs
index 5a4fef55197..b0fb5f4708f 100644
--- a/src/Shared/CommunicationsUtilities.cs
+++ b/src/Shared/CommunicationsUtilities.cs
@@ -655,14 +655,7 @@ internal static void Trace(int nodeId, string format, params object[] args)
         /// <returns>Base Handshake</returns>
         private static long GetBaseHandshakeForContext(TaskHostContext hostContext)
         {
-            string salt = Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT");
-
-            long nodeHandshakeSalt = 0;
-
-            if (!string.IsNullOrEmpty(salt))
-            {
-                nodeHandshakeSalt = GetHandshakeHashCode(salt);
-            }
+            long salt = GetHandshakeHashCode(Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT") + FileUtilities.ExecutingAssemblyPath);
 
             //FileVersionHash (32 bits) is shifted 8 bits to avoid session ID collision
             //hostContext (4 bits) is shifted just after the FileVersionHash
@@ -670,7 +663,7 @@ private static long GetBaseHandshakeForContext(TaskHostContext hostContext)
             //the most significant byte (leftmost 8 bits) will get zero'd out to avoid connecting to older builds.
             //| masked out | nodeHandshakeSalt | hostContext |              fileVersionHash             | SessionID
             //  0000 0000     0000 0000 0000        0000        0000 0000 0000 0000 0000 0000 0000 0000   0000 0000
-            long baseHandshake = (nodeHandshakeSalt << 44) | ((long)hostContext << 40) | ((long)FileVersionHash << 8);
+            long baseHandshake = (salt << 44) | ((long)hostContext << 40) | ((long)FileVersionHash << 8);
             return baseHandshake;
         }
 

From 6ad2b8ec72049ac5eb052bfd2def821bbec1388f Mon Sep 17 00:00:00 2001
From: Rainer Sigwald <raines@microsoft.com>
Date: Mon, 18 Nov 2019 13:39:54 -0600
Subject: [PATCH 09/10] Use directory-of-MSBuild in node handshake (#4928)

Because CommunicationsUtilities is in Shared, it can get compiled into multiple
different assemblies. Important here are MSBuild.exe, MSBuildTaskHost.exe and
Microsoft.Build.dll.

If the method called during the handshake is from a mismatched assembly from
the host, the handshake can spuriously mismatch. But we can't unify on a
single assembly because MSBuildTaskHost doesn't load any other modern assemblies
(only .NET 3.5 MSBuild assemblies).

Instead, use the directory of the running MSBuild assembly in the handshake.
All current distributions of MSBuild require having all the assemblies in the
same directory and loading them together as a set, so this should not lose
generality.

Also added logging of the components of the hash under
MSBUILDDEBUGCOMM.

Co-authored-by: Nathan Mytelka <Forgind@users.noreply.github.com>
---
 src/Shared/CommunicationsUtilities.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Shared/CommunicationsUtilities.cs b/src/Shared/CommunicationsUtilities.cs
index b0fb5f4708f..9218001291e 100644
--- a/src/Shared/CommunicationsUtilities.cs
+++ b/src/Shared/CommunicationsUtilities.cs
@@ -655,7 +655,14 @@ internal static void Trace(int nodeId, string format, params object[] args)
         /// <returns>Base Handshake</returns>
         private static long GetBaseHandshakeForContext(TaskHostContext hostContext)
         {
-            long salt = GetHandshakeHashCode(Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT") + FileUtilities.ExecutingAssemblyPath);
+            // Use the directory, rather than the full path, because this is in Shared and may
+            // be compiled into several different assemblies. We also want to make sure
+            // MSBuildTaskHost.exe gets the same path as MSBuild.exe/Microsoft.Build.dll.
+            string msbuildDirectory = Path.GetDirectoryName(FileUtilities.ExecutingAssemblyPath);
+            string salt = Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT") + msbuildDirectory;
+            long nodeHandshakeSalt = GetHandshakeHashCode(salt);
+
+            Trace("MSBUILDNODEHANDSHAKESALT=\"{0}\", msbuildDirectory=\"{1}\", hostContext={2}, FileVersionHash={3}", Environment.GetEnvironmentVariable("MSBUILDNODEHANDSHAKESALT"), msbuildDirectory, hostContext, FileVersionHash);
 
             //FileVersionHash (32 bits) is shifted 8 bits to avoid session ID collision
             //hostContext (4 bits) is shifted just after the FileVersionHash
@@ -663,7 +670,7 @@ private static long GetBaseHandshakeForContext(TaskHostContext hostContext)
             //the most significant byte (leftmost 8 bits) will get zero'd out to avoid connecting to older builds.
             //| masked out | nodeHandshakeSalt | hostContext |              fileVersionHash             | SessionID
             //  0000 0000     0000 0000 0000        0000        0000 0000 0000 0000 0000 0000 0000 0000   0000 0000
-            long baseHandshake = (salt << 44) | ((long)hostContext << 40) | ((long)FileVersionHash << 8);
+            long baseHandshake = (nodeHandshakeSalt << 44) | ((long)hostContext << 40) | ((long)FileVersionHash << 8);
             return baseHandshake;
         }
 

From 8eda0fac789ac3314a14bf002bd9b6e8ab382aca Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2019 13:40:44 -0600
Subject: [PATCH 10/10] Update dependencies from
 https://github.com/dotnet/arcade build 20191114.3 (#4924)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19564.3
---
 eng/Version.Details.xml                       |  4 +--
 eng/common/templates/job/execute-sdl.yml      | 28 ++++++++++++++-----
 .../templates/post-build/post-build.yml       |  2 ++
 global.json                                   |  2 +-
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 18678ce2137..93f451538c4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19561.9">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19564.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>e7685a7c81f13d9c21a020e77a1ab3b121fdd874</Sha>
+      <Sha>2485d69f4aebb147ab4ec1755555ffa24a3c6b1b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index a7f99641952..52e2ff021d7 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -6,6 +6,11 @@ parameters:
   # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter
   sdlContinueOnError: false                                    # optional: determines whether to continue the build if the step errors;
   dependsOn: ''                                                # Optional: dependencies of the job
+  artifactNames: ''                                            # Optional: patterns supplied to DownloadBuildArtifacts
+                                                               # Usage:
+                                                               #  artifactNames:
+                                                               #    - 'BlobArtifacts'
+                                                               #    - 'Artifacts_Windows_NT_Release'
 
 jobs:
 - job: Run_SDL
@@ -18,13 +23,22 @@ jobs:
   steps:
   - checkout: self
     clean: true
-  - task: DownloadBuildArtifacts@0
-    displayName: Download Build Artifacts
-    inputs:
-      buildType: current
-      downloadType: specific files
-      matchingPattern: "**"
-      downloadPath: $(Build.SourcesDirectory)\artifacts
+  - ${{ if ne(parameters.artifactNames, '') }}:
+    - ${{ each artifactName in parameters.artifactNames }}:
+      - task: DownloadBuildArtifacts@0
+        displayName: Download Build Artifacts
+        inputs:
+          buildType: current
+          artifactName: ${{ artifactName }}
+          downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
+  - ${{ if eq(parameters.artifactNames, '') }}:
+    - task: DownloadBuildArtifacts@0
+      displayName: Download Build Artifacts
+      inputs:
+        buildType: current
+        downloadType: specific files
+        itemPattern: "**"
+        downloadPath: $(Build.ArtifactStagingDirectory)\artifacts
   - powershell: eng/common/sdl/extract-artifact-packages.ps1
       -InputPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts
       -ExtractPath $(Build.SourcesDirectory)\artifacts\BlobArtifacts
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 5b7f40959cc..93bae6e0070 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -8,6 +8,7 @@ parameters:
     enable: false
     continueOnError: false
     params: ''
+    artifactNames: ''
 
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
@@ -94,6 +95,7 @@ stages:
       parameters:
         additionalParameters: ${{ parameters.SDLValidationParameters.params }}
         continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }}
+        artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }}
 
 - template: \eng\common\templates\post-build\channels\netcore-dev-5.yml
   parameters:
diff --git a/global.json b/global.json
index 8af4593ef5b..d07b1d9dbc1 100644
--- a/global.json
+++ b/global.json
@@ -12,6 +12,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19561.9"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19564.3"
   }
 }