Merge remote-tracking branch 'origin/master' into xplat-master

radical · Nov 14, 2019 · d01ce2e · d01ce2e
2 parents f947512 + d72e250
commit d01ce2e
Show file tree

Hide file tree

Showing 147 changed files with 1,106 additions and 1,482 deletions.
diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
@@ -11,6 +11,11 @@ trigger:
 #   SkipApplyOptimizationData: false
 
 variables:
+  - name: SourceBranch
+    value: $(IbcSourceBranchName)
+  - ${{ if startsWith(variables['Build.SourceBranch'], 'refs/heads/exp/') }}:
+    - name: SourceBranch
+      value: master
   - name: _DotNetArtifactsCategory
     value: .NETCore
   - name: _DotNetValidationArtifactsCategory
@@ -78,7 +83,7 @@ stages:
                 -officialBuildId $(Build.BuildNumber)
                 -officialSkipApplyOptimizationData $(SkipApplyOptimizationData)
                 /p:RepositoryName=$(Build.Repository.Name)
-                /p:VisualStudioIbcSourceBranchName=$(IbcSourceBranchName)
+                /p:VisualStudioIbcSourceBranchName=$(SourceBranch)
                 /p:VisualStudioDropAccessToken=$(System.AccessToken)
                 /p:VisualStudioDropName=$(VisualStudio.DropName)
                 /p:DotNetSignType=$(SignType)

diff --git a/README.md b/README.md
@@ -6,13 +6,13 @@ For more information on MSBuild, see the [MSBuild documentation](https://docs.mi
 
 ### Build Status
 
-The current development branch is `master`. Changes in `master` will go into a future update of MSBuild, which will release with Visual Studio 16.4 and a corresponding version of the .NET Core SDK.
+The current development branch is `master`. Changes in `master` will go into a future update of MSBuild, which will release with Visual Studio 16.5 and a corresponding version of the .NET Core SDK.
 
 [![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=master)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=master)
 
-We have forked for MSBuild 16.3 in the branch [`vs16.3`](https://github.com/Microsoft/msbuild/tree/vs16.3). Changes to that branch need special approval.
+We have forked for MSBuild 16.4 in the branch [`vs16.4`](https://github.com/Microsoft/msbuild/tree/vs16.4). Changes to that branch need special approval.
 
-[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.3)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.3)
+[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.4)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.4)
 
 MSBuild 16.0 builds from the branch [`vs16.0`](https://github.com/Microsoft/msbuild/tree/vs16.0). Only high-priority bugfixes will be considered for servicing 16.0.
 

diff --git a/documentation/specs/event-source.md b/documentation/specs/event-source.md
diff --git a/documentation/specs/event-source.txt b/documentation/specs/event-source.txt
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -15,7 +15,7 @@
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
   </PropertyGroup>
   <PropertyGroup>
-    <VersionPrefix>16.4.0</VersionPrefix>
+    <VersionPrefix>16.5.0</VersionPrefix>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>

diff --git a/scripts/Deploy-MSBuild.ps1 b/scripts/Deploy-MSBuild.ps1
@@ -37,7 +37,31 @@ $filesToCopyToBin = @(
     "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.Tasks.Core.dll"
     "artifacts\bin\MSBuild.Bootstrap\$configuration\net472\Microsoft.Build.Utilities.Core.dll"
     "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.exe"
-    "artifacts\bin\MSBuildTaskHost\$configuration\net35\MSBuildTaskHost.pdb")
+    "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"
+)
 
 foreach ($file in $filesToCopyToBin) {
     Copy-WithBackup $([IO.Path]::Combine($PSScriptRoot, "..", $file))

diff --git a/src/Build.OM.UnitTests/Construction/ProjectRootElement_Tests.cs b/src/Build.OM.UnitTests/Construction/ProjectRootElement_Tests.cs
@@ -901,14 +901,11 @@ public void ItemsEnumerator()
         /// Build a solution file that can't be accessed
         /// </summary>
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]  // Security classes are not supported on Unix
+
         public void SolutionCanNotBeOpened()
         {
-            if (NativeMethodsShared.IsUnixLike)
-            {
-                // Security classes are not supported on Unix
-                return;
-            }
-
+
             Assert.Throws<InvalidProjectFileException>(() =>
             {
                 string solutionFile = null;
@@ -956,13 +953,10 @@ public void SolutionCanNotBeOpened()
         /// Build a project file that can't be accessed
         /// </summary>
         [Fact]
+        [PlatformSpecific (TestPlatforms.Windows)]
+        // FileSecurity class is not supported on Unix
         public void ProjectCanNotBeOpened()
         {
-            if (NativeMethodsShared.IsUnixLike)
-            {
-                return; // FileSecurity class is not supported on Unix
-            }
-
             Assert.Throws<InvalidProjectFileException>(() =>
             {
                 string projectFile = null;
@@ -1037,12 +1031,9 @@ public void SolutionCorrupt()
         /// Open lots of projects concurrently to try to trigger problems
         /// </summary>
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)]  //This test is platform specific for Windows
         public void ConcurrentProjectOpenAndCloseThroughProject()
         {
-            if (NativeMethodsShared.IsUnixLike)
-            {
-                return; // TODO: This test hangs on Linux. Investigate
-            }
 
             int iterations = 500;
             string[] paths = ObjectModelHelpers.GetTempFiles(iterations);

diff --git a/src/Build.OM.UnitTests/LazyFormattedEventArgs_Tests.cs b/src/Build.OM.UnitTests/LazyFormattedEventArgs_Tests.cs
@@ -44,7 +44,7 @@ public void DoNotCrashOnInvalidFormatExpression()
      <Task>
        <Code Type=`Fragment` Language=`cs`>
          this.Log.LogError(`Correct: {0}`, `[goodone]`);
-         this.Log.LogError(`This is a message logged from a task {1} blah blah [crashing].`, `[crasher]`); 
+         this.Log.LogError(`This is a message logged from a task {1} blah blah [crashing].`, `[crasher]`);
 
             try
             {
@@ -108,4 +108,4 @@ public void DoNotCrashOnInvalidFormatExpression()
         }
 #endif
     }
-}
+}
diff --git a/src/Build.OM.UnitTests/TransientIO.cs b/src/Build.OM.UnitTests/TransientIO.cs
@@ -13,14 +13,14 @@ public class TransientIO : IDisposable
         private DirectoryInfo root;
         private TransientIO Parent { get; }
         private string SubFolder { get; }
-        private Dictionary<string, TransientIO> Children = new Dictionary<string, TransientIO>(StringComparer.OrdinalIgnoreCase); 
+        private Dictionary<string, TransientIO> Children = new Dictionary<string, TransientIO>(StringComparer.OrdinalIgnoreCase);
 
         private DirectoryInfo EnsureTempRoot()
         {
             if (this.root == null)
             {
                 this.root = new DirectoryInfo(
-                    this.Parent != null ? 
+                    this.Parent != null ?
                           this.Parent.GetAbsolutePath(this.SubFolder)
                         : FileUtilities.GetTemporaryDirectory(true)
                 );
@@ -129,7 +129,7 @@ private void Reset()
         public void Dispose()
         {
             this.Clear();
-            // this object still can be used ... 
+            // this object still can be used ...
         }
 
     }

diff --git a/src/Build.UnitTests/ConsoleLogger_Tests.cs b/src/Build.UnitTests/ConsoleLogger_Tests.cs
@@ -560,7 +560,6 @@ public void ColorTest(string expectedMessageType, string expectedColor, bool par
 
                 if (expectedMessageType.Equals("message"))
                 {
-
                     console.ToString().ShouldMatch($@"<{expectedColor}><cyan>\d\d:\d\d:\d\d\.\d\d\d\s+\d+><reset color>{Regex.Escape(file)}\({lineNumber}\): {subcategory} {expectedMessageType} {code}: {message} \(TaskId:\d+\){Environment.NewLine}<reset color>");
                 }
                 else
@@ -575,7 +574,7 @@ public void ColorTest(string expectedMessageType, string expectedColor, bool par
                 console.ToString().ShouldMatch($@"<{expectedColor}>{Regex.Escape(file)}\({lineNumber}\): {subcategory} {expectedMessageType} {code}: {message}{Environment.NewLine}<reset color>");
             }
         }
-        
+
 
         [Fact]
         public void TestQuietWithHighMessage()
@@ -1176,13 +1175,13 @@ public void NestedProjectNormal()
             sc.ToString().ShouldBe("<cyan>" + BaseConsoleLogger.projectSeparatorLine + Environment.NewLine +
                                    ResourceUtilities.FormatResourceStringStripCodeAndKeyword("ProjectStartedPrefixForTopLevelProjectWithDefaultTargets", "fname1") + Environment.NewLine +
                                    Environment.NewLine + "<reset color>");
-            
+
             sc.Clear();
 
             es.Consume(new TargetStartedEventArgs("ts", null,
                                                      "tarname", "fname", "tfile"));
             sc.ToString().ShouldBeEmpty();
-            
+
             sc.Clear();
 
             es.Consume(new TaskStartedEventArgs("", "", "", "", "Exec"));
@@ -1194,7 +1193,7 @@ public void NestedProjectNormal()
                                           + Environment.NewLine +
                 "    " + ResourceUtilities.FormatResourceStringStripCodeAndKeyword("ProjectStartedPrefixForNestedProjectWithDefaultTargets", "fname1", "fname2") + Environment.NewLine +
                 Environment.NewLine + "<reset color>");
-            
+
             sc.Clear();
 
             es.Consume(new ProjectFinishedEventArgs("pf2", null, "fname2", true));
@@ -2336,4 +2335,3 @@ internal bool IsRunningWithCharacterFileType()
         }
     }
 }
-