Xplat Branch Merge

README.md

@@ -19,7 +19,7 @@ or grab a [prebuilt Azure VM image](http://blogs.msdn.com/b/visualstudioalm/arch
 3. Open src/MSBuild.sln solution in Visual Studio 2015.
 
 ## How to Engage, Contribute and Provide Feedback
-Before you contribute, please read through the contributing and developer guides to get an idea of what kinds of pull requsts we will or won't accept. 
+Before you contribute, please read through the contributing and developer guides to get an idea of what kinds of pull requests we will or won't accept.
 
 * [Contributing Guide](https://github.com/Microsoft/msbuild/wiki/Contributing-Code)
 * [Developer Guide](https://github.com/Microsoft/msbuild/wiki/Building-Testing-and-Debugging)

dir.targets

@@ -49,7 +49,7 @@
     <!-- Download latest nuget.exe -->
     <DownloadFile FileName="$(NuGetToolPath)"
                   Address="http://nuget.org/nuget.exe" 
-                  Condition="!Exists($(NuGetToolPath))" />
+                  Condition="!Exists('$(NuGetToolPath)')" />
 
     <!-- Restore build tools -->
     <Exec Command="$(NugetRestoreCommand) &quot;$(SourceDir).nuget\packages.config&quot;" StandardOutputImportance="Low" />

src/Framework/ProjectStartedEventArgs.cs

@@ -11,7 +11,7 @@
 namespace Microsoft.Build.Framework
 {
     /// <summary>
-    /// Arguements for project started events
+    /// Arguments for project started events
     /// </summary>
     /// <remarks>
     /// WARNING: marking a type [Serializable] without implementing

src/Framework/UnitTests/Attribute_Tests.cs

@@ -9,17 +9,17 @@
 using System.Runtime.Serialization.Formatters.Binary;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
-    [TestClass]
+    [TestFixture]
     public class AttributeTests
     {
         /// <summary>
         /// Test RequiredRuntimeAttribute
         /// </summary>
-        [TestMethod]
+        [Test]
         public void RequiredRuntimeAttribute()
         {
             RequiredRuntimeAttribute attribute =
@@ -28,15 +28,15 @@ public void RequiredRuntimeAttribute()
             Assert.AreEqual("v5", attribute.RuntimeVersion);
         }
 
-        [TestMethod]
+        [Test]
         public void OutputAttribute()
         {
             OutputAttribute attribute =
                 (OutputAttribute)Attribute.GetCustomAttribute(typeof(X).GetMember("TestValue2", BindingFlags.NonPublic | BindingFlags.Static)[0], typeof(OutputAttribute));
             Assert.IsNotNull(attribute);
         }
 
-        [TestMethod]
+        [Test]
         public void RequiredAttribute()
         {
             RequiredAttribute attribute =

src/Framework/UnitTests/BuildErrorEventArgs_Tests.cs

@@ -8,14 +8,14 @@
 using System;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the BuildErrorEventArg class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class BuildErrorEventArgs_Tests
     {
         /// <summary>
@@ -26,7 +26,7 @@ public class BuildErrorEventArgs_Tests
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             BuildErrorEventArgs beea = new BuildErrorEventArgs2();

src/Framework/UnitTests/BuildFinishedEventArgs_Tests.cs

@@ -8,14 +8,14 @@
 using System;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the BuildFinishedEventArg class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class BuildFinishedEventArgs_Tests
     {
         /// <summary>
@@ -26,7 +26,7 @@ public class BuildFinishedEventArgs_Tests
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             BuildFinishedEventArgs buildFinishedEvent = new BuildFinishedEventArgs2();

src/Framework/UnitTests/BuildMessageEventArgs_Tests.cs

@@ -8,14 +8,14 @@
 using System;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the BuildMessageEventArgs class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class BuildMessageEventArgs_Tests
     {
         /// <summary>
@@ -26,7 +26,7 @@ public class BuildMessageEventArgs_Tests
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             BuildMessageEventArgs bmea = new BuildMessageEventArgs2();

src/Framework/UnitTests/BuildStartedEventArgs_Tests.cs

@@ -7,14 +7,14 @@
 
 using System;
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the BuildStartedEventArgs class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class BuildStartedEventArgs_Tests
     {
         /// <summary>
@@ -25,7 +25,7 @@ public class BuildStartedEventArgs_Tests
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             BuildStartedEventArgs bsea = new BuildStartedEventArgs2();
@@ -40,7 +40,7 @@ public void EventArgsCtors()
         /// <summary>
         /// Trivially exercise getHashCode. 
         /// </summary>
-        [TestMethod]
+        [Test]
         public void TestGetHashCode()
         {
             _baseStartedEvent.GetHashCode();

src/Framework/UnitTests/BuildWarningEventArgs_Tests.cs

@@ -8,14 +8,14 @@
 using System;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the BuildWarningEventArgs class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class BuildWarningEventArgs_Tests
     {
         /// <summary>
@@ -26,7 +26,7 @@ public class BuildWarningEventArgs_Tests
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             BuildWarningEventArgs buildWarningEvent = new BuildWarningEventArgs2();
@@ -41,7 +41,7 @@ public void EventArgsCtors()
         /// <summary>
         /// Trivially exercise getHashCode.
         /// </summary>
-        [TestMethod]
+        [Test]
         public void TestGetHashCode()
         {
             _baseWarningEvent.GetHashCode();

src/Framework/UnitTests/CriticalBuildMessageEventArgs_Tests.cs

@@ -7,20 +7,20 @@
 
 using System;
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
     /// <summary>
     /// Verify the functioning of the CriticalBuildMessageEventArgs class.
     /// </summary>
-    [TestClass]
+    [TestFixture]
     public class CriticalBuildMessageEventArgs_Tests
     {
         /// <summary>
         /// Trivially exercise event args default ctors to boost Frameworks code coverage
         /// </summary>
-        [TestMethod]
+        [Test]
         public void EventArgsCtors()
         {
             CriticalBuildMessageEventArgs cbmea = new CriticalBuildMessageEventArgs2();

src/Framework/UnitTests/CustomEventArgSerialization_Tests.cs

@@ -10,11 +10,11 @@
 using System.Runtime.Serialization.Formatters.Binary;
 
 using Microsoft.Build.Framework;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
+using NUnit.Framework;
 
 namespace Microsoft.Build.UnitTests
 {
-    [TestClass]
+    [TestFixture]
     public class CustomEventArgSerialization_Tests
     {
         // Generic build class to test custom serialization of abstract class BuildEventArgs
@@ -39,15 +39,15 @@ string senderName
 
         private int _eventArgVersion = (Environment.Version.Major * 10) + Environment.Version.Minor;
 
-        [TestInitialize]
+        [SetUp]
         public void SetUp()
         {
             _stream = new MemoryStream();
             _writer = new BinaryWriter(_stream);
             _reader = new BinaryReader(_stream);
         }
 
-        [TestCleanup]
+        [TearDown]
         public void TearDown()
         {
             // Close will close the writer/reader and the underlying stream
@@ -58,7 +58,7 @@ public void TearDown()
             _writer = null;
         }
 
-        [TestMethod]
+        [Test]
         public void TestGenericBuildEventArgs()
         {
             // Test using reasonable messages
@@ -127,7 +127,7 @@ private static void VerifyGenericEventArg(BuildEventArgs genericEvent, BuildEven
             Assert.AreEqual(genericEvent.Timestamp, newGenericEvent.Timestamp, "Expected TimeStamp to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestBuildErrorEventArgs()
         {
             // Test using reasonable messages
@@ -197,7 +197,7 @@ private static void VerifyBuildErrorEventArgs(BuildErrorEventArgs genericEvent,
         }
 
 
-        [TestMethod]
+        [Test]
         public void TestBuildFinishedEventArgs()
         {
             // Test using reasonable messages
@@ -245,7 +245,7 @@ public void TestBuildFinishedEventArgs()
             Assert.IsTrue(genericEvent.Succeeded == newGenericEvent.Succeeded, "Expected Succeded to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestBuildMessageEventArgs()
         {
             // Test using reasonable messages
@@ -318,7 +318,7 @@ private void VerifyMessageEventArg(BuildMessageEventArgs messageEvent, BuildMess
             Assert.AreEqual(messageEvent.EndColumnNumber, newMessageEvent.EndColumnNumber, "Expected message EndColumnNumber to match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestBuildMessageEventArgsWithFileInfo()
         {
             // Test using reasonable messages
@@ -374,7 +374,7 @@ public void TestBuildMessageEventArgsWithFileInfo()
             VerifyMessageEventArg(messageEvent, newMessageEvent);
         }
 
-        [TestMethod]
+        [Test]
         public void TestCriticalBuildMessageEventArgs()
         {
             // Test using reasonable messages
@@ -430,7 +430,7 @@ public void TestCriticalBuildMessageEventArgs()
             VerifyMessageEventArg(criticalMessageEvent, newCriticalMessageEvent);
         }
 
-        [TestMethod]
+        [Test]
         public void TestBuildWarningEventArgs()
         {
             // Test with reasonable messages
@@ -500,7 +500,7 @@ private static void VerifyBuildWarningEventArgs(BuildWarningEventArgs genericEve
             Assert.AreEqual(genericEvent.EndLineNumber, newGenericEvent.EndLineNumber, "Expected EndLineNumber to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestProjectFinishedEventArgs()
         {
             // Test with reasonable values
@@ -561,7 +561,7 @@ public void TestProjectFinishedEventArgs()
             Assert.IsTrue(string.Compare(genericEvent.ProjectFile, newGenericEvent.ProjectFile, StringComparison.OrdinalIgnoreCase) == 0, "Expected ProjectFile to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestProjectStartedPropertySerialization()
         {
             // Create a list of test properties which should make it through serialization
@@ -635,7 +635,7 @@ private void AssertDictionaryEntry(List<DictionaryEntry> entryList, List<Diction
             }
         }
 
-        [TestMethod]
+        [Test]
         public void TestProjectStartedEventArgs()
         {
             // Test with reasonable values
@@ -705,7 +705,7 @@ private static void VerifyProjectStartedEvent(ProjectStartedEventArgs genericEve
             Assert.IsTrue(string.Compare(genericEvent.TargetNames, newGenericEvent.TargetNames, StringComparison.OrdinalIgnoreCase) == 0, "Expected TargetNames to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestTargetStartedEventArgs()
         {
             // Test using reasonable values
@@ -773,7 +773,7 @@ private static void VerifyTargetStarted(TargetStartedEventArgs genericEvent, Tar
             Assert.IsTrue(string.Compare(genericEvent.ParentTarget, newGenericEvent.ParentTarget, StringComparison.OrdinalIgnoreCase) == 0, "Expected ParentTarget to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestTargetFinishedEventArgs()
         {
             // Test using reasonable values
@@ -840,7 +840,7 @@ private static void VerifyTargetFinished(TargetFinishedEventArgs genericEvent, T
             Assert.IsTrue(string.Compare(genericEvent.TargetName, newGenericEvent.TargetName, StringComparison.OrdinalIgnoreCase) == 0, "Expected TargetName to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestTaskStartedEventArgs()
         {
             // Test using reasonable values
@@ -908,7 +908,7 @@ private static void VerifyTaskStarted(TaskStartedEventArgs genericEvent, TaskSta
             Assert.IsTrue(string.Compare(genericEvent.TaskName, newGenericEvent.TaskName, StringComparison.OrdinalIgnoreCase) == 0, "Expected TaskName to Match");
         }
 
-        [TestMethod]
+        [Test]
         public void TestTaskFinishedEventArgs()
         {
             // Test using reasonable values